Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I61279887ebfa34db0ebedb46c7c363a117c9094b
Change-Id: Ib92c445a5fd91a803a7de536c90d26b4418be967

342 files changed, 5774 insertions, 11686 deletions

diff --git a/Android.bp b/Android.bp
index a3873d9db..7b8859152 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,26 +17,17 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_app {
-    name: "TvSettings",
-    manifest: "Settings/AndroidManifest.xml",
+filegroup {
+    name: "TvSettingsSrc",
     srcs: [
         "Settings/src/**/*.java",
         "Settings/src/**/I*.aidl",
     ],
-     aidl: {
-            local_include_dirs: ["Settings/src"],
-        },
-    resource_dirs: ["Settings/res"],
-    defaults: ["SettingsLibDefaults"],
-    platform_apis: true,
-    certificate: "platform",
-    system_ext_specific: true,
-    required: ["privapp_whitelist_com.android.tv.settings"],
-    optimize: {
-        proguard_flags_files: ["Settings/proguard.flags"],
-    },
-    privileged: true,
+}
+
+android_library {
+    name: "TvSettingsStaticLibs",
+    manifest: "Settings/AndroidManifest-lib.xml",
     static_libs: [
         "androidx-constraintlayout_constraintlayout",
         "androidx.recyclerview_recyclerview",
@@ -56,17 +47,88 @@ android_app {
     ],
 }
 
+android_library {
+    name: "TvSettingsLib",
+    manifest: "Settings/AndroidManifest.xml",
+    srcs: [
+        ":TvSettingsSrc",
+    ],
+    aidl: {
+        local_include_dirs: ["Settings/src"],
+    },
+    resource_dirs: [
+        "Settings/res",
+        "Settings/res-twopanel",
+    ],
+
+    static_libs: [
+        "TvSettingsStaticLibs",
+    ],
+    platform_apis: true,
+}
+
+android_app {
+    name: "TvSettings",
+    manifest: "Settings/AndroidManifest.xml",
+    srcs: [
+        ":TvSettingsSrc",
+    ],
+    aidl: {
+        local_include_dirs: ["Settings/src"],
+    },
+    resource_dirs: ["Settings/res"],
+    defaults: ["SettingsLibDefaults"],
+    platform_apis: true,
+    certificate: "platform",
+    system_ext_specific: true,
+    required: ["privapp_whitelist_com.android.tv.settings"],
+    optimize: {
+        proguard_flags_files: ["Settings/proguard.flags"],
+    },
+    privileged: true,
+    static_libs: [
+        "TvSettingsStaticLibs",
+    ],
+}
+
+android_app {
+    name: "TvSettingsDebug",
+    manifest: "Settings/AndroidManifest-debug.xml",
+    additional_manifests: [
+        "Settings/AndroidManifest.xml",
+    ],
+    srcs: [
+        ":TvSettingsSrc",
+    ],
+    aidl: {
+        local_include_dirs: ["Settings/src"],
+    },
+    resource_dirs: ["Settings/res"],
+    defaults: ["SettingsLibDefaults"],
+    platform_apis: true,
+    certificate: "platform",
+    system_ext_specific: true,
+    required: ["privapp_whitelist_com.android.tv.settings"],
+    optimize: {
+        proguard_flags_files: ["Settings/proguard.flags"],
+    },
+    privileged: true,
+    static_libs: [
+        "TvSettingsStaticLibs",
+    ],
+}
+
+
 // Two-panel TvSettings
 android_app {
     name: "TvSettingsTwoPanel",
     manifest: "Settings/AndroidManifest.xml",
     srcs: [
-        "Settings/src/**/*.java",
-        "Settings/src/**/I*.aidl",
+        ":TvSettingsSrc",
     ],
-     aidl: {
-            local_include_dirs: ["Settings/src"],
-        },
+    aidl: {
+        local_include_dirs: ["Settings/src"],
+    },
     // Resources in res-twopanel should be applied last so they take precedence
     resource_dirs: [
         "Settings/res",
@@ -83,21 +145,7 @@ android_app {
     },
     privileged: true,
     static_libs: [
-        "androidx-constraintlayout_constraintlayout",
-        "androidx.recyclerview_recyclerview",
-        "androidx.preference_preference",
-        "androidx.appcompat_appcompat",
-        "androidx.legacy_legacy-preference-v14",
-        "androidx.leanback_leanback-preference",
-        "androidx.leanback_leanback",
-        "androidx.lifecycle_lifecycle-extensions",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "androidx.annotation_annotation",
-        "statslog-tvsettings",
-        "tvsettings-logtags",
-        "TwoPanelSettingsLib",
-        "zxing-core-1.7",
-        "TvSettingsAPI",
+        "TvSettingsStaticLibs",
     ],
     jacoco: {
         include_filter: [
@@ -107,3 +155,36 @@ android_app {
         ],
     },
 }
+
+// Two-panel TvSettings 0 Debug
+android_app {
+    name: "TvSettingsTwoPanelDebug",
+    manifest: "Settings/AndroidManifest-debug.xml",
+    additional_manifests: [
+        "Settings/AndroidManifest.xml",
+    ],
+    srcs: [
+        ":TvSettingsSrc",
+    ],
+    aidl: {
+        local_include_dirs: ["Settings/src"],
+    },
+    // Resources in res-twopanel should be applied last so they take precedence
+    resource_dirs: [
+        "Settings/res",
+        "Settings/res-twopanel",
+    ],
+    overrides: ["TvSettings"],
+    defaults: ["SettingsLibDefaults"],
+    platform_apis: true,
+    certificate: "platform",
+    system_ext_specific: true,
+    required: ["privapp_whitelist_com.android.tv.settings"],
+    optimize: {
+        proguard_flags_files: ["Settings/proguard.flags"],
+    },
+    privileged: true,
+    static_libs: [
+        "TvSettingsStaticLibs",
+    ],
+}
diff --git a/Settings/AndroidManifest-debug.xml b/Settings/AndroidManifest-debug.xml
new file mode 100644
index 000000000..2a9b12d24
--- /dev/null
+++ b/Settings/AndroidManifest-debug.xml
@@ -0,0 +1,40 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest
+    android:sharedUserId="android.uid.system"
+    android:versionCode="1"
+    android:versionName="1.0"
+    package="com.android.tv.settings"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-sdk android:minSdkVersion="31"
+        tools:overrideLibrary="com.android.tv.settings.library"/>
+
+    <application
+        android:name=".TvSettingsApplication"
+        android:allowClearUserData="false"
+        android:banner="@drawable/ic_launcher_banner_settings"
+        android:debuggable="true"
+        android:defaultToDeviceProtectedStorage="true"
+        android:directBootAware="true"
+        android:forceQueryable="true"
+        android:icon="@drawable/logo_settings_color_48dp"
+        android:label="@string/settings_app_name"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Settings"
+        android:usesCleartextTraffic="true" />
+</manifest>
\ No newline at end of file
diff --git a/Settings/AndroidManifest-lib.xml b/Settings/AndroidManifest-lib.xml
new file mode 100644
index 000000000..34479a855
--- /dev/null
+++ b/Settings/AndroidManifest-lib.xml
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.tv.settings">
+
+    <uses-sdk
+        android:minSdkVersion="31" />
+</manifest>
diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index db2d4cec2..5cf7e6dd4 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -120,13 +120,14 @@
 
         <!-- WifiSetupActivity may be (usually is) started from setup so theme is determined at
              runtime. -->
-        <activity
+        <activity-alias
             android:name=".connectivity.setup.WifiSetupActivity"
             android:clearTaskOnLaunch="true"
             android:configChanges="keyboard|keyboardHidden|navigation"
             android:excludeFromRecents="true"
             android:exported="true"
-            android:theme="@style/Theme.Setup">
+            android:theme="@style/TvSettingsActivityTheme"
+            android:targetActivity=".connectivity.NetworkActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK"/>
@@ -142,7 +143,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             -->
-        </activity>
+        </activity-alias>
 
         <activity
             android:name=".connectivity.NetworkRequestDialogActivity"
@@ -243,7 +244,7 @@
                 <action android:name="android.settings.USER_SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MAIN"/>
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS"/>
                 <action android:name="android.settings.SYNC_SETTINGS"/>
@@ -506,6 +507,30 @@
         </activity-alias>
 
         <activity
+            android:name=".system.CreateRestrictedProfileActivity"
+            android:configChanges="keyboard|keyboardHidden|navigation"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@style/TvSettingsActivityTheme">
+            <intent-filter>
+                <action android:name="com.android.tv.settings.action.CREATE_RESTRICTED_PROFILE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".system.EnterRestrictedProfileActivity"
+            android:configChanges="keyboard|keyboardHidden|navigation"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@style/TvSettingsActivityTheme">
+            <intent-filter>
+                <action android:name="com.android.tv.settings.action.ENTER_RESTRICTED_PROFILE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
             android:name=".device.displaysound.DisplaySoundActivity"
             android:configChanges="keyboard|keyboardHidden|navigation"
             android:excludeFromRecents="true"
@@ -1190,7 +1215,7 @@
             android:name=".oemlink.FactoryResetActivity"
             android:configChanges="keyboard|keyboardHidden|navigation"
             android:excludeFromRecents="true"
-            android:exported="true"
+            android:exported="false"
             android:theme="@style/ActionDisabledDialogTheme">
             <intent-filter android:priority="1" >
                 <action android:name="android.settings.FACTORY_RESET_TV_OEM_LINK" />
@@ -1343,4 +1368,10 @@
 
     </application>
 
+    <queries>
+        <intent>
+            <action android:name="com.google.android.tv.FIND_MY_REMOTE" />
+        </intent>
+    </queries>
+
 </manifest>
diff --git a/Settings/res-twopanel/drawable/ic_settings_channels_and_inputs.xml b/Settings/res-twopanel/drawable/ic_settings_channels_and_inputs.xml
new file mode 100644
index 000000000..d696982ff
--- /dev/null
+++ b/Settings/res-twopanel/drawable/ic_settings_channels_and_inputs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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
+  -->
+
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/compound_icon_background" />
+    <item android:left="@dimen/preference_icon_offset" android:right="@dimen/preference_icon_offset" android:top="@dimen/preference_icon_offset" android:bottom="@dimen/preference_icon_offset"
+          android:drawable="@drawable/ic_settings_channels_and_inputs_base"/>
+</layer-list>
\ No newline at end of file
diff --git a/Settings/res-twopanel/drawable/ic_settings_channels_and_inputs_base.xml b/Settings/res-twopanel/drawable/ic_settings_channels_and_inputs_base.xml
new file mode 100644
index 000000000..57c29d017
--- /dev/null
+++ b/Settings/res-twopanel/drawable/ic_settings_channels_and_inputs_base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@color/preference_icon_color"
+        android:pathData="M40,480Q40,388 74.5,308Q109,228 169,168.5Q229,109 309,74.5Q389,40 480,40Q571,40 651,74.5Q731,109 791,168.5Q851,228 885.5,308Q920,388 920,480L840,480Q840,405 811.5,339.5Q783,274 734,225Q685,176 619.5,148Q554,120 480,120Q406,120 340.5,148Q275,176 226,225Q177,274 148.5,339.5Q120,405 120,480L40,480ZM200,480Q200,362 282,281Q364,200 480,200Q596,200 678,281Q760,362 760,480L680,480Q680,397 621.5,338.5Q563,280 480,280Q397,280 338.5,338.5Q280,397 280,480L200,480ZM360,896L304,840L440,704L440,572Q413,560 396.5,535Q380,510 380,480Q380,438 409,409Q438,380 480,380Q522,380 551,409Q580,438 580,480Q580,510 563.5,535Q547,560 520,572L520,704L656,840L600,896L480,776L360,896Z"/>
+</vector>
\ No newline at end of file
diff --git a/Settings/res-twopanel/values-ky/strings.xml b/Settings/res-twopanel/values-ky/strings.xml
index fe2e8c808..e35076cb9 100644
--- a/Settings/res-twopanel/values-ky/strings.xml
+++ b/Settings/res-twopanel/values-ky/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="device_pref_category_title" msgid="6900784241621768228">"Тутум"</string>
+    <string name="device_pref_category_title" msgid="6900784241621768228">"Система"</string>
 </resources>
diff --git a/Settings/res-twopanel/values-mr/strings.xml b/Settings/res-twopanel/values-mr/strings.xml
index 27b8ae06d..31c690ce0 100644
--- a/Settings/res-twopanel/values-mr/strings.xml
+++ b/Settings/res-twopanel/values-mr/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="device_pref_category_title" msgid="6900784241621768228">"सिस्टम"</string>
+    <string name="device_pref_category_title" msgid="6900784241621768228">"सिस्टीम"</string>
 </resources>
diff --git a/Settings/res/drawable/ic_play_arrow.xml b/Settings/res/drawable/ic_play_arrow.xml
new file mode 100644
index 000000000..ef22ff323
--- /dev/null
+++ b/Settings/res/drawable/ic_play_arrow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M320,760v-560l440,280 -440,280ZM400,480ZM400,614 L610,480 400,346v268Z"/>
+</vector>
diff --git a/Settings/res/drawable/ic_settings_channels_and_inputs.xml b/Settings/res/drawable/ic_settings_channels_and_inputs.xml
new file mode 100644
index 000000000..5a24feb25
--- /dev/null
+++ b/Settings/res/drawable/ic_settings_channels_and_inputs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/preference_icon_color"
+      android:pathData="M40,480Q40,388 74.5,308Q109,228 169,168.5Q229,109 309,74.5Q389,40 480,40Q571,40 651,74.5Q731,109 791,168.5Q851,228 885.5,308Q920,388 920,480L840,480Q840,405 811.5,339.5Q783,274 734,225Q685,176 619.5,148Q554,120 480,120Q406,120 340.5,148Q275,176 226,225Q177,274 148.5,339.5Q120,405 120,480L40,480ZM200,480Q200,362 282,281Q364,200 480,200Q596,200 678,281Q760,362 760,480L680,480Q680,397 621.5,338.5Q563,280 480,280Q397,280 338.5,338.5Q280,397 280,480L200,480ZM360,896L304,840L440,704L440,572Q413,560 396.5,535Q380,510 380,480Q380,438 409,409Q438,380 480,380Q522,380 551,409Q580,438 580,480Q580,510 563.5,535Q547,560 520,572L520,704L656,840L600,896L480,776L360,896Z"/>
+</vector>
diff --git a/Settings/res/layout/settings_progress_bar.xml b/Settings/res/layout/settings_progress_bar.xml
new file mode 100644
index 000000000..0ca3cd4ab
--- /dev/null
+++ b/Settings/res/layout/settings_progress_bar.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:id="@+id/progress_bar"
+        android:inAnimation="@android:anim/fade_in"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminateTint="@color/tv_white"
+        android:layout_centerInParent="true"
+        android:indeterminate="true"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/Settings/res/layout/suggestion_item.xml b/Settings/res/layout/suggestion_item.xml
index fd0563607..5698491bd 100644
--- a/Settings/res/layout/suggestion_item.xml
+++ b/Settings/res/layout/suggestion_item.xml
@@ -26,6 +26,7 @@
         android:id="@+id/main_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:addStatesFromChildren="true"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="false"
diff --git a/Settings/res/values-af/energy-modes.xml b/Settings/res/values-af/energy-modes.xml
index a80dc0996..b29f33995 100644
--- a/Settings/res/values-af/energy-modes.xml
+++ b/Settings/res/values-af/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Noodsaaklike netwerkkenmerke"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lae energieverbruik"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Skakel netwerkverbinding af wanneer die TV nie gebruik word nie."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kritieke opdaterings en funksies"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Aanbeveelde netwerkkenmerke"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Geoptimeerde energieverbruik"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Skakel kenmerke aan wat die TV oor die netwerk wakker maak (netwerkbystand)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Voeg kenmerk 1 in]"</item>
     <item msgid="8724721267222341891">"[Voeg kenmerk 2 in]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Bykomende netwerkkenmerke"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Groter energieverbruik"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Hierdie kenmerk skakel bo en behalwe aanbeveelde kenmerke bykomende kenmerke aan wanneer die TV nie gebruik word nie wat die energieverbruik kan vergroot."</string>
+    <string 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-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 e5a82c6a0..32ac0b360 100644
--- a/Settings/res/values-af/strings.xml
+++ b/Settings/res/values-af/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Programinstellings"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Ligging, gebruik en diagnostiek, advertensies"</string>
     <string name="add_account" msgid="7386223854837017129">"Voeg rekening by"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Onbekende rekening"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Verwyder rekening"</string>
     <string name="account_sync" msgid="4315295293211313989">"Kies gesinkroniseerde programme"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinkroniseer nou"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Voorbeeldteks"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Die Wonderlike Towenaar van Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Hoofstuk 11: Die Wonderlike Smaragstad van Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Selfs al word hul oë deur die groen bril beskerm, word Dorothy en haar vriende met die eerste oogopslag verblind deur die helderheid van die wonderlike stad. Huise van groen marmer en bedek met vonkelende smaragte staan in rye langs die strate. Hulle stap op \'n sypaadjie van dieselfde groen marmer waar die blokke marmer gelas is met rye smaragte wat dig op mekaar geset is en in die helder son blink. Die vensters is van groen glas; selfs die lug bo die stad het \'n groen skynsel en die son se strale is groen. \n\nDaar beweeg baie mense – mans, vroue en kinders – rond en hulle is almal in groen klere geklee en het groenerige velle. Hulle staar met verwonderde oë na Dorothy en haar vreemde versameling vriende en die kinders hardloop almal weg en kruip agter hul ma\'s weg toe hulle die Leeu sien, maar niemand praat met hulle nie. Daar is baie winkels in die straat en Dorothy merk op dat alles in hulle groen is. Groen lekkergoed en groen springmielies word te koop aangebied, asook groen skoene, groen hoede en allerlei groen klere. Op een plek verkoop \'n man groen limonade en Dorothy sien dat die kinders met groen pennies betaal. \n\nDit lyk nie of daar enige perde of diere is nie; die mans vervoer goed in klein, groen waentjies wat hulle voor hulle stoot. Almal lyk gelukkig en tevrede en welvarend."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Selfs al word hul oë deur die groen bril beskerm, word Dorothy en haar vriende met die eerste oogopslag verblind deur die helderheid van die wonderlike stad. Huise van groen marmer en bedek met vonkelende smaragte staan in rye langs die strate. Hulle stap op ’n sypaadjie van dieselfde groen marmer waar die blokke marmer gelas is met rye smaragte wat dig op mekaar geset is en in die helder son blink. Die vensters is van groen glas; selfs die lug bo die stad het ’n groen skynsel en die son se strale is groen. \n\nDaar beweeg baie mense – mans, vroue en kinders – rond en hulle is almal in groen klere geklee en het groenerige velle. Hulle staar met verwonderde oë na Dorothy en haar vreemde versameling vriende en die kinders hardloop almal weg en kruip agter hul ma’s weg toe hulle die Leeu sien, maar niemand praat met hulle nie. Daar is baie winkels in die straat en Dorothy merk op dat alles in hulle groen is. Groen lekkergoed en groen springmielies word te koop aangebied, asook groen skoene, groen hoede en allerlei groen klere. Op een plek verkoop ’n man groen limonade en Dorothy sien dat die kinders met groen pennies betaal. \n\nDit lyk nie of daar enige perde of diere is nie; die mans vervoer goed in klein, groen waentjies wat hulle voor hulle stoot. Almal lyk gelukkig en tevrede en welvarend."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formaatkeuse"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Outomaties"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Handmatig"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Verander resolusie na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Kies OK om %1$s van nou af te gebruik."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision word nie by %1$s gesteun nie, en sal in “Gevorderde skerminstellings” gedeaktiveer word"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Hierdie modus ondersteun %1$s. Op sommige TV’s sal jy dalk Gevorderde HDMI moet aanskakel om meer HDR-formate te aktiveer. Gaan jou TV-instellings na om te kyk of dit gesteun word."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Hierdie modus ondersteun: %1$s\nOp sommige TV’s sal jy dalk Gevorderde HDMI moet aanskakel om meer HDR-formate te aktiveer. Gaan jou TV-instellings na om te kyk of dit gesteun word."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Kanselleer"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Moet gekaste data uitgevee word?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Sal gekaste data vir alle programme uitvee."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -246,7 +246,7 @@
     <string name="accessories_autopair_msg" msgid="2501824457418285019">"\'n Toestel is gevind en sal outomaties binne <xliff:g id="COUNTDOWN">%1$s</xliff:g> sekondes saambind"</string>
     <string name="error_action_not_supported" msgid="5377532621386080296">"Hierdie handeling word nie gesteun nie"</string>
     <string name="bluetooth_pairing_request" msgid="6120176967230348092">"Bluetooth-saambindingversoek"</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"Om saam te bind met: &lt;b&amp; gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&amp;lt/b&gt;, maak seker dit wys hierdie wagwoordsleutel:&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"Om saam te bind met: &lt;b&amp; gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&amp;lt/b&gt;, maak seker dit wys hierdie toegangsleutel:&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"Vanaf: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Bind met hierdie toestel saam?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"Om saam te bind met: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;Tik daarop: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, en druk dan Return of Enter."</string>
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"Om saam te bind met: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;Voer die toestel se vereiste PIN in:"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Gekoppel"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Ontkoppel"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Jy het nie toestemming om Bluetooth-instellings te verander nie."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Gebruik vir TV-oudio"</string>
     <string name="send_feedback" msgid="936698637869795473">"Stuur terugvoer"</string>
     <string name="launch_help" msgid="2607478763131952469">"Hulpsentrum"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Hierdie toestel word deur jou organisasie bestuur."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Hierdie toestel word deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> bestuur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Kom meer te wete"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraprogram}other{Kameraprogramme}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenderprogram"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktiveer"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Opstelling"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> kan al die teks wat jy tik, insamel, behalwe wagwoorde. Dit sluit persoonlike data soos kredietkaartnommers in."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> sal jou skerm kan lees, inhoud bo-oor ander apps kan wys, jou interaksie met apps of hardewaresensors kan naspoor, en namens jou met apps interaksie kan hê."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"As jy OK kies, sal <xliff:g id="SERVICE">%1$s</xliff:g> stop."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Teks-na-spraak"</string>
@@ -1085,13 +1085,13 @@
     <string name="admin_device_owner_message" msgid="1935507216776040907">"Jou administrateur kan programme en data wat met hierdie toestel geassosieer word, insluitend instellings, toestemmings, korporatiewe toegang, netwerkaktiwiteit en die toestel se ligginginligting, monitor en bestuur."</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"Verwyder werkprofiel"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"Toesteladministrasieprogram"</string>
-    <string name="remove_device_admin" msgid="2623866073546295104">"Deaktiveer hierdie toesteladministrasieprogram"</string>
+    <string name="remove_device_admin" msgid="2623866073546295104">"Deaktiveer hierdie toesteladministrasie-app"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"Deïnstalleer program"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"Deaktiveer en deïnstalleer"</string>
     <string name="select_device_admin_msg" msgid="8475934459999710332">"Toesteladministrateurprogramme"</string>
-    <string name="add_device_admin_msg" msgid="5390773166682603421">"Aktiveer toesteladministrasieprogram?"</string>
-    <string name="add_device_admin" msgid="5078281377915844544">"Aktiveer toesteladministrasieprogram"</string>
-    <string name="device_admin_warning" msgid="7399916080685200660">"As hierdie toesteladministrasieprogram geaktiveer word, sal die program <xliff:g id="APP_NAME">%1$s</xliff:g> toegelaat word om die volgende bewerkings uit te voer."</string>
+    <string name="add_device_admin_msg" msgid="5390773166682603421">"Aktiveer toesteladministrasie-app?"</string>
+    <string name="add_device_admin" msgid="5078281377915844544">"Aktiveer toesteladministrasie-app"</string>
+    <string name="device_admin_warning" msgid="7399916080685200660">"As hierdie toesteladministrasie-app geaktiveer word, sal die program <xliff:g id="APP_NAME">%1$s</xliff:g> toegelaat word om die volgende bewerkings uit te voer."</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"Hierdie toestel sal deur <xliff:g id="APP_NAME">%1$s</xliff:g> bestuur en gemonitor word."</string>
     <string name="device_admin_status" msgid="5467001937240455367">"Hierdie administrasieprogram is aktief en laat die program <xliff:g id="APP_NAME">%1$s</xliff:g> toe om die volgende bewerkings uit te voer:"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"Deur voort te gaan, sal jou gebruiker deur jou administrateur bestuur word, wat moontlik in staat sal wees om benewens jou persoonlike data ook geassosieerde data te berg.\n\nJou administrateur het die vermoë om instellings, toegang, programme en data wat met hierdie gebruiker geassosieer word, insluitend netwerkaktiwiteit en jou toestel se ligginginligting, te monitor en te bestuur."</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Verbinding suksesvol"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Wys alles"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Soek tans"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Kon nie Voeg Rekening By-voorneme vir stawing gaan haal nie."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Kon nie rekening byvoeg nie of die rekeningsoort is nie beskikbaar nie"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanale en invoere"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanale, eksterne invoere"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanale"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktiveer:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Let daarop dat hierdie modus die toestel se kragverbruik kan vergroot."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktiveer “<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
+    <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_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 dce8004c4..2e4c6ce53 100644
--- a/Settings/res/values-am/energy-modes.xml
+++ b/Settings/res/values-am/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"መሰረታዊ የአውታረ መረብ ባህሪያት"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ዝቅተኛ የኃይል አጠቃቀም"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ቲቪው ጥቅም ላይ በማይሆንበት ጊዜ የአውታረ መረብ ግንኙነትን ያጥፉ።"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"ወሳኝ ዝማኔዎች እና ተግባራት"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"የሚመከሩ የአውታረ መረብ ባህሪያት"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"የተባ የኃይል አጠቃቀም"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ቲቪውን በአውታረ መረብ ላይ የሚያነቁ ባህሪያትን ያበራል (በአውታረ መረብ የተገናኘ መጠባበቅ)"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ተጨማሪ የአውታረ መረብ ባህሪያት"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"የጨመረ የኃይል አጠቃቀም"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ከሚመከሩ ባህሪያት በተጨማሪ ይህ አማራጭ ቲቪው ጥቅም ላይ በማሆንበት ጊዜ የኃይል አጠቃቀምን ሊጨምር በሚችል መልኩ ተጨማሪ ባህሪያትን ያበራል።"</string>
+    <string 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-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 4936c605f..0879b07e2 100644
--- a/Settings/res/values-am/strings.xml
+++ b/Settings/res/values-am/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"የመተግበሪያ ቅንብሮች"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"አካባቢ፣ አጠቃቀም እና ምርመራ፣ ማስታወቂያዎች"</string>
     <string name="add_account" msgid="7386223854837017129">"መለያ ያክሉ"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"ያልታወቀ መለያ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"መለያ አስወግድ"</string>
     <string name="account_sync" msgid="4315295293211313989">"የተመሳሰሉ መተግበሪያዎችን ይምረጡ"</string>
     <string name="sync_now" msgid="4335217984374620551">"አሁን አመሳስል"</string>
@@ -100,7 +101,7 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"የተጫኑ መተግበሪያዎች"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"የስርዓት መተግበሪያዎች"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"የተሰናከሉ መተግበሪያዎች"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"የማያ ገጽ ማቆያ"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"የማያ ገፅ ማቆያ"</string>
     <string name="device_display" msgid="244634591698925025">"ማሳያ"</string>
     <string name="device_display_sound" msgid="7399153506435649193">"ማሳያ እና ድምፅ"</string>
     <string name="device_sound" msgid="8616320533559404963">"ድምፅ"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"የላቀ ድምፅ ቅንብሮች"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"የጨዋታ ሁነታን ይፍቀዱ"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"የይዘት ተለዋዋጭ ክልልን አዛምድ"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ይህን አማራጭ ሲያነቁ ስርዓቱ ከይዘቱ ጋር ለመመሳሰል በተለያዩ ተለዋዋጭ የክልል ቅርጸቶች መካከል ይቀያየራል። ይህ ቅርጸት በሚቀያየርበት ጊዜ ጥቁር ማያ ገጽ ሊያስከትል ይችላል።\n\nለተጨማሪ ተለዋዋጭ የክልል አማራጮች የላቀ የማሳያ ቅንብሮችን ጠቅ ያድርጉ።"</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ይህን አማራጭ ሲያነቁ ስርዓቱ ከይዘቱ ጋር ለመመሳሰል በተለያዩ ተለዋዋጭ የክልል ቅርጸቶች መካከል ይቀያየራል። ይህ ቅርጸት በሚቀያየርበት ጊዜ ጥቁር ማያ ገፅ ሊያስከትል ይችላል።\n\nለተጨማሪ ተለዋዋጭ የክልል አማራጮች የላቀ የማሳያ ቅንብሮችን ጠቅ ያድርጉ።"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ተመራጭ ተለዋዋጭ ክልል"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"በሥርዓቱ-የሚመረጥ ልወጣ"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ሥርዓቱ የቅርጸት ልወጣውን እንዲያስተዳድር ያስችለዋል"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"የናሙና ጽሁፍ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"አስደናቂው የኦዝ ምትሃተኛ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ምዕራፍ 11፦ ኦዝ፣ አስደናቂዋ የኤምራልድ ከተማ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ምንም እንኳን ዶርቲ እና ጓደኞችዋ በአረንጓዴ መነጽሮች ዓይኖቻቸው የተጠበቁ የነበሩ ቢሆንም በአስገራሚዋ ከተማ ብርቅርቅታ ገና ከመጀመሪያው ዓይኖቻቸው ተጭበርብረው ነበር። ጎዳናዎቹ ሁሉም ከአረንጓዴ እብነበረድ በተሠሩ በየቦታው ከሚያንጸባርቁ ውድ ኤምራልድ ድንጋዮች ያጌጡ ግድግዳዎች ባለቸው ቆንጆ ቤቶች ሰልፍ ይዘዋል። መልኩ ተመሳሳይ ከሆነ ከአረንጓዴ እብነበረድ ከተሠራው የእግረኛ መንገድ ላይ፣ የእግረኛ መንገዱ ክፍልፋዮች አጠገብ ለአጠገብ ጣል ጣል በተደረጉ እርስበርሳቸው በተጠላለፉ የኤምራልድ ረድፎች፣ በእግራቸው ሲንሸራሸሩ ኤምራሎዶቹ በፀሐይዋ ብርሃን ብርቅርቅ ይሉ ነበር። የአረንጓዴ መስታውቶቹ የመስኮት ክፈፎች፤ ሌላው ሳይቀር ከከተማዋ አናት ላይ ያለው ሰማይ አረንጓዴ ቀለም የተቀባ ይመስል ነበር፤ የፀሐይዋ ጨረሮችም አረንጓዴ ነበሩ። \n\nወዲያ ወዲህ የሚሉ በርካታ ሰዎች፣ ወንዶች፣ ሴቶች እና ሕፃናት ነበሩ፤ ሁሉም ደግሞ አረንጓዴ ልብሶችን ለብሰዋል ቆዳቸውም አረንጓዴ ሆኗል። ዶርቲን እና በግራሞት አፋቸውን የከፈቱ ጀሌዎችዋን በመደነቅ ዓይን እያዩዋቸው ያልፋሉ፤ እና ድንገት አንበሳውን ሲያዩ ሕፃናቱ ሮጠው ከእናቶቻቸው ጀርባ ተደበቁ፤ ግን ማንም ሰው ምን እንደሆኑ አልጠየቃቸውም። በርካታ ሱቆች በጎዳናው ላይ ተደርድረዋል፤ እና ዶርቲ በውስጣቸው ያለው ሁሉም ነገር አረንጓዴ እንደሆነ ተመለከተች። አረንጓዴ ከረሜላ እና አረንጓዴ ፈንድሻ እንዲሁም አረንጓዴ ጫማዎች፣ አረንጓዴ ባርኔጣዎች እና አረንጓዴ ልብሶች በዓይነት በዓይነቱ በቅናሽ ዋጋ ለሽያጭ ቀርበዋል። አንዱ ቦታ ላይ የሆነ ሰውዬ አረንጓዴ ሎሚ ጭማቂዎችን እየሸጠ ነበር፤ ልጆቹ ሲገዙት አረንጓዴ ሳንቲሞች ተጠቀመው እንደሚከፍሉት ዶርቲ ታይ ነበር። \n\nምንም ዓይነት ፈረሶች ወይም ምንም ዓይነት እንስሳቶች በቦታው አይታዩም፤ ሰዎቹ ዕቃዎችን የሚያጓጉዙት አረንጓዴ ጋሪዎችን ተጠቅመው እራሳቸው ከኋላ ሆነው ወደፊት በመግፋት ነበር። ሁሉም ሰው ደስተኛ እና ፍልቅልቅ ያለ እና ባለጠጋ ይመስል ነበር።"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ምንም እንኳን ዶረቲ እና ጓደኛዎችዋ በአረንጓዴ መነጽሮች ዓይኖቻቸው የተጠበቁ የነበሩ ቢሆንም መጀመሪያ በአስገራሚዋ ከተማ የብርሃን ድምቀት ምክንያት ማየት ተስኗቸው ነበር። ጎዳናዎቹ ሁሉም ከአረንጓዴ እምነበረድ በተሠሩ ቆንጆ ቤቶች የተዋቡ እና በየቦታው በሚያንጸባርቁ ኤምራልዶች ያጌጡ ነበሩ። ጥርቦቹ እርስ በእርስ የተያያዙት ተጠጋግተው በተደረደሩ እና በፀሀይ ስር በሚያንፀበርቁ የኤመራልዶች ረድፍ ወደሆነው ተመሳሳይ የአረንጓዴ እምነበረድ የእግረኛ መንገድ አመሩ። የመስኮቱ ክፈፎች ከአረንጓዴ መስታወት የተሠሩ ነበሩ፤ በዚያ ላይ ከከተማዋ አናት ያለው ሰማይ አረንጓዴ ቀለም ነበረው እና የፀሐይዋ ጨረሮችም አረንጓዴ ነበሩ። \n\nወዲያ ወዲህ የሚሉ በርካታ ሰዎች፣ ወንዶች፣ ሴቶች እና ሕፃናት ነበሩ፣ ሁሉም ታዲያ አረንጓዴ ልብሶችን የለበሱ እና ቆዳቸውም አረንጓዴ የሚመስል ነበር። ዶረቲን እና በአግራሞት አፋቸውን የከፈቱ ጀሌዎችዋን በመደነቅ እየተመለከቷቸው ነበር፤ እና ሕፃናቱ ሁሉ አንበሳውን ሲያዩ ሮጠው ከእናቶቻቸው ጀርባ ተደበቁ፤ ነገር ግን ማንም ሰው አላናገራቸውም። በርካታ ሱቆች በጎዳናው ላይ አሉ፤ እና ዶረቲ በውስጣቸው ያለው ነገር ሁሉ አረንጓዴ መሆኑን ተመለከተች። አረንጓዴ ከረሜላ እና አረንጓዴ ፈንድሻ እንዲሁም አረንጓዴ ጫማዎች፣ አረንጓዴ ባርኔጣዎች እና አረንጓዴ ልብሶች በዓይነት በዓይነቱ በቅናሽ ዋጋ ለሽያጭ ቀርበዋል። አንዱ ቦታ ላይ የሆነ ሰውዬ አረንጓዴ የሎሚ ጭማቂዎችን እየሸጠ ነበር፤ እና ልጆቹ ሲገዙት አረንጓዴ ሳንቲሞችን ተጠቀመው እንደከፈሉ ዶረቲ ማየት ችላ ነበር። \n\nምንም ፈረሶች ወይም ማንኛውም ዓይነት እንስሳቶች በቦታው አይታዩም፤ ሰዎቹ ዕቃዎችን የሚያጓጉዙት አረንጓዴ ጋሪዎችን ከኋላ ሆነው ወደፊት በመግፋት ነበር። ሁሉም ሰው ደስተኛ፣ በእርካታ የተሞላ እና ባለጠጋ ይመስል ነበር።"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"የቅርጸት ምርጫ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ራስ-ሰር"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ራስዎ"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ጥራት ወደ %1$s ይለወጥ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ከአሁን በኋላ %1$s ለመጠቀም እሺን ይምረጡ።"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s ላይ አይደገፍም እና «በላቁ የማሳያ ቅንብሮች» ውስጥ ይሰናከላል"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ይህ ሁነታ %1$s ይደግፋል። በአንዳንድ ቲቪዎች ላይ ተጨማሪ የኤችዲአር ቅርጸቶችን ለማንቃት የተሻሻለ ኤችዲኤምአይን ማብራት ሊኖርብዎት ይችላል። ይህ የሚደገፍ ከሆነ ለማየት የእርስዎን የቲቪ ቅንብሮች ይፈትሹ።"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ይህ ሁነታ የሚከተለውን ይደግፋል፦ %1$s\nበአንዳንድ ቲቪዎች ላይ ተጨማሪ ኤችዲአር ቅርጸቶችን ለማንቃት የተሻሻለ ኤችዲኤምአይን ማብራት ሊኖርብዎት ይችላል። ይህ የሚደገፍ መሆኑን ለማየት የእርስዎን ቲቪ ቅንብሮች ይፈትሹ።"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ይቅር"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"እሺ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"ኸርዝ"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> ኸርዝ)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"የተሸጎጠ ውሂብ ይጽዳ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ይሄ የተሸጎጡ የሁሉም መተግበሪያዎች ውሂብ ያጸዳል።"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"ተገናኝቷል"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ተቋርጧል"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"የብሉቱዝ ቅንብሮችን ለመለወጥ ፈቃድ የልዎትም።"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ለቲቪ ኦዲዮ ይጠቀሙ"</string>
     <string name="send_feedback" msgid="936698637869795473">"ግብረመልስ ይላኩ"</string>
     <string name="launch_help" msgid="2607478763131952469">"የእገዛ ማዕከል"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -287,7 +288,7 @@
     <string name="system_keyboard" msgid="1514460705385401872">"የቁልፍ ሰሌዳ"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"ቁልፍ ሰሌዳ እና ራስ-ሙላ"</string>
     <string name="system_autofill" msgid="6983989261108020046">"ራስ-ሙላ"</string>
-    <string name="system_home" msgid="2149349845791104094">"መነሻ ማያ ገጽ"</string>
+    <string name="system_home" msgid="2149349845791104094">"መነሻ ማያ ገፅ"</string>
     <string name="system_search" msgid="3170169128257586925">"ፍለጋ"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
     <string name="system_security" msgid="1012999639810957132">"ደህንነት እና ገደቦች"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ይህ መሣሪያ በእርስዎ ድርጅት የሚተዳደር ነው።"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚተዳደር ነው።"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"፣"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"የበለጠ መረዳት"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{የካሜራ መተግበሪያ}one{የካሜራ መተግበሪያዎች}other{የካሜራ መተግበሪያዎች}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"የቀን መቁጠሪያ መተግበሪያ"</string>
@@ -442,7 +442,7 @@
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"አዲስ አውታረ መረብ አክል"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"ፈጣን መገናኘት"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"ፈጣን መገናኘት በስልክዎ ላይ የQR ኮድን በመቃኘት በፍጥነት ከእርስዎ WiFi ጋር እንዲገናኙ ይረዱዎታል።"</string>
-    <string name="security_type" msgid="2297615092250075696">"የደህንነት አይነት"</string>
+    <string name="security_type" msgid="2297615092250075696">"የደህንነት ዓይነት"</string>
     <string name="other_network" msgid="5299289104661858596">"ሌላ አውታረ መረብ…"</string>
     <string name="skip_network" msgid="3095529090560000692">"ዝለል"</string>
     <string name="wifi_security_type_none" msgid="7001835819813531253">"ምንም"</string>
@@ -476,7 +476,7 @@
     <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>
+    <string name="wifi_forget_network_description" msgid="4146715475962713899">"ይሄ ማንኛውንም የተቀመጠ የይለፍ ቃልን ጨምሮ ከዚህ አውታረ መረብ ጋር ለመገናኘት ሥራ ላይ የዋለ መረጃን ያጸዳል።"</string>
     <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" QR ኮዱን ከሞባይል ስልክ በመቃኘት አንድ Wi-Fiን ይቀላቀሉ እና መመሪያዎቹን ይከተሉ።\n \n ከአንድ "<b>"የAndroid ስልክ"</b>" ሆነው ወደ ቅንብሮች -&gt; አውታረ መረብ እና በይነመረብ -&gt; Wi-Fi -&gt; አንድ Wi-Fi ይምረጡ -&gt; የላቀ -&gt; መሣሪያን አክል ይሂዱና ከዚያ QR ኮዱን ይቃኙ።"</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"ለመሰረዝ የተመለስ አዝራርን ይጫኑ"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"እሺ"</string>
@@ -669,10 +669,10 @@
     <string name="location_history_desc" msgid="926674012916014270">"ለዚህ መለያ የአካባቢ ታሪክ ሲበራ Google የመሣሪያዎ አካባቢ ውሂብ ሌሎች መተግበሪያዎች እንዲጠቀሙበት ሊያከማቸው ይችላል።\n\nለምሳሌ፣ Google ካርታዎች አቅጣጫዎችን ሊሰጡዎት ይችላል፣ እና Google Now ስለመጓጓዣ ትራፊክ መረጃ ሊሰጠዎት ይችላል።\n\nየአካባቢን ታሪክ በማንኛውም ጊዜ ማጥፋት ይችላሉ፣ ነገር ግን ይህን ማድረግ አይሰርዘውም። የአካባቢ ታሪክዎን ለመመልከት እና ለማቀናበር maps.google.com/locationhistoryን ይጎብኙ።"</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"የአካባቢ ታሪክን ሰርዝ"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"ይሄ ሁሉንም የዚህ Google መለያ የአካባቢ ታሪክ ከዚህ መሣሪያ ያስወግደዋል። ይህን ስረዛ ሊቀለብሱት አይችሉም። Google Nowን ጨምሮ አንዳንድ መተግበሪያዎች መስራት ያቆማሉ።"</string>
-    <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"የማያ ገጽ አንባቢዎች"</string>
+    <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"የማያ ገፅ አንባቢዎች"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"ማሳያ"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"የመስተጋብር መቆጣጠሪያዎች"</string>
-    <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
+    <string name="accessibility_audio_and_onscreen_text_category_title" msgid="113841605896486212">"ኦዲዮ እና የማያ ገፅ ላይ ጽሁፍ"</string>
     <string name="accessibility_experimental_category_title" msgid="3401773834179170206">"የሙከራ"</string>
     <string name="accessibility_services_category_title" msgid="8813843874978910442">"አገልግሎቶች"</string>
     <string name="accessibility_service_settings" msgid="3251334786870932423">"የአገልግሎት ቅንብሮች"</string>
@@ -715,7 +715,7 @@
     <string name="captions_customoptions" msgid="7691004663572161126">"ብጁ አማራጮች"</string>
     <string name="captions_fontfamily" msgid="1026632786438880997">"የቅርጸ-ቁምፊ ቤተሰብ"</string>
     <string name="captions_textcolor" msgid="1566679779609140317">"የጽሁፍ ቀለም"</string>
-    <string name="captions_edgetype" msgid="4875636291904824401">"የጠርዝ አይነት"</string>
+    <string name="captions_edgetype" msgid="4875636291904824401">"የጠርዝ ዓይነት"</string>
     <string name="captions_edgecolor" msgid="2779925179084237336">"የጠርዝ ቀለም"</string>
     <string name="captions_backgroundshow" msgid="1080183686470477645">"በስተጀርባን አሳይ"</string>
     <string name="captions_backgroundcolor" msgid="2056944109914399253">"የጀርባ ቀለም"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"አንቃ"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"ውቅር"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> ከየይለፍ ቃላት በስተቀር ሁሉንም የሚተይቡት ጽሁፍ ሊሰበስብ ይችላል። ይሄ እንደ የክሬዲት ካርድ ቁጥሮች ያለ የግል ውሂብ ያካትታል።"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -760,7 +760,7 @@
     <string name="system_monitoring" msgid="7997260748312620855">"መከታተል"</string>
     <string name="system_apps" msgid="8481888654606868074">"መተግበሪያዎች"</string>
     <string name="system_stay_awake" msgid="5935117574414511413">"ነቅተህ ቆይ"</string>
-    <string name="keep_screen_on_summary" msgid="4680661166009970792">"ማያ ገጽ በጭራሽ አያንቀላፋም"</string>
+    <string name="keep_screen_on_summary" msgid="4680661166009970792">"ማያ ገፅ በጭራሽ አያንቀላፋም"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"የHDCP ማረጋገጥ"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"የHDMI ማመቻቸት"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"አሁን ድጋሚ ይጀመር?"</string>
@@ -781,7 +781,7 @@
     <string name="system_show_touches" msgid="8244331695139748286">"ንክኪዎችን አሳይ"</string>
     <string name="system_pointer_location" msgid="8724050865245555084">"የአመልካች አካባቢ"</string>
     <string name="system_show_layout_bounds" msgid="8803080672553699649">"የአቀማመጥ ገደቦችን አሳይ"</string>
-    <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"የጂፒዩ እይታ ዝማኔዎችን አሳይ"</string>
+    <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"የጂፒዩ ዕይታ ዝማኔዎችን አሳይ"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"የሃርድዌር ንብርብርን አሳይ"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"የጂፒዩ አብዝቶ መሳልን አሳይ"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"የወለል ዝማኔዎችን አሳይ"</string>
@@ -805,7 +805,7 @@
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"የሃርድዌር ንብርብሮች ሲዘምኑ አረንጓዴ አብራ"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"ከምርጡ ወደ መጥፎው፦ ሰማያዊ፣ አረንጓዴ፣ ፈዘዝ ያለ ቀይ፣ ቀይ"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"የመስኮት ወለሎች ሲዘምኑ መላ መስኮቱን አብለጭልጭ"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"መተግበሪያዎች ረጅም ክንውኖች በዋናው ክር ላይ ሲያካሂዱ ማያ ገጽ ላይ አሳይ"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"መተግበሪያዎች ረጅም ክንውኖች በዋናው ክር ላይ ሲያካሂዱ ማያ ገፅ ላይ አሳይ"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"ለማዘጋጀት የወሰደው ጊዜ በadb shell dumpsys gfxinfo ለካ"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"ያልታወቁ ምንጮች"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"ከPlay መደብር ውጭ የሚመጡ መተግበሪያዎች እንዲጫኑ ፍቀድ"</string>
@@ -831,7 +831,7 @@
     <item msgid="1290233583371556415">"የእነማ ልኬት 10x"</item>
   </string-array>
     <string name="track_frame_time_off" msgid="8845064783618702239">"ጠፍቷል"</string>
-    <string name="track_frame_time_bars" msgid="5841531515222229632">"በማያ ገጽ ላይ እንደ አሞሌዎች"</string>
+    <string name="track_frame_time_bars" msgid="5841531515222229632">"በማያ ገፅ ላይ እንደ አሞሌዎች"</string>
     <string name="app_process_limit_standard" msgid="6069948528843313888">"መደበኛ ወሰን"</string>
     <string name="app_process_limit_zero" msgid="4094665021909774994">"ምንም የጀርባ ሂደቶች የሉም"</string>
     <string name="app_process_limit_one" msgid="4509089015775863726">"ቢበዛ 1 ሂደት"</string>
@@ -941,17 +941,17 @@
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"የሦስተኛ ወገን ምንጭ"</string>
     <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"ፍቃዶች"</string>
     <string name="device_apps_app_management_not_available" msgid="4198634078194500518">"መተግበሪያ ሊገኝ አይችልም"</string>
-    <string name="unused_apps" msgid="5539166745483454543">"ስራ ላይ ያልዋሉ መተግበሪያዎች"</string>
+    <string name="unused_apps" msgid="5539166745483454543">"ሥራ ላይ ያልዋሉ መተግበሪያዎች"</string>
     <string name="settings_ok" msgid="5950888975075541964">"እሺ"</string>
     <string name="settings_confirm" msgid="4489126458677153411">"ያረጋግጡ"</string>
     <string name="settings_cancel" msgid="576094334743686152">"ይቅር"</string>
     <string name="settings_on" msgid="7734010120323404333">"በርቷል"</string>
     <string name="settings_off" msgid="4060451657850476369">"ጠፍቷል"</string>
     <string name="device_daydreams_none" msgid="3405655350757277348">"ማያ ገጽን አጥፋ"</string>
-    <string name="device_daydreams_select" msgid="7203264446482623438">"የማያ ገጽ ማቆያ"</string>
+    <string name="device_daydreams_select" msgid="7203264446482623438">"የማያ ገፅ ማቆያ"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"አሁን ጀምር"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"መቼ እንደሚጀመር"</string>
-    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"ማያ ገጽ ማቆያ ከዚህ እንቅስቃሴ-አልባ ጊዜ በኋላ ይጀመራል። ምንም ማያ ገጽ ማቆያ ካልተመረጠ ማሳያው ይጠፋል።"</string>
+    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"ማያ ገፅ ማቆያ ከዚህ እንቅስቃሴ-አልባ ጊዜ በኋላ ይጀመራል። ምንም ማያ ገፅ ማቆያ ካልተመረጠ ማሳያው ይጠፋል።"</string>
     <string name="device_daydreams_sleep_summary" msgid="3081688734381995693">"ከ<xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> እንቅስቃሴ-አልባነት በኋላ"</string>
     <string name="device_energy_saver_screen_off" msgid="6908468996426629480">"ማሳያን አጥፋ"</string>
     <!-- no translation found for device_energy_saver_timeout_description (3206609135199137514) -->
@@ -1076,7 +1076,7 @@
     <string name="disabled_by_policy_title_outgoing_calls" msgid="8642280178608881544">"መደወል አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_sms" msgid="5721045390560951358">"ኤስኤምኤስ አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_camera" msgid="6576557964422257426">"ካሜራ አልተፈቀደም"</string>
-    <string name="disabled_by_policy_title_screen_capture" msgid="5774035841010091253">"ቅጽበታዊ ገጽ እይታ አልተፈቀደም"</string>
+    <string name="disabled_by_policy_title_screen_capture" msgid="5774035841010091253">"ቅጽበታዊ ገፅ ዕይታ አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"ይህን መተግበሪያ መክፈት አልተቻለም"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"ጥያቄዎች ካለዎት የእርስዎን የአይቲ አስተዳዳሪ ያነጋግሩ"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"ተጨማሪ ዝርዝሮች"</string>
@@ -1108,13 +1108,15 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ግንኙነት ተሳክቷል"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"ሁሉንም አሳይ"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"በመፈለግ ላይ"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ከማረጋገጫ መለያ የማከል ሐሳብን ሰርስሮ ማውጣት አልተሳካም።"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"መለያን ማከል አልተሳካም ወይም የመለያው ዓይነት አይገኝም።"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ሰርጦች እና ግቤቶች"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ሰርጦች፣ ውጫዊ ግብዓቶች"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ሰርጦች"</string>
     <string name="external_inputs_settings_title" msgid="8937038060355986380">"ውጫዊ ግቤቶች"</string>
-    <string name="display_and_sound_vendor_summary" msgid="7661072343315403110">"ሥዕል፣ ማያ ገጽ፣ ድምፅ"</string>
+    <string name="display_and_sound_vendor_summary" msgid="7661072343315403110">"ሥዕል፣ ማያ ገፅ፣ ድምፅ"</string>
     <string name="picture_settings_title" msgid="7643193630924322697">"ሥዕል"</string>
-    <string name="screen_settings_title" msgid="7806908869190824434">"ማያ ገጽ"</string>
+    <string name="screen_settings_title" msgid="7806908869190824434">"ማያ ገፅ"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"ድምፅ"</string>
     <string name="power_and_energy" msgid="4638182439670702556">"ኃይል እና ጉልበት"</string>
     <string name="power_on_behavior" msgid="927607372303160716">"የኃይል ማብራት ባህሪ"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ይህን ያነቃል፦"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ይህ ሁነታ የመሣሪያው ኃይል አጠቃቀምን ሊጨምር እንደሚችል ያስታውሱ።"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"«<xliff:g id="ENERGYMODENAME">%s</xliff:g>» ይንቃ"</string>
+    <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_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 dc03631bb..26ca5c53d 100644
--- a/Settings/res/values-ar/energy-modes.xml
+++ b/Settings/res/values-ar/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"الميزات الأساسية للشبكة"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"الاستخدام المنخفض للطاقة"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"إيقاف الاتصال بالشبكة عندما يكون التلفزيون غير مستخدَم"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"التحديثات والوظائف المهمة"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"الميزات المقترَحة للشبكة"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"الاستخدام المحسَّن للطاقة"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"تفعيل الميزات التي تعمل على تنشيط التلفزيون من خلال الشبكة (وضع الاستعداد المتصل بالشبكة)"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"الميزات الإضافية للشبكة"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"الاستخدام العالي للطاقة"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"بالإضافة إلى الميزات المقترَحة، يفعِّل هذا الخيار الميزات الإضافية عندما يكون التلفزيون غير مستخدَم، مما قد يؤدي إلى زيادة استهلاك الطاقة."</string>
+    <string 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-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 a23259401..72f13e593 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"إعدادات التطبيق"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"الموقع الجغرافي والاستخدام وبيانات التشخيص والإعلانات"</string>
     <string name="add_account" msgid="7386223854837017129">"إضافة حساب"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"حساب غير معروف"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"إزالة الحساب"</string>
     <string name="account_sync" msgid="4315295293211313989">"اختر التطبيقات المتزامنة"</string>
     <string name="sync_now" msgid="4335217984374620551">"المزامنة الآن"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"هل تريد فرض تشغيل إخراج النطاق العالي الديناميكية (HDR)؟"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"سيتم فرض التحويل تلقائيًا إلى \"<xliff:g id="HDR_TYPE">%s</xliff:g>\"."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"سيتم تشغيل شاشتك بدقة 1080p و60 هرتز. لا يتوافق هذا الخيار مع شاشتك عند تشغيلها بدقة 4K و60 هرتز."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"لا يُسمح باستخدام تقنية Dolby Vision مع درجة الدقة الحالية. في حال تفعيل Dolby Vision يدويًا، سيتم تغيير درجة دقة الشاشة إلى 1080p و60 هرتز."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"هل تريد تغيير درجة الدقة إلى 1080p و60 هرتز؟"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"فرض التحويل إلى تقنية Dolby Vision دائمًا"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"إذا كانت تقنية Dolby Vision غير مفعَّلة في تنسيقات النطاق العالي الديناميكية (HDR) ضمن \"إعدادات العرض المتقدّمة\"، سيؤدي فرض التحويل إلى تقنية Dolby Vision إلى إعادة تفعيلها."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"فرض التحويل إلى تقنية HDR10 دائمًا"</string>
@@ -184,7 +183,7 @@
     <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"الانتقال السلس فقط"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"بناءً على طلب التطبيق وشريطة توفّر إمكانية الانتقال السلس في التلفزيون الخاص بك، ستتطابق مخرجات جهازك مع العدد الأصلي للقطات في الثانية الذي يظهر به ما تشاهده من محتوى."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"لا تتيح الشاشة المتصلة الانتقالات السلِسة لمعدّل التحديث. لن يكون لهذا الخيار أي تأثير إلا في حال استخدام شاشة متوافقة معه."</string>
-    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"دومًا"</string>
+    <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"دائمًا"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"ستتطابق مخرجات جهازك مع العدد الأصلي للقطات في الثانية الذي يظهر به ما تشاهده من محتوى إذا طلب التطبيق ذلك. وقد يؤدي ذلك إلى ظهور شاشة فارغة لفترة قصيرة عند الدخول إلى وضع تشغيل فيديو أو الخروج منه."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"أبدًا"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"لن تتطابق مخرجات جهازك أبدًا مع العدد الأصلي للقطات في الثانية الذي يظهر به ما تشاهده من محتوى حتى إذا طلب التطبيق ذلك."</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"نموذج نص"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ساحر أوز العجيب (The Wonderful Wizard of Oz)"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"الفصل ۱۱: مدينة أوز الزمرّدية العجيبة (The Wonderful Emerald City of Oz)"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"على الرغم من احتماء دورثي ورفاقها خلف نظارات خضراء، انبهرت عيونهم للوهلة الأولى بتوهج المدينة العجيبة وتألقها. كانت المنازل الرائعة أمامهم متراصة على الشوارع ومصممة جميعها من الرخام الأخضر المرصع بالزمرّد البرّاق. ساروا على رصيف من الرخام الأخضر نفسه حيث تلتقي المباني الضخمة على صفوف من الزمرد المتلألئ تحت أشعة الشمس الساطعة. كانت ألواح النوافذ الزجاجية خضراء هي أيضًا، حتى أنّ السماء وأشعة الشمس تلوّنت بالأخضر الفاتح. \n\nرأوا الكثير من الرجال والنساء والأطفال يجوبون الشوارع وجميعهم في ثياب خضراء فوق بشرة تميل إلى الأخضر. نظروا إلى دورثي ورفاقها الغريبين بتعجب، في حين أنّ الأطفال اختبأوا وراء أمهاتهم خائفين من الأسد، ولكن لم يتحدث معهم أحد. اصطفّت في الشارع المتاجر الخضراء ولاحظت دورثي أنّ كل ما فيها كان أخضر، من الحلوى الخضراء والفشار الأخضر إلى الأحذية والقبعات والملابس الخضراء. وفي أحد الأركان، وقف رجل يبيع الليموناضة الخضراء ورأت دورثي أنّ الأطفال كانوا يشترون العصير منه بعملة خضراء هي أيضًا. \n\nخلت الشوارع من الأحصنة أو أي نوع آخر من الحيوانات، وكان الرجال ينقلون أمتعتهم في عربات خضراء صغيرة يدفعونها أمامهم. وبدت ملامح السعادة والارتياح على وجوه الجميع."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"على الرغم من احتماء \"دورثي\" ورفاقها خلف نظارات خضراء، انبهرت عيونهم للوهلة الأولى بتوهج المدينة العجيبة وتألقها. كانت المنازل الرائعة أمامهم متراصة على الشوارع ومصممة جميعها من الرخام الأخضر المرصع بالزمرّد البرّاق. ساروا على رصيف من الرخام الأخضر نفسه حيث تلتقي المباني الضخمة على صفوف من الزمرد المتلألئ تحت أشعة الشمس الساطعة. كانت ألواح النوافذ الزجاجية خضراء هي أيضًا، حتى أنّ السماء وأشعة الشمس تلوّنت بالأخضر الفاتح. \n\nرأوا الكثير من الرجال والنساء والأطفال يجوبون الشوارع وجميعهم في ثياب خضراء فوق بشرة تميل إلى الأخضر. نظروا إلى \"دورثي\" ورفاقها الغريبين بتعجب، في حين أنّ الأطفال اختبأوا وراء أمهاتهم خائفين من الأسد، ولكن لم يتحدث معهم أحد. اصطفّت في الشارع المتاجر الخضراء ولاحظت \"دورثي\" أنّ كل ما فيها كان أخضر، من الحلوى الخضراء والفشار الأخضر إلى الأحذية والقبعات والملابس الخضراء. وفي أحد الأركان، وقف رجل يبيع الليموناضة الخضراء ورأت \"دورثي\" أنّ الأطفال كانوا يشترون العصير منه بعملة خضراء هي أيضًا. \n\nخلت الشوارع من الأحصنة أو أي نوع آخر من الحيوانات، وكان الرجال ينقلون أمتعتهم في عربات خضراء صغيرة يدفعونها أمامهم. وبدت ملامح السعادة والارتياح على وجوه الجميع."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"اختيار الصيغة"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"تلقائي"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"يدوي"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"هل تريد تغيير درجة الدقة إلى ‏%1$s؟"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"اختَر \"حسنًا\" لاستخدام %1$s من الآن فصاعدًا."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"تقنية Dolby Vision غير متاحة في ‏%1$s وسيتم إيقافها في \"إعدادات العرض المتقدّمة\"."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"يتوافق هذا الوضع مع ‏%1$s. في بعض أجهزة التلفزيون، قد تحتاج إلى تفعيل خيار \"منفذ HDMI المحسَّن\" لتفعيل المزيد من صيغ النطاق العالي الديناميكية (HDR). يُرجى الانتقال إلى إعدادات التلفزيون لمعرفة ما إذا كان هذا الخيار متاحًا."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"يتوافق هذا الوضع مع: %1$s\nفي بعض أجهزة التلفزيون، قد تحتاج إلى تفعيل خيار \"منفذ HDMI المحسَّن\" لتفعيل المزيد من صيغ النطاق العالي الديناميكية (HDR). يُرجى الانتقال إلى إعدادات التلفزيون لمعرفة ما إذا كان هذا الخيار متاحًا."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"إلغاء"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"حسنًا"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"هرتز"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> هرتز)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"هل تريد محو البيانات المؤقتة؟"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"يؤدي ذلك إلى محو البيانات المؤقتة لكل التطبيقات."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"متّصل"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"غير متّصل"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ليست لديك أذونات لتغيير إعدادات بلوتوث."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"استخدام البلوتوث لصوت التلفزيون"</string>
     <string name="send_feedback" msgid="936698637869795473">"إرسال ملاحظات"</string>
     <string name="launch_help" msgid="2607478763131952469">"مركز المساعدة"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"تتولى مؤسستك إدارة هذا الجهاز."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"تتم إدارة هذا الجهاز بواسطة <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"،"</string>
-    <string name="space_separator" msgid="4169645647388594972">" U+2060"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"مزيد من المعلومات"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{تطبيق الكاميرا}zero{تطبيقات الكاميرا}two{تطبيقا الكاميرا}few{تطبيقات الكاميرا}many{تطبيقات الكاميرا}other{تطبيقات الكاميرا}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"تطبيق التقويم"</string>
@@ -741,11 +739,11 @@
     <string name="color_yellow" msgid="3519470952904560404">"أصفر"</string>
     <string name="color_magenta" msgid="2377854703399624607">"أرجواني"</string>
     <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"وصف صوتي"</string>
-    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"يمكنك الاستماع إلى وصف لما يحدث على الشاشة في الأفلام والبرامج المتوافقة."</string>
+    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"يمكنك الاستماع إلى وصف لما يحدث على الشاشة في الأفلام والبرامج التلفزيونية التي تتيح هذه الميزة."</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"تفعيل"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"الإعداد"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"يمكن لخدمة \"<xliff:g id="SERVICE">%1$s</xliff:g>\" جمع كل النصوص التي تكتبها، بما في ذلك البيانات الشخصية مثل أرقام بطاقات الائتمان، مع استثناء كلمات المرور."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -925,7 +923,7 @@
     <string name="device_apps_app_management_force_stop" msgid="4454221309989640309">"فرض الإيقاف"</string>
     <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"قد لا يعمل التطبيق بشكل صحيح في حال فرض إيقافه."</string>
     <string name="device_apps_app_management_uninstall" msgid="4171103696233332967">"إزالة"</string>
-    <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"إزالة التحديثات"</string>
+    <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"إلغاء تثبيت التحديثات"</string>
     <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"ستتم إزالة جميع تحديثات تطبيق نظام Android هذا."</string>
     <string name="device_apps_app_management_disable" msgid="819003297535493633">"إيقاف"</string>
     <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"هل تريد إيقاف هذا التطبيق؟"</string>
@@ -1050,7 +1048,7 @@
     <string name="turn_screen_on_title" msgid="5293798529284629011">"تشغيل الشاشة"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"السماح بتشغيل الشاشة"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"يمكنك السماح لأحد التطبيقات بتشغيل الشاشة. في حال منح الإذن، قد يشغِّل التطبيق الشاشة في أي وقت بدون نية صريحة منك."</string>
-    <string name="special_access" msgid="21806055758289916">"وصول خاص إلى التطبيقات"</string>
+    <string name="special_access" msgid="21806055758289916">"أذونات خاصة للتطبيقات"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>، <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"الصوت"</string>
     <string name="record_audio" msgid="5035689290259575229">"تسجيل الصوت"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"تم الاتصال."</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"عرض الكل"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"البحث"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"تعذّر استرداد هدف إضافة الحساب من برنامج المصادقة."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"تعذّرت إضافة الحساب أو قد يكون نوع الحساب غير متاح."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"القنوات ومصادر الإدخال"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"القنوات، مصادر الإدخال الخارجية"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"القنوات"</string>
@@ -1123,8 +1123,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="7196407759836930799">"تحسين استهلاك الطاقة عندما لا يكون التلفزيون قيد الاستخدام"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"يفعِّل هذا الوضع الميزات التالية:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ملاحظة: قد يؤدي استخدام هذا الوضع إلى زيادة استهلاك طاقة الجهاز."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"تفعيل وضع \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 b418063c8..bb437849f 100644
--- a/Settings/res/values-as/energy-modes.xml
+++ b/Settings/res/values-as/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"অত্যাৱশ্যকীয় নেটৱৰ্ক সুবিধাসমূহ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"কম শক্তিৰ ব্যৱহাৰ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"টিভি ব্যৱহাৰ নকৰা সময়ত নেটৱৰ্ক সংযোগ অফ কৰক।"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"গুৰুত্বপূৰ্ণ আপডে’ট আৰু ফাংশ্বনসমূহ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"চুপাৰিছ কৰা নেটৱৰ্ক সুবিধাসমূহ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"শক্তিৰ ব্যৱহাৰ অপ্টিমাইজ কৰা হৈছে"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"নেটৱৰ্ক (ষ্টেণ্ডবাই ম’ডত ৰখা নেটৱৰ্ক)ৰ জৰিয়তে টিভি সক্ৰিয় কৰা সুবিধাসমূহ অন কৰক।"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"অতিৰিক্ত নেটৱৰ্ক সুবিধাসমূহ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"শক্তিৰ ব্যৱহাৰ বৃদ্ধি হৈছে"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"চুপাৰিছ কৰা সুবিধা সমূহৰ উপৰিও, এই বিকল্পটোৱে টিভি ব্যৱহাৰ নকৰা সময়তো অতিৰিক্ত সুবিধাসমূহ অন কৰে যাৰ ফলত শক্তিৰ ব্যৱহাৰ বৃদ্ধি হ’ব পাৰে।"</string>
+    <string 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-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 b154afc02..937d016aa 100644
--- a/Settings/res/values-as/strings.xml
+++ b/Settings/res/values-as/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"এপৰ ছেটিংসমূহ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"অৱস্থান, ব্যৱহাৰ আৰু ডায়েগন’ষ্টিক্স, বিজ্ঞাপন"</string>
     <string name="add_account" msgid="7386223854837017129">"একাউণ্ট যোগ কৰক"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"অজ্ঞাত একাউণ্ট"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"একাউণ্ট আঁতৰাওক"</string>
     <string name="account_sync" msgid="4315295293211313989">"ছিংক কৰা এপ্‌বোৰ বাছনি কৰক"</string>
     <string name="sync_now" msgid="4335217984374620551">"এতিয়া ছিংক কৰক"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"পাঠৰ নমুনা"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"অষ্ট্ৰেলিয়াৰ বিস্ময়কৰ যাদুকৰ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"অধ্যায় ১১: অষ্ট্ৰেলিয়াৰ বিস্ময়কৰ পান্নাৰ মহানগৰ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ডৰথী আৰু তেওঁৰ বন্ধুসকলে যদিও সেউজীয়া চশমা পিন্ধি আছিল, বিস্ময়কৰ মহানগৰখনৰ চালে চকু ছাট মৰা ৰূপ দেখি প্ৰথমে তেওঁলোক স্তম্ভিত হৈ পৰিছিল। ৰাস্তাৰ দুয়োফাল সেউজীয়া মাৰ্বলৰ দ্বাৰা সজা আৰু চিকমিক মুকুতাখচিত শাৰী শাৰী ঘৰেৰে ভৰি আছিল। তেওঁলোকে সূৰ্যৰ পোহৰত উজলি উঠা পান্নাবোৰৰ সহায়ত শাৰী শাৰীকৈ যোৰা লগোৱা সেউজীয়া মাৰ্বলেৰে নিৰ্মিত ফুটপাথেৰে খোজ কাঢ়িছিল। খিৰিকিৰ পাল্লাবোৰ সেউজীয়া কাঁচেৰে তৈয়াৰী আছিল, আনকি মহানগৰখনৰ ওপৰৰ আকাশখনো সেউজীয়া আভাৰে ভৰা আছিল আৰু সূৰ্যৰ ৰশ্মিও সেউজীয়া ৰঙৰ আছিল। \n\nতাত সেউজীয়া পোছাক পৰিহিত বহুতো পুৰুষ, মহিলা আৰু শিশুৱে খোজকাঢ়ি আছিল আৰু তেওঁলোকৰ গাৰ ছালৰ বৰণো সেউজীয়া আছিল। তেওঁলোকে ডৰথী আৰু তেওঁৰ সমনীয়াসকলৰ অদ্ভুত দলটোক বিস্ময়ভৰা চকুৰে চালে আৰু শিশুহঁতে সিংহ দেখা পাই দৌৰি গৈ মাকহতঁৰ পাছত লুকাল গৈ, কিন্তু কোনেও তেওঁলোকৰ সৈতে কথা নাপাতিলে। পথত বহুতো দোকান আছিল আৰু ডৰথীয়ে দেখা পালে যে তাত থকা সকলো বস্তুৱেই সেউজীয়া আছিল। সেই দোকানবোৰত সেউজীয়া কেণ্ডী, সেউজীয়া পপকৰ্ন, সেউজীয়া জোতা, সেউজীয়া টুপী আৰু সেউজীয়া ৰঙৰ সকলো ধৰণৰ কাপোৰ বিক্ৰীৰ বাবে ৰখা হৈছিল। এঠাইত মানুহ এজনে সেউজীয়া নেমু চৰবত বিক্ৰী কৰি আছিল আৰু ডৰথীয়ে দেখিলে যে শিশুসকলে চৰবত কিনোঁতে দিয়া মুদ্ৰাবোৰৰ ৰঙো সেউজীয়া আছিল। \n\nতাত ঘোঁৰা অথবা অন্য কোনো ধৰণৰ জন্তু দেখা পোৱা নগৈছিল; পুৰুষসকলে সেউজীয়া ৰঙৰ ঠেলাত বস্তুবোৰ কঢ়িয়াইছিল। সকলোকে সুখী, সন্তুষ্ট আৰু সমৃদ্ধ দেখা গৈছিল।"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ডৰথী আৰু তেওঁৰ বন্ধুসকলে যদিও সেউজীয়া চশমা পিন্ধি আছিল, বিস্ময়কৰ মহানগৰখনৰ চালে চকু ৰোৱা ৰূপ দেখি প্ৰথমে তেওঁলোক স্তম্ভিত হৈ পৰিছিল। ৰাস্তাৰ দুয়োফাল সেউজীয়া মাৰ্বলৰ দ্বাৰা সজা আৰু চিকমিক মুকুতাখচিত শাৰী শাৰী ঘৰেৰে ভৰি আছিল। তেওঁলোকে সূৰ্যৰ পোহৰত উজলি উঠা পান্নাবোৰৰ সহায়ত শাৰী শাৰীকৈ যোৰা লগোৱা সেউজীয়া মাৰ্বলেৰে নিৰ্মিত ফুটপাথেৰে খোজ কাঢ়িছিল। খিৰিকিৰ পাল্লাবোৰ সেউজীয়া কাঁচেৰে তৈয়াৰী আছিল, আনকি মহানগৰখনৰ ওপৰৰ আকাশখনো সেউজীয়া আভাৰে ভৰা আছিল আৰু সূৰ্যৰ ৰশ্মিও সেউজীয়া ৰঙৰ আছিল। \n\nতাত সেউজীয়া পোছাক পৰিহিত বহুতো পুৰুষ, মহিলা আৰু শিশুৱে খোজকাঢ়ি আছিল আৰু তেওঁলোকৰ গাৰ ছালৰ বৰণো সেউজীয়া আছিল। তেওঁলোকে ডৰথী আৰু তেওঁৰ সমনীয়াসকলৰ অদ্ভুত দলটোক বিস্ময়ভৰা চকুৰে চালে আৰু শিশুহঁতে সিংহটো দেখা পাই দৌৰি গৈ মাকহঁতৰ পিছফালে লুকালগৈ; কিন্তু কোনেও তেওঁলোকৰ সৈতে কথা নাপাতিলে। পথত বহুতো দোকান আছিল আৰু ডৰথীয়ে দেখা পালে যে তাত থকা সকলো বস্তুৱেই সেউজীয়া আছিল। সেই দোকানবোৰত সেউজীয়া কেণ্ডী, সেউজীয়া পপকৰ্ন, সেউজীয়া জোতা, সেউজীয়া টুপী আৰু সেউজীয়া ৰঙৰ সকলো ধৰণৰ কাপোৰ বিক্ৰীৰ বাবে ৰখা হৈছিল। এঠাইত মানুহ এজনে সেউজীয়া নেমু চৰবত বিক্ৰী কৰি আছিল আৰু ডৰথীয়ে দেখিলে যে শিশুসকলে চৰবত কিনোতে দিয়া মুদ্ৰাবোৰৰ ৰঙো সেউজীয়া আছিল। \n\nতাত ঘোঁৰা অথবা অন্য কোনো ধৰণৰ জন্তু দেখা পোৱা নগৈছিল; পুৰুষসকলে সেউজীয়া ৰঙৰ ঠেলাত বস্তুবোৰ কঢ়িয়াইছিল। সকলোকে সুখী, সন্তুষ্ট আৰু সমৃদ্ধ দেখা গৈছিল।"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ফৰ্মেটৰ বাছনি"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"স্বয়ংক্ৰিয়"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"মেনুৱেল"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ৰিজ’লিউশ্বন %1$sলৈ সলনি কৰিবনে?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"এতিয়াৰ পৰা %1$s ব্যৱহাৰ কৰিবলৈ ঠিক আছে বাছনি কৰক।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$sত Dolby Vision সমৰ্থিত নহয় আৰু সেইটো \"উচ্চখাপৰ ডিছপ্লে’ৰ ছেটিঙ\"ত অক্ষম কৰা হ’ব"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"এই ম’ডটোৱে %1$s সমৰ্থন কৰে। আপুনি কিছুমান টিভিত অধিক HDR ফৰ্মেট সক্ষম কৰিবলৈ উন্নত HDMI অন কৰিব লগা হ’ব পাৰে। এইটো সমৰ্থিত হয়নে নহয় চাবলৈ আপোনাৰ টিভিৰ ছেটিং পৰীক্ষা কৰক।"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"এই ম\'ডটোৱে সমর্থন কৰে:%1$s\nআপুনি কিছুমান টিভিত অধিক HDR ফৰ্মেট সক্ষম কৰিবলৈ উন্নত HDMI অন কৰিব লগা হ’ব পাৰে। এইটো সমৰ্থিত হয়নে নহয় চাবলৈ আপোনাৰ টিভিৰ ছেটিং পৰীক্ষা কৰক।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"বাতিল কৰক"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ঠিক আছে"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"হাৰ্টজ"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> হাৰ্টজ)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"কেশ্ব কৰা ডেটা মচিবনে?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"এই কাৰ্যই সকলো এপৰ কেশ্ব ডেটা পৰিষ্কাৰ কৰিব।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"সংযোগ কৰা হ’ল"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"সংযোগ বিচ্ছিন্ন কৰা হ\'ল"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ব্লুটুথ ছেটিংসমূহ সলনি কৰিবলৈ আপোনাৰ অনুমতি নাই৷"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"টিভি অডিঅ’ৰ বাবে ব্যৱহাৰ কৰক"</string>
     <string name="send_feedback" msgid="936698637869795473">"মতামত পঠিয়াওক"</string>
     <string name="launch_help" msgid="2607478763131952469">"সহায় কেন্দ্ৰ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"এই ডিভাইচটো আপোনাৰ প্ৰতিষ্ঠানৰ দ্বাৰা পৰিচালিত৷"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>ৰ দ্বাৰা পৰিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"অধিক জানক"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{কেমেৰা এপ্}one{কেমেৰা এপ্}other{কেমেৰা এপ্}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"কেলণ্ডাৰ এপ্"</string>
@@ -375,8 +375,8 @@
     <string name="about_ads" msgid="7662896442040086522">"বিজ্ঞাপনসমূহ"</string>
     <string name="ads_description" msgid="8081069475265061074">"আপোনাৰ বিজ্ঞাপন ID ৰিছেট কৰাৰ দৰে নিজৰ বিজ্ঞাপনৰ ছেটিং পৰিচালনা কৰক।"</string>
     <string name="ads_content_description" msgid="1006489792324920289">"বিজ্ঞাপন, আপোনাৰ বিজ্ঞাপনৰ আইডি ৰিছেট কৰাৰ দৰে নিজৰ বিজ্ঞাপনৰ ছেটিং পৰিচালনা কৰক।"</string>
-    <string name="show_dev_on" msgid="612741433124106067">"এতিয়া আপুনি এজন বিকাশকৰ্তা!"</string>
-    <string name="show_dev_already" msgid="1522591284776449818">"কোনো প্ৰয়োজন নাই, আপুনি ইতিমধ্যে এজন ডেভেলপাৰ।"</string>
+    <string name="show_dev_on" msgid="612741433124106067">"এতিয়া আপুনি এগৰাকী বিকাশকৰ্তা!"</string>
+    <string name="show_dev_already" msgid="1522591284776449818">"কোনো প্ৰয়োজন নাই, আপুনি ইতিমধ্যে এগৰাকী ডেভেলপাৰ।"</string>
     <string name="device_info_default" msgid="2374506935205518448">"অজ্ঞাত"</string>
     <string name="selinux_status" msgid="1146662734953021410">"SELinuxৰ স্থিতি"</string>
     <string name="selinux_status_disabled" msgid="4027105362332795142">"নিষ্ক্ৰিয়"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"সক্ষম কৰক"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"কনফিগাৰেশ্বন"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যৱহাৰ কৰিব নেকি?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g>য়ে পাছৱৰ্ডৰ বাহিৰে, আপুনি লিখা সকলো পাঠ বাৰ্তা সংগ্ৰহ কৰিব পাৰে। ইয়াত ব্যক্তিগত তথ্য যেনে ক্ৰেডিট কাৰ্ডৰ নাম্বাৰো অন্তৰ্ভুক্ত হয়।"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -764,7 +764,7 @@
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP পৰীক্ষণ"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI অপ্টিমাইজেশ্বন"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"এতিয়া ৰিষ্টার্ট কৰিবনে?"</string>
-    <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"এই ছেটিং আপডেইট কৰিবলৈ, আপোনাৰ ডিভাইচটো পুনৰ আৰম্ভ কৰিব লাগিব"</string>
+    <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"এই ছেটিং আপডে’ট কৰিবলৈ, আপোনাৰ ডিভাইচটো পুনৰ আৰম্ভ কৰিব লাগিব"</string>
     <string name="system_never_check" msgid="2860070727606369055">"কেতিয়াও পৰীক্ষা নকৰিব"</string>
     <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"কেৱল ডিআৰএম সমলৰ বাবে পৰীক্ষা কৰক"</string>
     <string name="system_always_check" msgid="384870282800221580">"সদায় পৰীক্ষা কৰক"</string>
@@ -784,7 +784,7 @@
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"জিপিইউ দৰ্শনৰ আপডেইটসমূহ দেখুৱাওক"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"হাৰ্ডৱেৰ লেয়াৰ দেখুৱাওক"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"জিপিইউ অভাৰড্ৰ\' দেখুৱাওক"</string>
-    <string name="system_show_surface_updates" msgid="7680759813613585278">"পৃষ্ঠভাগৰ আপডেইট দেখুৱাওক"</string>
+    <string name="system_show_surface_updates" msgid="7680759813613585278">"পৃষ্ঠভাগৰ আপডে’ট দেখুৱাওক"</string>
     <string name="system_window_animation_scale" msgid="685477540250939659">"ৱিণ্ড\' এনিমেশ্বন স্কেল"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"ট্ৰাঞ্জিশ্বন এনিমেশ্বন স্কেল"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"এনিমেটৰ ব্যৱধানৰ স্কেল"</string>
@@ -804,7 +804,7 @@
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"জিপিইউৰ জৰিয়তে অঁকাৰ সময়ত ৱিণ্ড’ৰ ভিতৰত ফ্লাশ্ব দৰ্শন"</string>
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"আপডে\'ট হওঁতে হাৰ্ডৱেৰ লেয়াৰ সেউজীয়া ৰঙেৰে ফ্লাশ্ব কৰক"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"উৎকৃষ্টৰ পৰা নিকৃষ্টলৈ: নীলা, সেউজীয়া, পাতল ৰঙা, ৰঙা"</string>
-    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"আপডেইট হওতে গোটেই ৱিণ্ড পৃষ্ঠাসমূহ ফ্লাশ্ব কৰক"</string>
+    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"আপডে’ট হওতে গোটেই ৱিণ্ড পৃষ্ঠাসমূহ ফ্লাশ্ব কৰক"</string>
     <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"যেতিয়া এপসমূহে মুখ্য থ্ৰেডত দীঘলীয়া কাৰ্যকলাপ চলাই, তেতিয়া স্ক্ৰীন ফ্লাশ্ব কৰক"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"adb shell dumpsys gfxinfoত ৰেণ্ডাৰিং সময় জোখক"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"অজ্ঞাত উৎসবোৰ"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"সংযোগ সফল হৈছে"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"সকলো দেখুৱাওক"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"সন্ধান কৰি থকা হৈছে"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"বিশ্বাসযোগ্যতা প্ৰমাণকাৰীৰ পৰা একাউণ্ট যোগ দিয়াৰ উদ্দেশ্যৰ বিষয়ে জানিব পৰা নগ’ল।"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"একাউণ্ট যোগ দিব পৰা নগ’ল অথবা একাউণ্টৰ ধৰণটো উপলব্ধ নহয়।"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"চেনেল আৰু ইনপুট"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"চেনেল, বাহ্যিক ইনপুট"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"চেনেল"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"সক্ষম কৰা সুবিধাসমূহ:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"মন কৰিব যে এই ম’ডটোৰ ফলত ডিভাইচটোৱে অধিক শক্তি ব্যয় কৰিব পাৰে।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" সক্ষম কৰক"</string>
+    <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_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 4a47e73e7..c1afd73c5 100644
--- a/Settings/res/values-az/energy-modes.xml
+++ b/Settings/res/values-az/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Vacib şəbəkə funksiyaları"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Aşağı enerji istifadəsi"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV istifadə edilmədikdə şəbəkə bağlantısını söndürün."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Vacib güncəllənmə və funksiyalar"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Tövsiyə edilən şəbəkə funksiyaları"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimallaşdırılmış enerji istifadəsi"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Şəbəkə vasitəsilə TV-ni işə salan funksiyaları aktiv edir (şəbəkə gözləmə rejimi)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Əlavə şəbəkə funksiyaları"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Artan enerji istifadəsi"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Tövsiyə olunan funksiyalardan əlavə, bu seçim TV istifadə edilmədikdə enerji istehlakını artıran əlavə funksiyaları aktiv edir."</string>
+    <string 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-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 ccdb658a0..19c2dc7f3 100644
--- a/Settings/res/values-az/strings.xml
+++ b/Settings/res/values-az/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Tətbiq Ayarları"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Məkan, İstifadə &amp; Diaqnostika, Reklamlar"</string>
     <string name="add_account" msgid="7386223854837017129">"Hesab əlavə edin"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Naməlum hesab"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Hesabı silin"</string>
     <string name="account_sync" msgid="4315295293211313989">"Sinxronlaşmış tətbiqləri seçin"</string>
     <string name="sync_now" msgid="4335217984374620551">"İndi sinxronizə edin"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Mətn nümunəsi"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Ozlu Heyrətamiz Sehrbaz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Fəsil 11: Məftunedici Zümrüd Şəhəri Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Hətta yaşıl eynəklərlə də Şəhərin gözəlliyi Dorothy və onun dostlarının gözlərini qamaşdırdı. Küçələrdə yaşıl mərmərlərdən tikilmiş və parlaq zümrüdlərlə bəzədilmiş gözəl evlər yanbayan düzülmüşdü. Onlar səki ilə gəzirdilər və yaşıl mərmərdən olan səkilərin üstündə, günəş şüaları altında par-par parıldayan zümrüdlər cərgə ilə birləşmişdi. Pəncərənin şüşələri yaşıl idi; hətta səmada yaşıl boya hiss olunurdu və günəşin şüaları da yaşıl idi. \n\nƏtrafda çoxlu adamlar, kişilər, qadınlar və uşaqlar var idi və hər kəs yaşıl paltar geyinmişdi, hətta dəriləri də yaşıl idi. Onlar Dorothy\'yə və ətrafında yad adamlara təəccüblə baxdılar və Aslanı görən kimi uşaqlar tez qaçıb analarının arxasında gizləndilər; amma heç kəs onları dindirmədi. Küçədə çoxlu dükanlar var idi və Dorothy orada hər şeyin yaşıl olduğu gördü. Yaşıl konfetlər, yaşıl popkorn, yaşıl ayaqqabılar, yaşıl papaq və cürbəcür yaşıl paltarlar. Bir kişi yaşıl limonad satırdı və Dorothy gördü ki, uşaqlar onu alanda əvəzində yaşıl pul verdilər. \n\nOrada at yox idi, ümumiyyətlə heç bir heyvan gözə dəymirdi; kişi əşyalarını yaşıl araba ilə daşıyırdı. Hər kəs xoşbəxt, razı və firavan görünürdü."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Hətta yaşıl eynəklərlə də şəhərin gözəlliyi Dorothy və dostlarının gözlərini qamaşdırdı. Küçələrdə yaşıl mərmərlərdən tikilmiş və parlaq zümrüdlərlə bəzədilmiş gözəl evlər yanbayan düzülmüşdü. Onlar yaşıl mərmərdən olan səkidə gəzirdilər. Günəş şüaları altında par-par parıldayan zümrüdlər cərgə ilə birləşmişdi. Pəncərə şüşələri yaşıl idi; hətta səmada yaşıl çalar hiss olunurdu və günəşin şüaları da yaşıl idi. \n\nƏtrafda çoxlu adamlar, kişi, qadın və uşaqlar var idi. Hər kəs yaşıl paltar geyinmişdi. Dəriləri yaşılımtıl idi. Onlar Dorothy və ətrafındakı yad adamlara təəccüblə baxırdılar və Aslanı görən kimi uşaqlar tez qaçıb analarının arxasında gizlənirdilər; amma heç kəs onları dindirmirdi. Küçədə çoxlu dükanlar var idi və Dorothy orada hər şeyin yaşıl olduğunu müşahidə etdi – yaşıl konfetlər, yaşıl popkorn, yaşıl ayaqqabılar, yaşıl papaqlar və cürbəcür yaşıl paltarlar. Bir kişi yaşıl limonad satırdı. Dorothy onu alan uşaqların yaşıl pul ilə ödəniş etdiyini gördü. \n\nOrada at yox idi, ümumiyyətlə heç bir heyvan gözə dəymirdi; kişi əşyalarını yaşıl araba ilə daşıyırdı. Hər kəs xoşbəxt, razı və firavan görünürdü."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Format seçimi"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Avtomatik"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ayırdetmə dəqiqliyi %1$s olaraq dəyişdirilsin?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Bundan sonra %1$s istifadə etmək üçün OK seçin"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s rejimində dəstəklənmir və \"Qabaqcıl Displey Ayarları\"nda deaktiv ediləcək"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Bu rejim %1$s növünü dəstəkləyir. Bəzi TV\'lərdə daha çox HDR formatını aktivləşdirmək üçün qabaqcıl HDMI\'ı aktiv etməli ola bilərsiniz. Bunun dəstəklənib-dəstəklənmədiyini görmək üçün TV ayarlarınızı yoxlayın."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Bu rejim dəstəkləyir: %1$s\nBəzi TV-lərdə digər HDR formatlarını aktivləşdirmək üçün Təkmil HDMI aktiv edilməlidir. Dəstəkləndiyini müəyyənləşdirmək üçün TV ayarlarını yoxlayın."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Ləğv edin"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hs"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hs)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Keşlənmiş data silinsin?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Bu, bütün tətbiqlər üçün keşlənmiş verilənləri siləcək."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Qoşulub"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Ayrılıb"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Bluetooth ayarlarını dəyişməyə icazəniz yoxdur."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"TV audiosu üçün istifadə edin"</string>
     <string name="send_feedback" msgid="936698637869795473">"Rəy göndərin"</string>
     <string name="launch_help" msgid="2607478763131952469">"Yardım Mərkəzi"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Bu cihaz təşkilatınız tərəfindən idarə olunur."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən idarə olunur."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Ətraflı məlumat"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera tətbiqi}other{Kamera tətbiqləri}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Təqvim tətbiqi"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktivləşdirin"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiqurasiya"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətindən istifadə edilsin?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> parollar istisna olmaqla yazdığınız bütün mətni toplaya bilər. Buna kredit kart kimi şəxsi məlumat aid ola bilər."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> ekranı oxuya, kontenti digər tətbiqlər üzərində göstərə, tətbiq və ya avadanlıq sensorları ilə interaksiyanı izləyə və sizin adınızdan tətbiqlərlə interaksiya edə biləcək."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g> dayandırılsın?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"OK seçiminin edilməsi <xliff:g id="SERVICE">%1$s</xliff:g> xidmətini dayandıracaq."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Yazıdan nitqə çevirmə"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Qoşuldu"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Hamısını göstərin"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Axtarış icra olunur"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Doğrulayıcıdan hesab məqsədi əldə edilmədi."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Hesab əlavə edilmədi və ya hesab növü əlçatan deyil."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanallar və Girişlər"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanallar, xarici girişlər"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanallar"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktivləşdirir:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Bu rejim cihazın enerji sərfiyyatını artıra bilər."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" rejiminin aktivləşdirilməsi"</string>
+    <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_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 5385afb16..fc10cf4b8 100644
--- a/Settings/res/values-b+sr+Latn/energy-modes.xml
+++ b/Settings/res/values-b+sr+Latn/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Osnovne mrežne funkcije"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mala potrošnja energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Isključite mrežnu vezu kada se TV ne koristi."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Važna ažuriranja i funkcije"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Preporučene mrežne funkcije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizovana potrošnja energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Uključuje funkcije koje bude TV preko mreže (režim mirovanja na mreži)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Umetnite funkciju 1]"</item>
     <item msgid="8724721267222341891">"[Umetnite funkciju 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne mrežne funkcije"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povećana potrošnja energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Pored preporučenih funkcija, ova opcija uključuje dodatne funkcije kada se TV ne koristi koje mogu da povećaju potrošnju energije."</string>
+    <string 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-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 8e1659473..df2e6c672 100644
--- a/Settings/res/values-b+sr+Latn/strings.xml
+++ b/Settings/res/values-b+sr+Latn/strings.xml
@@ -65,9 +65,10 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Podešavanja aplikacije"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokacija, korišćenje i dijagnostika, oglasi"</string>
     <string name="add_account" msgid="7386223854837017129">"Dodaj nalog"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Nepoznat nalog"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Uklanjanje naloga"</string>
     <string name="account_sync" msgid="4315295293211313989">"Izaberite sinhronizovane aplikacije"</string>
-    <string name="sync_now" msgid="4335217984374620551">"Sinhronizuj odmah"</string>
+    <string name="sync_now" msgid="4335217984374620551">"Sinhronizuj"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Sinhronizovanje…"</string>
     <string name="last_synced" msgid="8371967816955123864">"Poslednji put sinhronizovano <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Onemogućeno je"</string>
@@ -75,7 +76,7 @@
     <string name="account_remove_failed" msgid="5654411101098531690">"Nije moguće ukloniti nalog"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
-    <string name="sync_one_time_sync" msgid="1665961083810584134">"Sinhronizuj odmah<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="1665961083810584134">"Sinhronizuj<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_failed" msgid="2998289556481804047">"Sinhronizacija nije uspela"</string>
     <string name="sync_active" msgid="1621239982176888680">"Sinhronizacija je aktivna"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Primer teksta"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Čarobnjak iz Oza"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Poglavlje 11: Čudesni Smaragdni grad Oza"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"I pored toga što su im oči bile zaštićene zelenim naočarima, Doroti i njeni prijatelji su u prvom trenutku bili zaslepljeni sjajem čudesnog grada. Ulice su bile pune prelepih kuća sagrađenih od zelenog mermera i ukrašenih svetlucavim smaragdima. Hodali su pločnikom od istog zelenog mermera, a na mestima na kojima su se ploče spajale nalazili su se gusto poređani smaragdi koji su se presijavali na suncu. Čak je i nebo iznad grada bilo zelene boje, kao i sunčevi zraci. \n\nNa ulicama je bilo mnogo ljudi. Muškarci, žene i deca su šetali, pri čemu su svi nosili zelena odela i imali zelenkastu kožu. Posmatrali su Doroti i njeno neobično društvo sa čuđenjem, a deca su bežala i krila se iza svojih majki kad bi videla Lava. Međutim, niko im se nije obraćao. U ulici je bilo mnogo radnji, a Doroti je primetila da je u njima sve bilo zeleno. Prodavale su se zelene bombone i kokice, zelene cipele, zeleni šeširi i zelena odeća svih vrsta. Na jednom mestu je neki čovek prodavao zelenu limunadu, a Doroti je primetila da su je deca plaćala zelenim novčićima. \n\nČinilo se da nema konja niti bilo kakvih drugih životinja. Ljudi su stvari nosili u malim zelenim kolicima koja su gurali ispred sebe. Svi su izgledali srećno, zadovoljno i uspešno."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"I pored toga što su im oči bile zaštićene zelenim naočarima, Doroti i njeni prijatelji su u prvom trenutku bili zaslepljeni sjajem čudesnog grada. Ulice su bile pune prelepih kuća sagrađenih od zelenog mermera i ukrašenih svetlucavim smaragdima. Hodali su pločnikom od istog zelenog mermera, a na mestima na kojima su se ploče spajale nalazili su se gusto poređani smaragdi koji su se presijavali na suncu. Čak je i nebo iznad grada bilo zelene boje, kao i sunčevi zraci. \n\nNa ulicama je bilo mnogo ljudi. Muškarci, žene i deca su šetali, pri čemu su svi nosili zelena odela i imali zelenkastu kožu. Posmatrali su Doroti i njeno neobično društvo sa čuđenjem, a deca su bežala i krila se iza svojih majki kad bi videla Lava. Međutim, niko im se nije obraćao. U ulici je bilo mnogo radnji, a Doroti je primetila da je u njima sve bilo zeleno. Prodavale su se zelene bombone i kokice, zelene cipele, zeleni šeširi i zelena odeća svih vrsta. Na jednom mestu je neki čovek prodavao zelenu limunadu, a Doroti je primetila da su je deca plaćala zelenim novčićima. \n\nČinilo se da nema konja niti bilo kakvih drugih životinja. Ljudi su stvari nosili u malim zelenim kolicima koja su gurali ispred sebe. Svi su izgledali srećno, zadovoljno i uspešno."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Izbor formata"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatski"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ručno"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Želite da promenite rezoluciju u %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Izaberite Potvrdi da biste koristili %1$s od sada."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolbi Vision nije podržan na %1$s i biće onemogućen u „Naprednim podešavanjima prikaza“"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ovaj režim podržava %1$s. Na nekim televizorima ćete možda morati da uključite poboljšan HDMI da biste omogućili više HDR formata. Proverite podešavanja TV-a da biste videli da li je to podržano."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ovaj režim podržava: %1$s\nNa nekim televizorima ćete možda morati da uključite poboljšan HDMI da biste omogućili više HDR formata. Proverite podešavanja TV-a da biste videli da li je to podržano."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Otkaži"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Potvrdi"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite li da obrišete keširane podatke?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Biće obrisani keširani podaci za sve aplikacije."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Povezano"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Veza je prekinuta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nemate dozvolu za promenu podešavanja Bluetooth-a."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Koristi za zvuk TV-a"</string>
     <string name="send_feedback" msgid="936698637869795473">"Pošaljite povratne informacije"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centar za pomoć"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ovim uređajem upravlja organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Saznajte više"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacija za kameru}one{Aplikacije za kameru}few{Aplikacije za kameru}other{Aplikacije za kameru}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija Kalendar"</string>
@@ -549,7 +549,7 @@
     <string name="storage_free_up" msgid="5719667150891467122">"Oslobodite memorijski prostor"</string>
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"Obrišite keširane podatke"</string>
     <string name="storage_free_up_clear_cached_data_summary" msgid="3111860361699185304">"Oslobodite <xliff:g id="SPACE">%1$s</xliff:g>"</string>
-    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Briše privremene fajlove koji zauzimaju prostor. Ne utiče na sačuvane podatke, poput podešavanja aplikacije ili oflajn video snimaka i nećete morati da se ponovo prijavljujete u aplikacije"</string>
+    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Briše privremene fajlove koji zauzimaju prostor. Ne utiče na sačuvane podatke, poput podešavanja aplikacije ili oflajn videa i nećete morati da se ponovo prijavljujete u aplikacije"</string>
     <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"Želite li da obrišete keširane podatke?"</string>
     <string name="storage_free_up_clear_cached_data_confirm_description" msgid="4840728913914074729">"Biće obrisani keširani podaci za sve aplikacije."</string>
     <string name="storage_free_up_uninstall_apps" msgid="7755671754934975908">"Deinstaliraj aplikacije"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Omogući"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguracija"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Želite li da koristite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> može da prikuplja sav tekst koji unesete, izuzev lozinki. To podrazumeva lične podatke, kao što su brojevi kreditnih kartica."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> će moći da čita vaš ekran, prikazuje sadržaj preko drugih aplikacija, prati vašu interakciju sa aplikacijama ili hardverskim senzorima i komunicira sa aplikacijama u vaše ime."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Želite li da zaustavite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ako izaberete Potvrdi, zaustavićete <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Pretvaranje teksta u govor"</string>
@@ -759,7 +759,7 @@
     <string name="system_drawing" msgid="5802739024643871942">"Crtanje"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Nadgledanje"</string>
     <string name="system_apps" msgid="8481888654606868074">"Aplikacije"</string>
-    <string name="system_stay_awake" msgid="5935117574414511413">"Ne zaključavaj"</string>
+    <string name="system_stay_awake" msgid="5935117574414511413">"Ne gasi ekran"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Ekran nikada neće biti u režimu spavanja"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP provera"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI optimizacija"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Povezano je"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Prikaži sve"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Pretražuje se"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Preuzimanje namere za dodavanje naloga iz potvrđivača identiteta nije uspelo."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Dodavanje naloga nije uspelo ili tip naloga nije dostupan."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanali i ulazi"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanali, spoljni ulazi"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanali"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Omogućava:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Imajte na umu da ovaj režim može da poveća potrošnju energije na uređaju."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite režim <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 4472e275d..ec885b173 100644
--- a/Settings/res/values-be/energy-modes.xml
+++ b/Settings/res/values-be/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Неабходныя функцыі сеткі"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Нізкае спажыванне энергіі"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Выключаць падключэнне да сеткі, калі тэлевізар не выкарыстоўваецца."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Важныя абнаўленні і функцыі"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Рэкамендаваныя функцыі сеткі"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Аптымізаванае спажыванне энергіі"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Уключае функцыі, якія абуджаюць тэлевізар па сетцы (рэжым чакання праз сетку)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Дадатковыя функцыі сеткі"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Павышанае спажыванне энергіі"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Акрамя рэкамендаваных функцый, гэты параметр уключае дадатковыя функцыі, калі тэлевізар не выкарыстоўваецца, што можа павялічыць спажыванне энергіі."</string>
+    <string 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-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 3c88b5998..ed1e1967a 100644
--- a/Settings/res/values-be/strings.xml
+++ b/Settings/res/values-be/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Налады праграмы"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Месцазнаходжанне, выкарыстанне і дыягностыка, рэклама"</string>
     <string name="add_account" msgid="7386223854837017129">"Дадаць уліковы запіс"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Невядомы ўліковы запіс"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Выдаліць уліковы запіс"</string>
     <string name="account_sync" msgid="4315295293211313989">"Выберыце сінхранізаваныя праграмы"</string>
     <string name="sync_now" msgid="4335217984374620551">"Сінхранізаваць"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Прымусова перавесці ў фармат HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Стандартна размова будзе прымусова адкрывацца ў <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ваш дысплэй будзе мець раздзяляльнасць 1080p 60 Гц. Гэты параметр несумяшчальны з вашым дысплэем пры выкарыстанні раздзяляльнасці 4k 60 Гц."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision не падтрымліваецца ў бягучай раздзяляльнасці. Калі вы ўключыце Dolby Vision уручную, раздзяляльнасць экрана будзе зменена на 1080p 60 Гц"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Змяніць раздзяляльнасць на 1080p 60 Гц?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Заўсёды прымусова задаваць фармат Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Калі фармат Dolby Vision адключаны ў Фарматах HDR у пашыраных наладах дысплэя, прымусовае задаванне фармату Dolby Vision зноў уключыць яго."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Заўсёды прымусова задаваць фармат HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Прыклад тэксту"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Чараўнік краіны Оз"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Раздзел 11. Цудоўны Смарагдавы Горад у краіне Оз"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Нават надзеўшы зялёныя акуляры, Дораці і яе сябры былі ашаломленыя зіхаценнем дзівоснага Горада. Уздоўж вуліц стаялі прыгожыя дамы з зялёнага мармуру, упрыгожаныя бліскучымі смарагдамі. Кампанія ішла па ходніку з зялёнага мармуру, а шчыліны паміж плітамі былі запоўненыя смарагдамі, што ззялі пад праменямі сонца. Шыбы ў вокнах былі з зялёнага шкла, нават неба над Смарагдавым Горадам мела зялёнае адценне, а сонца свяціла зялёнымі праменямі. \n\nВакол хадзілі мужчыны, жанчыны, дзеці, і ўсе яны насілі зялёнае адзенне, і скура ў іх была зеленаватая. Яны са здзіўленнем глядзелі на Дораці і яе дзіўную кампанію, а дзеці ўцякалі і хаваліся за спіны мацярок, калі бачылі Льва; але ніхто не адважваўся загаварыць. На вуліцы было шмат крам, і Дораці заўважыла, што ўсе тавары былі зялёнага колеру. Зялёныя цукеркі і зялёная паветраная кукуруза, зялёныя чаравікі, зялёныя капелюшы і зялёныя касцюмы любых фасонаў. Дораці пабачыла, як прадавец гандляваў зялёным ліманадам, а дзеці расплачваліся за яго зялёнымі манеткамі. \n\nНе было відаць ні коней, ні іншай жывёлы. Мужчыны вазілі грузы ў маленькіх зялёных калясках. Усе выглядалі вясёлымі, задаволенымі і паспяховымі."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Нават надзеўшы зялёныя акуляры, Дораці і яе сябры былі ашаломленыя зіхаценнем дзівоснага Горада. Уздоўж вуліц стаялі прыгожыя дамы з зялёнага мармуру, упрыгожаныя бліскучымі смарагдамі. Кампанія ішла па ходніку з зялёнага мармуру, а шчыліны паміж плітамі былі запоўненыя смарагдамі, што ззялі пад праменямі сонца. Шыбы ў вокнах былі з зялёнага шкла, нават неба над Смарагдавым Горадам мела зялёнае адценне, а сонца свяціла зялёнымі праменямі. \n\nВакол хадзілі мужчыны, жанчыны, дзеці, і ўсе яны насілі зялёнае адзенне, і скура ў іх была зеленаватая. Яны са здзіўленнем глядзелі на Дораці і яе дзіўную кампанію, а дзеці ўцякалі і хаваліся за спіны мацярок, калі бачылі Льва; але ніхто не адважваўся загаварыць. На вуліцы было шмат крам, і Дораці заўважыла, што ўсе тавары былі зялёнага колеру. Зялёныя цукеркі і зялёная паветраная кукуруза, зялёныя чаравікі, зялёныя капелюшы і зялёныя касцюмы любых фасонаў. Дораці пабачыла, як прадавец гандляваў зялёным ліманадам, а дзеці расплачваліся за яго зялёнымі манеткамі. \n\nНе было відаць ні коней, ні іншай жывёлы. Мужчыны вазілі грузы ў маленькіх зялёных калясках. Усе выглядалі вясёлымі, задаволенымі і паспяховымі."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Фармаціраваць вылучанае"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Аўтаматычна"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Уручную"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Змяніць раздзяляльнасць на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Выберыце ОК, каб адразу ж выкарыстоўваць %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision не падтрымліваецца ў рэжыме %1$s і будзе адключаны ў пашыраных наладах дысплэя"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Гэты рэжым падтрымлівае %1$s. На некаторых тэлевізарах можа спатрэбіцца ўключыць палепшаны HDMI, каб выкарыстоўваць больш фарматаў HDR. Даведацца, якія фарматы падтрымліваюцца, можна ў наладах тэлевізара."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Гэты рэжым падтрымлівае: %1$s\nНа некаторых тэлевізарах можа спатрэбіцца ўключыць палепшаны HDMI, каб выкарыстоўваць больш фарматаў HDR. Даведацца, якія фарматы падтрымліваюцца, можна ў наладах тэлевізара."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Скасаваць"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ОК"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ачысціць кэшаваныя даныя?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Гэта ачысціць кэшаваныя даныя для ўсіх праграм."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Падключана"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Адключана"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"У вас няма дазволу на змяненне налад Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Выкарыстоўваць для вываду гуку з тэлевізара"</string>
     <string name="send_feedback" msgid="936698637869795473">"Адправіць водгук"</string>
     <string name="launch_help" msgid="2607478763131952469">"Даведачны цэнтр"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Гэта прылада знаходзіцца пад кіраваннем вашай арганізацыі."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Даведацца больш"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Праграма \"Камера\"}one{Праграмы \"Камера\"}few{Праграмы \"Камера\"}many{Праграмы \"Камера\"}other{Праграмы \"Камера\"}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Праграма \"Каляндар\""</string>
@@ -359,7 +357,7 @@
     <string name="app_names_concatenation_template_2" msgid="5297284354915830297">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"Кіраўніцтвы"</string>
-    <string name="about_system_update" msgid="7421264399111367755">"Абнаўленні сістэмы"</string>
+    <string name="about_system_update" msgid="7421264399111367755">"Абнаўленне сістэмы"</string>
     <string name="system_update_description" msgid="998883510488461766">"У выніку праграмнае забеспячэнне сістэмы будзе абноўлена да апошняй версіі. Ваша прылада будзе перазапушчана."</string>
     <string name="system_update_content_description" msgid="5702888187682876466">"Абнаўленне сістэмы. У выніку гэтага дзеяння праграмнае забеспячэнне сістэмы будзе абноўлена да апошняй версіі. Ваша прылада будзе перазапушчана."</string>
     <string name="about_preference" msgid="9112690446998150670">"Інфармацыя"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Уключыць"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Канфігурацыя"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Уключыць <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Служба <xliff:g id="SERVICE">%1$s</xliff:g> можа захоўваць увесь уведзены тэкст (напрыклад, нумары крэдытных карт), за выключэннем пароляў."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"Нацiск \"ОК\" спыніць <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Сінтэз маўлення"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Падключэнне выканана"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Паказаць усе"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Ідзе пошук"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Не ўдалося атрымаць намер \"Дадаць уліковы запіс\" ад сродку аўтэнтыфікацыі."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Не ўдалося дадаць уліковы запіс, або выбраны тып уліковага запісу недаступны."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Каналы і ўваходы"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Каналы, знешнія ўваходы"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Каналы"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Уключае:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Улічвайце, што гэты рэжым можа павялічыць спажыванне энергіі прыладай."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Уключыць рэжым \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 5eddee9d8..8ef75c8c9 100644
--- a/Settings/res/values-bg/energy-modes.xml
+++ b/Settings/res/values-bg/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основни мрежови функции"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Ниска консумация на енергия"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Изключване на връзката с мрежата, когато телевизорът не се използва."</string>
+    <string 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-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Важни актуализации и функции"</item>
+    <item msgid="4976202876230149030">"Критични актуализации и функции"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Препоръчителни мрежови функции"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизирана консумация на енергия"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Включва функции, които активират телевизора през мрежата (режим на готовност с връзка с мрежата)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Допълнителни мрежови функции"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Повишена консумация на енергия"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Освен препоръчителните функции тази опция задейства и допълнителни такива, когато телевизорът не се използва, което може да доведе до по-висока консумация на енергия."</string>
+    <string 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-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 493c02d81..c196b8236 100644
--- a/Settings/res/values-bg/strings.xml
+++ b/Settings/res/values-bg/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Настройки за приложението"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Местоположение, употреба и диагностика, реклами"</string>
     <string name="add_account" msgid="7386223854837017129">"Добавяне на профил"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Неизвестен профил"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Премахване на профила"</string>
     <string name="account_sync" msgid="4315295293211313989">"Избор на приложения"</string>
     <string name="sync_now" msgid="4335217984374620551">"Синхронизиране сега"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Примерен текст"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Вълшебникът от Оз"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Глава 11: Удивителният изумруден град на Оз"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Макар зелените очила да предпазваха очите им, отначало Дороти и приятелите ѝ бяха заслепени от блясъка на великолепния град. По улиците се редяха красиви къщи, целите изградени от зелен мрамор и обсипани с искрящи изумруди. Групата се движеше по паваж от същия зелен мрамор, като блокчетата бяха свързани с редици от гъсто разположени изумруди, които блестяха на ярката слънчева светлина. Прозорците на къщите бяха със зелени стъкла. Дори небето над града бе обагрено в зелено, а слънчевите лъчи бяха зелени.\n\nРазхождаха се много хора – мъже, жени и деца. Всички бяха облечени в зелени дрехи и имаха зеленикава кожа. Те гледаха Дороти и странните ѝ спътници с учудени погледи, а децата бягаха и се криеха зад майките си, щом видеха Лъва. Но никой не започваше разговор с тях. На улицата имаше много магазини и Дороти забеляза, че всичко в тях е зелено. Продаваха се зелени бонбони и зелени пуканки, всевъзможни зелени обувки, зелени шапки и зелени дрехи. На едно място някакъв мъж продаваше зелена лимонада и Дороти видя, че децата плащат със зелени монети.\n\nНе се виждаха коне или други животни. За пренасяне мъжете използваха малки зелени колички, които бутаха. Всички изглеждаха доволни, щастливи и благоденстващи."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Макар зелените очила да предпазваха очите им, отначало Дороти и приятелите ѝ бяха заслепени от блясъка на великолепния град. По улиците се редяха красиви къщи, целите изградени от зелен мрамор и обсипани с искрящи изумруди. Групата се движеше по паваж от същия зелен мрамор, като блокчетата бяха свързани с редици от гъсто разположени изумруди, които блестяха на ярката слънчева светлина. Прозорците на къщите бяха със зелени стъкла. Дори небето над града бе обагрено в зелено, а слънчевите лъчи бяха зелени.\n\nРазхождаха се много хора – мъже, жени и деца. Всички бяха облечени в зелени дрехи и имаха зеленикава кожа. Те гледаха Дороти и странните ѝ спътници с учудени погледи, а децата бягаха и се криеха зад майките си, щом видеха Лъва. Но никой не започваше разговор с тях. На улицата имаше много магазини и Дороти забеляза, че всичко в тях е зелено. Продаваха се зелени бонбони и зелени пуканки, всевъзможни зелени обувки, зелени шапки и зелени дрехи. На едно място някакъв мъж продаваше зелена лимонада и Дороти видя, че децата плащат със зелени монети.\n\nНе се виждаха коне или други животни. За пренасяне мъжете използваха малки зелени колички, които бутаха. Всички изглеждаха доволни, щастливи и благоденстващи."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Избиране на формат"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автоматично"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ръчно"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Искате ли да промените разделителната способност на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Изберете OK, за да използвате %1$s занапред."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Режимът Dolby Vision не се поддържа при %1$s и ще бъде деактивиран в „Разширени настройки за дисплея“"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Този режим поддържа %1$s. На някои телевизори може да се наложи да включите подобрения HDMI режим, за да активирате още HDR формати. Проверете дали той се поддържа в настройките на телевизора."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Този режим поддържа: %1$s\nНа някои телевизори може да се наложи да включите подобрения HDMI режим, за да активирате още HDR формати. Проверете дали той се поддържа в настройките на телевизора."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Отказ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Да се изчистят ли кешираните данни?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Това ще изчисти кешираните данни за всички прил."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Установена е връзка"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Връзката е прекратена"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Нямате разрешение да променяте настройките за Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Използване за аудио за телевизора"</string>
     <string name="send_feedback" msgid="936698637869795473">"Изпращане на отзиви"</string>
     <string name="launch_help" msgid="2607478763131952469">"Помощен център"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Това устройство се управлява от организацията ви."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Това устройство се управлява от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Научете повече"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Приложение за камера}other{Приложения за камера}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Приложение за календар"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Активиране"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурация"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Да се използва ли „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ може да събира целия въвеждан от вас текст с изключение на паролите. Това включва лични данни, като номера на кредитни карти."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"С избирането на „OK“ ще спрете „<xliff:g id="SERVICE">%1$s</xliff:g>“."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Синтезиран говор"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Връзката е успешна"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Показване на всички"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Търси се"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Извличането на намерението за добавяне на профил от инструмента за удостоверяване не бе успешно."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Добавянето на профил не бе успешно или типът профил не е налице."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Канали и входове"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Канали, външни входове"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Канали"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Активира:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имайте предвид, че този режим може да увеличи консумацията на енергия на устройството."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Активиране на „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
+    <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_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 d67b9a003..d66bae1b3 100644
--- a/Settings/res/values-bn/energy-modes.xml
+++ b/Settings/res/values-bn/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"প্রয়োজনীয় নেটওয়ার্ক ফিচার"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"কম শক্তি খরচ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"টিভি ব্যবহার না হলে নেটওয়ার্ক কানেকশন বন্ধ করুন।"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"গুরুত্বপূর্ণ আপডেট এবং ফাংশন"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"প্রস্তাবিত নেটওয়ার্ক ফিচার"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"অপ্টিমাইজ করা শক্তি খরচ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"নেটওয়ার্কে টিভি চালু করে এমন ফিচারগুলি চালু করে (স্ট্যান্ডবাই মোড)।"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"অতিরিক্ত নেটওয়ার্কের ফিচার"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"শক্তির ব্যবহার বৃদ্ধি"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"প্রস্তাবিত ফিচার ছাড়াও, এই বিকল্পটি অতিরিক্ত ফিচার চালু করে যখন টিভি ব্যবহার করা হয় না, যা পাওয়ার খরচ বাড়াতে পারে।"</string>
+    <string 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-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 bcd274978..746d02675 100644
--- a/Settings/res/values-bn/strings.xml
+++ b/Settings/res/values-bn/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"অ্যাপ সেটিংস"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"লোকেশন, ব্যবহার এবং ডায়াগনস্টিকস, বিজ্ঞাপন"</string>
     <string name="add_account" msgid="7386223854837017129">"অ্যাকাউন্ট জুড়ুন"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"অপরিচিত অ্যাকাউন্ট"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"অ্যাকাউন্ট সরান"</string>
     <string name="account_sync" msgid="4315295293211313989">"সিঙ্ক করা অ্যাপ বেছে নিন"</string>
     <string name="sync_now" msgid="4335217984374620551">"এখনই সিঙ্ক করুন"</string>
@@ -158,18 +159,16 @@
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"সিস্টেমকে ফর্ম্যাট কনভার্সন ম্যানেজ করতে দিন"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"এই বিকল্পটি বেছে নেওয়া হলে, সিস্টেমটি আপনার ডিসপ্লেতে পাঠানোর জন্য উপযুক্ত ডায়নামিক রেঞ্জ নির্ধারণ করবে এবং প্রয়োজন অনুসারে এই ডায়নামিক রেঞ্জে কন্টেন্ট কনভার্ট করবে।"</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"সবসময় কন্টেন্ট ফর্ম্যাটের সাথে ম্যাচ করে"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"কনভার্সন চালু করা"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"পছন্দের ফর্ম্যাটে কনভার্সন চালু করা"</string>
+    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ফোর্স কনভার্সন চালু করুন"</string>
+    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"পছন্দের ফর্ম্যাটে ফোর্স কনভার্সন হয়"</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"পছন্দের ফর্ম্যাটে কনভার্সন চালু করা। কনভার্সন চালু করা হলে, \'ডিসপ্লে মোড\' বা HDR ফর্ম্যাটে অন্যান্য সেটিংসে প্রভাব ফেলতে পারে।"</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"সবসময়ে SDR-এ"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"সবসময় <xliff:g id="HDR_TYPE">%s</xliff:g>-এ"</string>
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"আপনি কি HDR আউটপুট চালু করতে চান?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"সাধারণত, কনভার্সন <xliff:g id="HDR_TYPE">%s</xliff:g>-এ চালু করা হয়।"</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"আপনার ডিসপ্লে 1080p 60Hz রেজোলিউশনে চলবে। 4k 60Hz রেজোলিউশনে চলাকালীন এই বিকল্পটি আপনার ডিসপ্লের সাথে সামঞ্জস্যপূর্ণ নয়।"</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"বর্তমান রেজোলিউশনে Dolby Vision কাজ করে না। ম্যানুয়ালি Dolby Vision চালু করলে, আপনার ডিসপ্লের রেজোলিউশন পরিবর্তিত হয়ে ১০৮০পিক্সেল ৬০হার্জ হবে"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"রেজোলিউশন পরিবর্তন করে ১০৮০পিক্সেল ৬০হার্জ করতে চান?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"সবসময় Dolby ভিশনে কনভার্সন চালু করা"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"অ্যাডভান্সড ডিসপ্লে সেটিংসে HDR ফর্ম্যাটে Dolby ভিশন বন্ধ করা থাকলে, Dolby ভিশনে কনভার্সন এটিকে আবার চালু করবে।"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10-এ সবসময় কনভার্সন চালু করা"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"স্যাম্পেল টেক্সট"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"দি ওয়ান্ডারফুল উইজার্ড অফ ওজ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"চ্যাপ্টার ১১: দি ওয়ান্ডারফুল এমারল্ড সিটি অফ ওজ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"চোখে সবুজ চশমা লাগানো থাকলেও, ডরোথি ও তার বন্ধুরা অপূর্ব এই শহরের প্রথম চমক দেখেই অবাক হয়ে গেছিল। রাস্তায় সারিবদ্ধভাবে থাকা সুন্দর সব ঘর, তার সবগুলি সবুজ মার্বেল নির্মিত এবং সর্বত্র ঝলমলে পান্নাখচিত। তারা সেই একই সবুজ মার্বেলের তৈরি একটি ফুটপাথ ধরে হেঁটে চলেছিল, যেখানে একটির সাথে আর একটি ব্লক পরপর সাজানো পান্না দিয়ে যুক্ত করে কঠিনভাবে সেট করা এবং তা সূর্যের আলোকে চকচক করছিল। জানালার সার্শিগুলোও সবুজ কাচের তৈরি; এমনকি শহরের আকাশেও ছিল সবুজের আভা আর সূর্যের কিরণের রঙও সবুজ। \n\nঅনেক লোকজন, পুরুষ, মহিলা ও শিশু সেই পথে যাতায়াত করছিল, সকলেরই পরনে সবুজ রঙের পোশাক, আর তাদের গায়ের রঙও সবুজাভ। তারা ডরোথি ও তার বিস্ময়কর সঙ্গীদের অবাক চোখে দেখছিল এবং সিংহটিকে দেখামাত্র বাচ্চারা তাদের মায়েদের পিছনে লুকিয়ে পড়ল; তবে কেউই তাদের সঙ্গে কোনও কথা বলল না। রাস্তার পাশে অনেক দোকান, ডরোথি দেখল সেখানেও সবকিছুই সবুজ রঙের। সেখানে বিক্রির জন্য সাজানো ছিল সবুজ ক্যান্ডি, সবুজ ভুট্টার খই এমনকি সবুজ জুতো, সবুজ টুপি। আর যত রকম জামাকাপড় ছিল, সবই সবুজ রঙের। একজন লোক এক জায়গায় দাঁড়িয়ে সবুজ রঙের শরবত বিক্রি করছিল। ডরোথি দেখল, একজন বাচ্চা সেটা কিনে সবুজ রঙের পয়সা দিয়ে দাম দিল। \n\nদেখে মনে হচ্ছিল, সেখানে ঘোড়া বা অন্য কোনও ধরনের প্রাণী নেই; পুরুষরা ছোট সবুজ ঠেলাগাড়িতে করে কাছাকাছি জিনিসপত্র বয়ে নিয়ে যাচ্ছিল। প্রত্যেককেই খুশি, সন্তুষ্ট ও সমৃদ্ধ বলে মনে হচ্ছিল।"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"চোখে সবুজ চশমা লাগানো থাকলেও, ডরোথি ও তার বন্ধুরা অপূর্ব এই শহরের প্রথম চমক দেখেই অবাক হয়েছিল। রাস্তায় সারিবদ্ধভাবে থাকা সুন্দর সুন্দর সব বাড়ি, তার সবগুলি সবুজ মার্বেল নির্মিত এবং সর্বত্র ঝলমলে পান্নাখচিত। তারা সেই একই সবুজ মার্বেলের তৈরি একটি ফুটপাথ ধরে হেঁটেছিল, যেখানে একটির সাথে আর একটি ব্লক পরপর সাজানো পান্না দিয়ে যুক্ত করে কঠিনভাবে সেট করা এবং তা সূর্যের আলোকে চকচক করছিল। জানালার সার্শিগুলোও সবুজ কাচের তৈরি; এমনকি শহরের আকাশেও ছিল সবুজের আভা আর সূর্যের কিরণের রঙও সবুজ। \n\nঅনেক লোকজন, পুরুষ, মহিলা ও শিশু সেই পথে যাতায়াত করছিল, সকলেরই পরনে সবুজ রঙের পোশাক, আর তাদের গায়ের রঙও সবুজাভ। ডরোথি ও তার বিস্ময়কর সঙ্গীদের তারা অবাক চোখে দেখছিল এবং সিংহটিকে দেখামাত্র বাচ্চারা তাদের মায়েদের পিছনে লুকিয়ে পড়ল; তবে কেউই তাদের সঙ্গে কোনও কথা বলল না। রাস্তার পাশে অনেক দোকান, ডরোথি দেখল সেখানেও সবকিছুই সবুজ রঙের। সেখানে বিক্রির জন্য সাজানো ছিল সবুজ ক্যান্ডি, সবুজ ভুট্টার খই এমনকি সবুজ জুতো, সবুজ টুপি। আর যত রকম জামাকাপড় ছিল, সবই সবুজ রঙের। একজন লোক এক জায়গায় দাঁড়িয়ে সবুজ রঙের শরবত বিক্রি করছিল। ডরোথি দেখল, একজন বাচ্চা সেটা কিনে সবুজ রঙের পয়সা দিয়ে দাম দিল। \n\nদেখে মনে হচ্ছিল, সেখানে ঘোড়া বা অন্য কোনও ধরনের প্রাণী নেই; পুরুষরা ছোট সবুজ ঠেলাগাড়িতে করে কাছাকাছি দূরত্বে জিনিসপত্র বয়ে নিয়ে যাচ্ছিল। প্রত্যেককেই খুশি, সন্তুষ্ট ও সমৃদ্ধ বলে মনে হচ্ছিল।"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ফর্ম্যাট বেছে নেওয়া"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"অটোমেটিক"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ম্যানুয়াল"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"%1$s-এ রেজোলিউশন পরিবর্তন করবেন?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"এখন থেকে %1$s ব্যবহার করার জন্য \'ঠিক আছে\' বিকল্প বেছে নিন।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s-এ Dolby Vision কাজ করে না এবং \"উন্নত ডিসপ্লে সেটিংস\" থেকে তা বন্ধ করে দেওয়া হবে"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"%1$s এই মোডে কাজ করে। কিছু টিভিতে, আরও HDR ফর্ম্যাট চালু করতে, আপনাকে উন্নত HDMI চালু করতে হতে পারে। এটি কাজ করবে কিনা তা দেখতে, আপনার টিভি সেটিংস চেক করুন।"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"%1$s: এই মোডে কাজ করবে\nকিছু টিভিতে, আরও HDR ফর্ম্যাট চালু করতে, আপনাকে উন্নত HDMI চালু করতে হতে পারে। এটি কাজ করবে কিনা তা দেখতে, আপনার টিভির সেটিংস চেক করুন।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"বাতিল করুন"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ঠিক আছে"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ক্যাশে করা ডেটা সাফ করবেন?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"এটি সব অ্যাপ্লিকেশানগুলি থেকে ক্যাশে করা ডেটা সাফ করে দেবে।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"কানেক্ট করা আছে"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ডিসকানেক্ট হয়ে গেছে"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"আপনার কাছে ব্লুটুথ সেটিংস পরিবর্তন করার অনুমতি নেই৷"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"টিভি অডিওর জন্য ব্যবহার করুন"</string>
     <string name="send_feedback" msgid="936698637869795473">"মতামত জানান"</string>
     <string name="launch_help" msgid="2607478763131952469">"সহায়তা কেন্দ্র"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"আপনার প্রতিষ্ঠান এই ডিভাইসটি পরিচালনা করে।"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"আরও জানুন"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ক্যামেরা অ্যাপ}one{ক্যামেরা অ্যাপ}other{ক্যামেরা অ্যাপ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ক্যালেন্ডার অ্যাপ"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"চালু করুন"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"কনফিগারেশন"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যবহার করবেন?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"পাসওয়ার্ড ছাড়া আপনি অন্য যে পাঠ্য টাইপ করেন তার সবই <xliff:g id="SERVICE">%1$s</xliff:g> সংগ্রহ করতে পারে। ব্যক্তিগত তথ্য যেমন ক্রেডিট কার্ড নম্বর এর মধ্যে অন্তর্ভুক্ত।"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"কানেক্ট করা হয়েছে"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"সব দেখুন"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"সার্চ করা হচ্ছে"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Authenticator-এর থেকে অ্যাকাউন্ট যোগ করার ইনটেন্ট রিট্রিভ করা যায়নি।"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"অ্যাকাউন্ট যোগ করা যায়নি বা অ্যাকাউন্টের ধরন উপলভ্য নেই।"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"চ্যানেল ও ইনপুট"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"চ্যানেল, এক্সটার্নাল ইনপুট"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"চ্যানেল"</string>
@@ -1123,8 +1123,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="7196407759836930799">"টিভি ব্যবহার না করাকালীন পাওয়ার সাশ্রয় করার ক্ষমতা উন্নত করুন"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"চালু করে:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"মনে রাখবেন যে এই মোড ডিভাইসের শক্তি খরচ বাড়াতে পারে।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" চালু করুন"</string>
+    <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_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 f570b036a..f9eba0690 100644
--- a/Settings/res/values-bs/energy-modes.xml
+++ b/Settings/res/values-bs/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Osnovne funkcije mreže"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niska potrošnja energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Isključite mrežnu vezu kada se TV ne koristi."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Ključna ažuriranja i funkcije"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Preporučene funkcije mreže"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizirana potrošnja energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Uključuje funkcije koje bude TV putem mreže (mreža u stanju mirovanja)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Umetni funkciju 1]"</item>
     <item msgid="8724721267222341891">"[Umetni funkciju 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne funkcije mreže"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povećana potrošnja energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Uz preporučene funkcije ova opcija uključuje dodatne funkcije kada se TV ne koristi, koje mogu povećati potrošnju energije."</string>
+    <string 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-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 e31b485cd..2b09be8ce 100644
--- a/Settings/res/values-bs/strings.xml
+++ b/Settings/res/values-bs/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Postavke aplikacije"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokacija, Korištenje i dijagnostika, Oglasi"</string>
     <string name="add_account" msgid="7386223854837017129">"Dodaj račun"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Nepoznat račun"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Ukloni račun"</string>
     <string name="account_sync" msgid="4315295293211313989">"Odaberite sinhronizirane aplikacije"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinhroniziraj sada"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Uzorak teksta"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Čarobnjak iz Oza"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Poglavlje 11: Smaragdni grad Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"I pored toga što su im oči bile zaštićene zelenim naočalama, Dorothy i njeni prijatelji su isprva bili zaslijepljeni blještavilom tog grada. Ulicama su se nizale predivne zelene kuće izgrađene od zelenog mermera i obasute svjetlucavim smaragdima. Hodali su trotoarom od istog zelenog mermera, a na spoju između blokova nalazili su se usko postavljeni redovi smaragda koji su svjetlucali od sunčevog sjaja. Prozorska okna su bila od zelenog stakla. Čak je i nebo iznad grada imalo zeleni odsjaj, baš kao i sunčeve zrake. \n\nTu je bilo mnogo ljudi, muškaraca, žena i djece, šetali su odjeveni u zelenu odjeću i imali su zelenkastu kožu. S čuđenjem su gledali u Dodorthy i njenu čudnovatu družinu. Kada su vidjeli lava, sva djeca su pobjegla i sakrila se iza svojih majki, ali niko im se nije obraćao. Na ulici je bilo mnogo prodavnica, a Dorothy je vidjela da je u njima sve zeleno. U ponudi su bili zeleni slatkiši i zelene kokice, kao i zelene cipele, zeleni šeširi i raznorazna zelena odjeća. Na jednom mjestu čovjek je prodavao zelenu limunadu, a kada su je djeca kupovala, Dorothy je vidjela da plaćaju zelenim novčićima. \n\nKoliko se dalo primijetiti, tamo nije bilo konja ni bilo kojih drugih životinja, a muškarci su raznosili stvari pomoću zelenih kolica koja su gurali pred sobom. Svi su djelovali sretno, zadovoljno i uspješno."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"I pored toga što su im oči bile zaštićene zelenim naočalama, Dorothy i njeni prijatelji su isprva bili zaslijepljeni blještavilom tog grada. Ulicama su se nizale predivne zelene kuće izgrađene od zelenog mermera i obasute svjetlucavim smaragdima. Hodali su trotoarom od istog zelenog mermera, a na spoju između blokova nalazili su se usko postavljeni redovi smaragda koji su svjetlucali od sunčevog sjaja. Prozorska okna su bila od zelenog stakla. Čak je i nebo iznad grada imalo zeleni odsjaj, baš kao i sunčeve zrake. \n\nTu je bilo mnogo ljudi, muškaraca, žena i djece, šetali su obučeni u zelenu odjeću i imali su zelenkastu kožu. S čuđenjem su gledali u Dorothy i njenu čudnovatu družinu. Kada su vidjeli lava, sva djeca su pobjegla i sakrila se iza svoje majke, ali niko im se nije obraćao. Na ulici je bilo mnogo prodavnica, a Dorothy je vidjela da je u njima sve zeleno. U ponudi su bili zeleni slatkiši i zelene kokice, kao i zelene cipele, zeleni šeširi i raznorazna zelena odjeća. Na jednom mjestu čovjek je prodavao zelenu limunadu, a kada su je djeca kupovala, Dorothy je vidjela da plaćaju zelenim novčićima. \n\nKoliko se dalo primijetiti, tamo nije bilo konja ni bilo kojih drugih životinja, a muškarci su raznosili stvari pomoću zelenih kolica koja su gurali ispred sebe. Svi su djelovali sretno, zadovoljno i uspješno."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Odabir formata"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatski"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ručno"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Promijeniti rezoluciju u %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Odaberite Uredu da ubuduće koristite %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nije podržan na %1$s i onemogućit će se u meniju \"Napredne postavke ekrana\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ovaj način rada podržava %1$s. Na nekim TV-ima ćete možda morati uključiti Poboljšani HDMI da omogućite više HDR formata. Provjerite postavke TV-a da vidite je li ovo podržano."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ovaj način rada podržava: %1$s\nna nekim TV-ima možda ćete morati uključiti Poboljšani HDMI da omogućite više HDR formata. Provjerite postavke TV-a da vidite je li ovo podržano."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Otkaži"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Uredu"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite li obrisati keširane podatke?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ovim će se obrisati keširani podaci za sve aplikacije."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Povezano"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Veza je prekinuta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nemate odobrenje da mijenjate postavke za Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Koristi za zvuk TV-a"</string>
     <string name="send_feedback" msgid="936698637869795473">"Slanje povratnih informacija"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centar za pomoć"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ovim uređajem upravlja vaša organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Saznajte više"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacija za kameru}one{Aplikacije za kameru}few{Aplikacije za kameru}other{Aplikacije za kameru}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija za kalendar"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Omogući"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguracija"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Koristiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> može prikupljati sav tekst koji napišete, osim lozinki. Ovo uključuje lične podatke kao što su brojevi kreditnih kartica."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> će moći čitati sadržaj ekrana, prikazivati sadržaj preko drugih aplikacija, pratiti interakcije s aplikacijama ili hardverskim senzorima i stupati u interakciju s aplikacijama u vaše ime."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Odabirom opcije Uredu, usluga <xliff:g id="SERVICE">%1$s</xliff:g> će se zaustaviti."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Pretvaranje teksta u govor"</string>
@@ -982,7 +982,7 @@
     <string name="factory_reset_description" msgid="6697396335158766785">"Ovim će se vaš uređaj vratiti na zadane postavke te će se potpuno izbrisati svi podaci, računi, fajlovi i preuzete aplikacije."</string>
     <string name="factory_reset_info_description" msgid="5098454670833183487">"Ovim će se vaš uređaj vratiti na zadane postavke te će se potpuno izbrisati svi podaci, računi, fajlovi i preuzete aplikacije."</string>
     <string name="factory_reset_content_description" msgid="1677022688420116803">"Vraćanje na fabričke postavke, Ovim će se vaš uređaj vratiti na zadane postavke te će se potpuno izbrisati svi podaci, računi, fajlovi i preuzete aplikacije."</string>
-    <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Izbrisati sve vaše lične informacije i preuzete aplikacije s ovog uređaja? Ovu radnju ne možete opozvati!"</string>
+    <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Potpuno izbrisati sve vaše lične informacije i preuzete aplikacije s ovog uređaja? Ovu radnju ne možete opozvati!"</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"Izbriši sve"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"Odaberite naziv za uređaj <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
     <string name="select_device_name_description" msgid="8528185095614986580">"Dajte svom uređaju naziv radi lakše identifikacije prilikom emitiranja ili povezivanja s drugih uređaja."</string>
@@ -1046,8 +1046,8 @@
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Dozvolite aplikacijama da kreiraju prozor u načinu rada Slika u slici dok je aplikacija otvorena ili nakon što je napustite (npr. da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Dozvolite aplikacijama da postavljaju alarme i zakazuju vremenski osjetljive radnje. Ovim će se omogućiti aplikacijama da rade u pozadini, čime se može povećati potrošnja energije.\n\nAko je ovo odobrenje isključeno, postojeći alarmi i događaji zasnovani na vremenu koje je aplikacija zakazala neće funkcionirati."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Uključivanje ekrana"</string>
-    <string name="allow_turn_screen_on" msgid="4903401106871656521">"Dozvolite uključivanje ekrana"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Dozvolite aplikaciji da uključi ekran. Ako se odobri, aplikacija može uključiti ekran bilo kada bez vaše izričite namjere."</string>
+    <string name="allow_turn_screen_on" msgid="4903401106871656521">"Dozvoli uključivanje ekrana"</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Dozvolite aplikaciji da uključuje ekran. Ako se odobri, aplikacija može uključiti ekran bilo kada bez vaše izričite namjere."</string>
     <string name="special_access" msgid="21806055758289916">"Poseban pristup za aplikacije"</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">"Zvučni zapis"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Povezivanje je uspjelo"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Prikaži sve"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Pretraživanje"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Preuzimanje namjere dodavanja računa iz autentifikatora nije uspjelo."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Dodavanje računa nije uspjelo ili vrsta računa nije dostupna."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanali i ulazi"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanali, vanjski ulazi"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanali"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Omogućava:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Imajte na umu da ovaj način rada može povećati potrošnju energije uređaja."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 c62e4f6d5..befe8c0c6 100644
--- a/Settings/res/values-ca/energy-modes.xml
+++ b/Settings/res/values-ca/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcions de xarxa essencials"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Consum energètic baix"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva la connexió a la xarxa quan el televisor no es fa servir."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Actualitzacions i funcions importants"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcions de xarxa recomanades"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consum energètic optimitzat"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funcions que activen el televisor a través de la xarxa (mode d\'espera en xarxa)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcions de xarxa addicionals"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Augment del consum energètic"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"A més de les funcions recomanades, aquesta opció activa funcions addicionals que poden augmentar el consum energètic quan el televisor no es fa servir."</string>
+    <string 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-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 49981b63f..2d4724cb9 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Configuració de l\'aplicació"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Ubicació, Ús i diagnòstic, Anuncis"</string>
     <string name="add_account" msgid="7386223854837017129">"Afegeix un compte"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Compte desconegut"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Suprimeix el compte"</string>
     <string name="account_sync" msgid="4315295293211313989">"Tria aplicacions sincronitzades"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronitza ara"</string>
@@ -151,12 +152,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configuració avançada del so"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permet el mode de joc"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Iguala amb el rang dinàmic del contingut"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Fes coincidir amb el rang dinàmic del contingut"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"En activar aquesta opció, el sistema canviarà entre els diferents formats de rang dinàmic per igualar-lo amb el del contingut. És possible que la pantalla es torni negra durant el canvi de format.\n\nFes clic a Configuració avançada de la pantalla per a més opcions de rang dinàmic."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Rang dinàmic preferit"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversió preferida pel sistema"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permet que el sistema gestioni la conversió del format"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"En seleccionar aquesta opció, el sistema determinarà un rang dinàmic adequat perquè s\'enviï a la teva pantalla i converteixi el contingut en aquest rang dinàmic segons calgui."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"En seleccionar aquesta opció, el sistema determinarà un rang dinàmic adequat per a la teva pantalla i convertirà el contingut a aquest rang dinàmic, si cal."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Sempre coincideix amb el format del contingut"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Força la conversió"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força la conversió a un format preferit"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vols forçar la sortida HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De manera predeterminada, la conversió es forçarà a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"La pantalla s\'executarà amb una resolució de 1080p a 60Hz. Aquesta opció no és compatible amb la teva pantalla quan s\'executa amb una resolució de 4K a 60Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision no s\'admet amb la resolució actual. Si actives Dolby Vision manualment, es canviarà a una resolució de pantalla de 1080p a 60 Hz."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vols canviar a una resolució de 1080p a 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Força sempre la conversió a Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si Dolby Vision no està activat als formats HDR de la configuració avançada de la pantalla, forçant la conversió a Dolby Vision es tornarà a activar."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Força sempre la conversió a HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Text de mostra"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"El meravellós mag d\'Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítol 11: La meravellosa Ciutat Maragda d\'Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Fins i tot amb els ulls protegits per les ulleres verdes, la Dorothy i els seus amics van quedar enlluernats per la brillantor de la meravellosa ciutat. A banda i banda dels carrers es dreçaven cases boniques, totes fetes de marbre verd amb incrustacions de maragdes guspirejants. El terra també era fet del mateix marbre verd, i totes les juntures eren cobertes de rengleres de maragdes, una al costat de l\'altra, que guspirejaven a la llum del sol. Els vidres de les finestres eren verds; i fins i tot el cel, damunt la ciutat, tenia un to verdós, i els raigs del sol eren verds. \n\nPertot es veia molta gent, homes, dones i criatures, vestits tots de verd i amb la pell verdosa. Tothom mirava la Dorothy i els seus companys amb sorpresa i curiositat, i les criatures fugien per amagar-se rere les seves mares quan veien el Lleó; però ningú no els va adreçar la paraula. Pels carrers hi havia moltes botigues i parades, i la Dorothy es fixà que tot el que hi venien era verd: caramels verds, rosetes de blat de moro verdes, sabates verdes, barrets verds i vestits verds de tota mena. En una de les parades, un home venia gasosa verda, i la Dorothy es va adonar que les criatures que en compraven pagaven amb monedes verdes. \n\nSemblava que en tota la ciutat no hi havia cavalls ni animals de cap mena. Els homes transportaven les coses en petits carretons verds, que empenyien davant seu. Tothom semblava feliç, content i pròsper."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Fins i tot amb els ulls protegits per les ulleres verdes, la Dorothy i els seus amics van quedar enlluernats per la brillantor de la meravellosa ciutat. A banda i banda dels carrers es dreçaven cases boniques, totes fetes de marbre verd amb incrustacions de maragdes guspirejants. El terra també era fet del mateix marbre verd, i totes les juntures eren cobertes de rengleres de maragdes, una al costat de l\'altra, que guspirejaven a la llum del sol. Els vidres de les finestres eren verds; i fins i tot el cel, damunt la ciutat, tenia un to verdós, i els raigs del sol eren verds. \n\nPertot es veia molta gent, homes, dones i criatures, vestits tots de verd i amb la pell verdosa. Tothom mirava la Dorothy i els seus companys amb sorpresa i curiositat, i les criatures fugien per amagar-se rere les seves mares quan veien el Lleó; però ningú no els va adreçar la paraula. Pels carrers hi havia moltes botigues i parades, i la Dorothy es fixà que tot el que hi venien era verd: caramels verds, rosetes de blat de moro verdes, sabates verdes, barrets verds i vestits verds de tota mena. En una de les parades, un home venia gasosa verda, i la Dorothy es va adonar que les criatures que en compraven pagaven amb monedes verdes. \n\nSemblava que en tota la ciutat no hi havia cavalls ni animals de cap mena. Els homes transportaven les coses en petits carretons verds, que empenyien davant seu. Tothom semblava feliç, content i pròsper."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Selecció del format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automàtic"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vols canviar la resolució a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecciona D\'acord per utilitzar %1$s a partir d\'ara."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no s\'admet a %1$s i es desactivarà a Configuració avançada de la pantalla"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Aquest mode admet %1$s. En alguns televisors, és possible que hagis d\'activar l\'HDMI millorat per tenir disponibles més formats HDR. Comprova la configuració del televisor per veure si és compatible."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Aquest mode admet: %1$s\nEn alguns televisors, és possible que hagis d\'activar l\'HDMI millorat per tenir disponibles més formats HDR. Comprova la configuració del televisor per veure si és compatible."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel·la"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"D\'acord"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vols esborrar dades emmagatzem. a memòria cau?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"S\'esborraran dades aplicacions a la memòria cau."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connectat"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconnectat"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"No tens permís per canviar la configuració del Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Utilitza per a l\'àudio del televisor"</string>
     <string name="send_feedback" msgid="936698637869795473">"Envia suggeriments"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centre d’ajuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"La teva organització gestiona aquest dispositiu."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> gestiona aquest dispositiu."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Més informació"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicació de càmera}other{Aplicacions de càmera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicació de calendari"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Activa"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuració"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> pot recopilar tot allò que escriguis excepte les contrasenyes. Això inclou dades personals com ara números de targetes de crèdit."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> podrà llegir contingut de la pantalla, mostrar contingut sobre altres aplicacions, fer un seguiment de les teves interaccions amb aplicacions o sensors de maquinari i interaccionar amb aplicacions en nom teu."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Vols aturar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Si selecciones D\'acord, s\'aturarà <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text a parla"</string>
@@ -787,8 +785,8 @@
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Mostra la capa de programari"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Mostra el sobredibuix de la GPU"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"Mostra els canvis de superfície"</string>
-    <string name="system_window_animation_scale" msgid="685477540250939659">"Escala de l\'animació de la finestra"</string>
-    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Escala de l\'animació de transició"</string>
+    <string name="system_window_animation_scale" msgid="685477540250939659">"Escala d\'animació de la finestra"</string>
+    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Escala d\'animació de la transició"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Escala de durada de l\'animació"</string>
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Mode estricte activat"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Perfil de representació de GPU"</string>
@@ -807,7 +805,7 @@
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Il·lumina capes de maquinari en verd en actualitzar-se"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"De millor a pitjor: blau, verd, vermell clar, vermell"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Il·lumina superfície de finestres en actualitzar-se"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Il·lumina si aplicacions tarden molt al procés principal"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Il·lumina la pantalla quan les aplicacions facin operacions llargues al fil principal"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"Mesura temps represen. a adb shell dumpsys gfxinfo"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"Fonts desconegudes"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"Permet instal·lar aplicacions que no siguin de Play Store"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"S\'ha connectat correctament"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostra-ho tot"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"S\'està cercant"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"No s\'ha pogut recuperar l\'intent de l\'autenticador per afegir el compte."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"No s\'ha pogut afegir el compte o el tipus de compte no està disponible."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canals i entrades"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canals, entrades externes"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canals"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Activa:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tingues en compte que aquest mode pot augmentar el consum d\'energia del dispositiu."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activa <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 447863836..7fe52fbe6 100644
--- a/Settings/res/values-cs/energy-modes.xml
+++ b/Settings/res/values-cs/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Základní síťové funkce"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Nízká spotřeba energie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Vypnout připojení k síti, když televizi nikdo nepoužívá."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Důležité aktualizace a funkce"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Doporučené síťové funkce"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalizovaná spotřeba energie"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Zapne funkce, které televizi probudí přes síť (pohotovostní režim s připojením k síti)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Vložit funkci 1]"</item>
     <item msgid="8724721267222341891">"[Vložit funkci 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Další síťové funkce"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Zvýšená spotřeba energie"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Tato možnost zapíná kromě doporučených funkcí také další funkce, což může vést k vyšší spotřebě energie, když televize není používána."</string>
+    <string 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-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 343af4db7..2cde3ef8c 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -65,13 +65,14 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Nastavení aplikací"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Poloha, využití a diagnostika, reklamy"</string>
     <string name="add_account" msgid="7386223854837017129">"Přidat účet"</string>
-    <string name="account_header_remove_account" msgid="8573697553061331373">"Odebrat účet"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Neznámý účet"</string>
+    <string name="account_header_remove_account" msgid="8573697553061331373">"Odstranit účet"</string>
     <string name="account_sync" msgid="4315295293211313989">"Vyberte aplikace k synchronizaci"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synchronizovat"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Synchronizace…"</string>
     <string name="last_synced" msgid="8371967816955123864">"Poslední synchronizace: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Vypnuto"</string>
-    <string name="account_remove" msgid="8456848988853890155">"Odebrat účet"</string>
+    <string name="account_remove" msgid="8456848988853890155">"Odstranit účet"</string>
     <string name="account_remove_failed" msgid="5654411101098531690">"Účet nelze odebrat"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"Obnovení továrních dat"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrace"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"Časovač vypnutí"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Nastavte časovače, které vypnout televizi za účelem úspory energie"</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Nastavte časovače, které vypnou televizi za účelem úspory energie"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Zařízení"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Vybrat formáty"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Ukázkový text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Čaroděj ze země Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kapitola 11: Smaragdové město v zemi Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"I přestože měli oči chráněné zelenými brýlemi, Dorotka a její přátelé byli oslněni krásou celého města. Ulice byly lemovány nádhernými domy ze zeleného mramoru posetého blyštivými smaragdy. Chodníky byly dlážděny stejným druhem zeleného mramoru a jednotlivé dlaždice od sebe dělily řady úzce sázených smaragdů, které se leskly ve slunečním svitu. Okenní tabule byly ze zeleného skla, dokonce i obloha nad městem měla zelený nádech i sluneční paprsky byly zelené. \n\nKolem procházelo mnoho lidí – muži, ženy i děti. Všichni byli zelení a nosili zelené oblečení. Zraky všech se upíraly na Dorotku a její neobvykle různorodé společníky. Když děti zahlédly i Lva, utíkaly se schovat za své maminky. Nikdo se neodvážil na skupinku promluvit. V ulici bylo mnoho obchodů a Dorotka si všimla, že také v nich je všechno zelené. Bonbony, popcorn, boty, klobouky, oblečení všech druhů. Na jednom místě prodávali zelenou limonádu, a když ji děti kupovaly, platily za ni zelenými mincemi. \n\nZdálo se, že ve městě nejsou koně ani jakákoli zvířata. Lidé k převážení věcí používali zelené vozíky, které tlačili před sebou. Všichni vypadali, že jsou spokojeni a daří se jim."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"I přestože měli oči chráněné zelenými brýlemi, Dorotka a její přátelé byli oslněni krásou celého města. Ulice byly lemovány nádhernými domy ze zeleného mramoru posetého blyštivými smaragdy. Chodníky byly dlážděny stejným druhem zeleného mramoru a jednotlivé dlaždice od sebe dělily řady úzce sázených smaragdů, které se leskly ve slunečním svitu. Okenní tabule byly ze zeleného skla, dokonce i obloha nad městem měla zelený nádech i sluneční paprsky byly zelené. \n\nKolem procházelo mnoho lidí – muži, ženy i děti. Všichni byli zelení a nosili zelené oblečení. Zraky všech se upíraly na Dorotku a její neobvykle různorodé společníky. Když děti zahlédly i Lva, utíkaly se schovat za své maminky. Nikdo se neodvážil na skupinku promluvit. V ulici bylo mnoho obchodů a Dorotka si všimla, že také v nich je všechno zelené. Bonbony, popcorn, boty, klobouky, oblečení všech druhů. Na jednom místě prodávali zelenou limonádu a když ji děti kupovaly, platily za ni zelenými mincemi. \n\nZdálo se, že ve městě nejsou koně ani jakákoli zvířata. Lidé k převážení věcí používali zelené vozíky, které tlačili před sebou. Všichni vypadali, že jsou spokojeni a daří se jim."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Výběr formátu"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automaticky"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ručně"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Změnit rozlišení na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pokud chcete od teď používat rozlišení %1$s, vyberte OK"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision není při rozlišení %1$s podporováno a v „Rozšířených nastaveních obrazu“ bude deaktivováno"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Tento režim podporuje rozlišení %1$s. Na některých televizích můžete zapnout vylepšené HDMI a zpřístupnit si tak další formáty HDR. V nastavení televize ověříte, zda je tato možnost podporována."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Tento režim podporuje rozlišení: %1$s.\nNa některých televizích můžete zapnout vylepšené HDMI a zpřístupnit si tak další formáty HDR. V nastavení televize ověříte, zda je tato možnost podporována."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Zrušit"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vymazat data uložená v mezipaměti?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Tímto vymažete z mezipaměti data všech aplikací."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -263,7 +263,7 @@
     <string name="bluetooth_pair_accessory" msgid="5508750142754420984">"Spárovat příslušenství"</string>
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"Příslušenství"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"Dálkové ovládání"</string>
-    <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Nastavení dálkového ovládání"</string>
+    <string name="bluetooth_official_remote_entry_title" msgid="6699700335229570038">"Nastavení dálkového ovladače"</string>
     <string name="bluetooth_ir_entry_title" msgid="6927284710576530479">"Nastavení tlačítek dálkového ovládání"</string>
     <string name="bluetooth_ir_entry_subtitle" msgid="4606207128353416151">"Ovládání hlasitosti, vstupu a napájení televizorů, přijímačů a soundbarů"</string>
     <string name="bluetooth_connect_action_title" msgid="7715342395313781643">"Připojit"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Připojeno"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Odpojeno"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nemáte oprávnění měnit nastavení Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Používá se pro zvuk televize"</string>
     <string name="send_feedback" msgid="936698637869795473">"Odeslat zpětnou vazbu"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centrum nápovědy"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Toto zařízení spravuje vaše organizace."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Toto zařízení je spravováno organizací <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Další informace"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikace k focení a natáčení}few{Aplikace k focení a natáčení}many{Aplikace k focení a natáčení}other{Aplikace k focení a natáčení}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendářová aplikace"</string>
@@ -390,7 +390,7 @@
     <string name="device_status_summary" msgid="3270932829412434985">"Síť, sériová čísla a další údaje"</string>
     <string name="manual" msgid="5683935624321864999">"Ručně"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"Informace o předpisech"</string>
-    <string name="device_feedback" msgid="4871903271442960465">"Odeslat názor na toto zařízení"</string>
+    <string name="device_feedback" msgid="4871903271442960465">"Odeslat zpětnou vazbu na toto zařízení"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Bootloader je již odemknut"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"Nejprve se připojte k internetu"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"Připojte se k internetu nebo kontaktujte operátora"</string>
@@ -403,7 +403,7 @@
     <string name="status_unavailable" msgid="2033933928980193334">"Nedostupné"</string>
     <string name="device_status_title" msgid="9051569510258883673">"Stav"</string>
     <string name="battery_status_title" msgid="8850166742025222210">"Stav baterie"</string>
-    <string name="battery_level_title" msgid="2672804570916248736">"Nabití baterie"</string>
+    <string name="battery_level_title" msgid="2672804570916248736">"Stav baterie"</string>
     <string name="status_bt_address" msgid="7190052214963950844">"Adresa Bluetooth"</string>
     <string name="status_up_time" msgid="1758102680983108313">"Doba provozu"</string>
     <string name="legal_information" msgid="1087445528481370874">"Právní informace"</string>
@@ -425,7 +425,7 @@
     <string name="title_signal_strength" msgid="5047116893338315998">"Síla signálu"</string>
     <string name="title_random_mac_settings" msgid="6685812569356353378">"Soukromí"</string>
   <string-array name="random_mac_settings_entries">
-    <item msgid="3457228452595715533">"Používat randomizovanou adresu MAC (výchozí)"</item>
+    <item msgid="3457228452595715533">"Používat náhodnou adresu MAC (výchozí nastavení)"</item>
     <item msgid="2490415280467390067">"Používat adresu MAC zařízení"</item>
   </string-array>
     <string name="mac_address_not_available" msgid="2992935344891853369">"Nedostupné"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Zapnuto"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurace"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Použít <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> může shromažďovat veškerý text, který napíšete, kromě hesel. Může uchovávat i osobní údaje, jako jsou čísla platebních karet."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> bude moci číst vaši obrazovku, zobrazovat obsah v jiných aplikacích, sledovat vaše interakce s aplikacemi nebo hardwarovými senzory a interagovat za vás s aplikacemi."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Zastavit <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Výběrem možnosti OK zastavíte službu <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Převod textu na řeč"</string>
@@ -1047,7 +1047,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Povolte aplikacím nastavovat budíky a plánovat akce závislé na čase. Aplikace poběží na pozadí, což může vést k vyšší spotřebě energie.\n\nPokud je toto oprávnění vypnuté, stávající budíky a události závislé na čase naplánované aplikací nebudou fungovat."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Zapnout obrazovku"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Povolit zapínání obrazovky"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Povolte aplikaci zapínat obrazovku. Pokud aplikace bude mít toto oprávnění, může kdykoli zapnout obrazovku bez explicitního intentu."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Povolte aplikaci zapínat obrazovku. Pokud aplikace bude mít toto oprávnění, může kdykoli zapnout obrazovku bez požadavku uživatele."</string>
     <string name="special_access" msgid="21806055758289916">"Zvláštní přístup aplikací"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>, <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"Zvuk"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Připojení úspěšně navázáno"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Zobrazit vše"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Vyhledávání"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nepodařilo se načíst záměr přidání účtu z ověřovací aplikace."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Účet se nepodařilo přidat nebo typ účtu není k dispozici."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanály a vstupy"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanály, externí vstupy"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanály"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Zapne tyto funkce:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"V tomto režimu může zařízení spotřebovávat více energie."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Zapnout režim <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 fc7b7d627..644cd9711 100644
--- a/Settings/res/values-da/energy-modes.xml
+++ b/Settings/res/values-da/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Vigtige netværksfunktioner"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lavt energiforbrug"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Deaktiver netværksforbindelsen, når fjernsynet ikke er i brug"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Vigtige opdateringer og funktioner"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Anbefalede netværksfunktioner"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimeret energiforbrug"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Aktiverer funktioner, der vækker fjernsynet via netværket (netværkstilsluttet standbytilstand)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Yderligere netværksfunktioner"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Øget energiforbrug"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ud over de anbefalede funktioner aktiverer denne indstilling yderligere funktioner, når fjernsynet ikke er i brug, som kan øge energiforbruget."</string>
+    <string 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-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 4312f8ccd..f59d1de8e 100644
--- a/Settings/res/values-da/strings.xml
+++ b/Settings/res/values-da/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Appindstillinger"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokation, brug og diagnostik, annoncer"</string>
     <string name="add_account" msgid="7386223854837017129">"Tilføj konto"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Ukendt konto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Fjern konto"</string>
     <string name="account_sync" msgid="4315295293211313989">"Vælg synkroniserede apps"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synkroniser nu"</string>
@@ -151,12 +152,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Avancerede lydindstillinger"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Tillad spiltilstand"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Dynamisk område for matchet indhold"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match dynamisk område for indhold"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Når du aktiverer denne mulighed, vil systemet skifte mellem forskellige dynamiske områdeformater for at matche indholdet. Dette kan medføre, at skærmen bliver sort under et formatskift.\n\nKlik på Avancerede skærmindstillinger for at se flere muligheder for dynamiske områder."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Foretrukket dynamisk område"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Systemforetrukken konvertering"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lader systemet administrere konverteringen af formatet"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Når denne mulighed er valgt, fastlægger systemet et passende dynamisk interval, som sendes til din skærm, og konverterer indholdet i overensstemmelse med dette dynamiske interval efter behov."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Når denne mulighed er valgt, fastlægger systemet et passende dynamisk område, som sendes til din skærm, og konverterer indholdet i overensstemmelse med dette dynamiske område efter behov."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Matcher altid indholdets format"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Gennemtving konvertering"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Gennemtvinger konvertering til foretrukket format"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Eksempeltekst"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Den vidunderlige troldmand fra Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kapitel 11: Den vidunderlige smaragdby i Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Selv med øjnene beskyttet bag de grønne briller blev Dorothy og hendes venner til at starte med forblændet af byens vidunderlige funklen. Langs gaderne stod smukke huse i grøn marmor bestrøet med skinnende smaragder. De gik hen over et fortov, der var lavet af det samme grønne marmor, og der hvor fliserne mødtes, var der rækker af smaragder, der side om side skinnede i lyset fra solen. Ruderne var af grønt glas. Selv himlen over byen havde et grønt skær, og solens stråler var grønne. \n\nMange mennesker, både mænd, kvinder og børn, gik omkring, og de var alle klædt i grønt og havde en grønlig hud. De kiggede med undrende øjne på Dorothy og hendes mærkværdige brogede følge, og børnene løb alle hen og gemte sig bag deres mødre, da de så Løven, men der var ingen, der talte til dem. Der var mange butikker på gaden, og Dorothy kunne se, at alle varerne var grønne. Der blev solgt grønt slik og grønne popcorn, grønne sko, grønne hatte og alle slags grønne klæder. En mand solgte grøn lemonade, og da børnene købte det, kunne Dorothy se, at de betalte for det med grønne penge. \n\nDer så ikke ud til at være heste eller dyr af nogen art, og mændene kørte med ting i små grønne vogne, som de skubbede foran sig. Alle virkede glade og tilfredse og velstående."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Selv med øjnene beskyttet bag de grønne briller blev Dorothy og hendes venner til at starte med forblændet af byens vidunderlige funklen. Langs gaderne stod smukke huse i grøn marmor bestrøet med skinnende smaragder. De gik hen over et fortov, der var lavet af det samme grønne marmor, og der hvor fliserne mødtes, var der rækker af smaragder, der side om side skinnede i lyset fra solen. Ruderne var af grønt glas. Selv himlen over byen havde et grønt skær, og solens stråler var grønne. \n\nMange mennesker, både mænd, kvinder og børn, gik omkring, og de var alle klædt i grønt og havde en grønlig hud. De kiggede med undrende øjne på Dorothy og hendes mærkværdige brogede følge, og børnene løb alle hen og gemte sig bag deres mødre, da de så Løven, men der var ingen, der talte til dem. Der var mange butikker på gaden, og Dorothy kunne se, at alle varerne var grønne. Der blev solgt grønt slik og grønne popcorn, grønne sko, grønne hatte og alle slags grønne klæder. En mand solgte grøn lemonade, og da børnene købte det, kunne Dorothy se, at de betalte for det med grønne penge. \n\nDer så ikke ud til at være heste eller dyr af nogen art, og mændene kørte med ting i små grønne vogne, som de skubbede foran sig. Alle virkede glade og tilfredse og velstående."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Valg af format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatisk"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuelt"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vil du skifte opløsning til %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Vælg OK for at bruge %1$s fremover."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision understøttes ikke med %1$s og deaktiveres under \"Avancerede skærmindstillinger\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Denne tilstand understøtter %1$s. På nogle fjernsyn skal du muligvis aktivere forbedret HDMI for at aktivere flere HDR-formater. Tjek dit fjernsyns indstillinger for at se, om dette understøttes."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Denne tilstand understøtter: %1$s\nPå visse fjernsyn kan det være nødvendigt at aktivere Forbedret HDMI for at få flere HDR-formater. Tjek dit fjernsyns indstillinger for at se, om denne funktion understøttes."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuller"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vil du rydde cachelagrede data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Dette vil rydde cachelagrede data for alle apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +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="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>
@@ -321,7 +322,7 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="7244796629052581085">"Installerede apps"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="3875568975752197381">"Antallet af apps er et skøn. Apps, der er blevet installeret uden for Play Butik, er muligvis ikke medregnet."</string>
     <string name="enterprise_privacy_number_packages_lower_bound" msgid="4518330667109848939">"{count,plural, =1{Mindst # app}one{Mindst # app}other{Mindst # apps}}"</string>
-    <string name="enterprise_privacy_location_access" msgid="8978502415647245748">"Adgangstilladelser til lokation"</string>
+    <string name="enterprise_privacy_location_access" msgid="8978502415647245748">"Lokationstilladelser"</string>
     <string name="enterprise_privacy_microphone_access" msgid="3746238027890585248">"Adgangstilladelser til mikrofon"</string>
     <string name="enterprise_privacy_camera_access" msgid="6258493631976121930">"Adgangstilladelser til kamera"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="5538330175901952288">"Standardapps"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Denne enhed administreres af din organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Denne enhed administreres af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Få flere oplysninger"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraapp}one{Kameraapp}other{Kameraapps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenderapp"</string>
@@ -649,15 +649,15 @@
     <string name="sensor_toggle_info_on" msgid="4568111889147132257">"Til"</string>
     <string name="sensor_toggle_info_off" msgid="7546772458177469821">"Fra"</string>
     <string name="system_location" msgid="4057295363709016511">"Lokation"</string>
-    <string name="system_desc_location" msgid="1680134126100535031">"Tillad, at apps, der har bedt om din tilladelse, bruger dine stedoplysninger"</string>
-    <string name="system_network_location_confirm" msgid="7128162421781085332">"Placeringssamtykke"</string>
+    <string name="system_desc_location" msgid="1680134126100535031">"Tillad, at apps, der har bedt om din tilladelse, bruger dine lokationsoplysninger"</string>
+    <string name="system_network_location_confirm" msgid="7128162421781085332">"Lokationssamtykke"</string>
     <string name="location_mode_title" msgid="728244518174115443">"Tilstand"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Seneste lokationsanmodninger"</string>
     <string name="location_no_recent_apps" msgid="7033474075806435793">"Ingen apps har anmodet om lokation for nylig"</string>
     <string name="location_high_battery_use" msgid="5325556609027887602">"Højt batteriforbrug"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Lavt batteriforbrug"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Brug Wi-Fi til at fastslå lokation"</string>
-    <string name="location_status" msgid="3037321737386011224">"Placeringsstatus"</string>
+    <string name="location_status" msgid="3037321737386011224">"Lokationsstatus"</string>
     <string name="location_services" msgid="551503779736382878">"Lokationstjenester"</string>
     <string name="on" msgid="4899322147062342542">"Til"</string>
     <string name="off" msgid="3127416478888499352">"Fra"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktivér"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> kan indsamle al den tekst, du skriver, undtagen adgangskoder. Dette omfatter personlige data såsom kreditkortnumre."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> kan læse indholdet på din skærm, vise indhold over andre apps, se dine interaktioner med apps eller hardwaresensorer samt interagere med apps på dine vegne."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Hvis du vælger OK, stoppes <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Oplæsning"</string>
@@ -891,7 +891,7 @@
     <string name="app_not_supported_in_limited" msgid="4046604594925826955">"Denne app understøttes ikke for begrænsede profiler"</string>
     <string name="app_sees_restricted_accounts" msgid="174038126799649152">"Denne app kan få adgang til dine konti"</string>
     <string name="restriction_location_enable_title" msgid="2552780806199464266">"Lokation"</string>
-    <string name="restriction_location_enable_summary" msgid="3719330231217994482">"Tillad, at apps bruger dine stedoplysninger"</string>
+    <string name="restriction_location_enable_summary" msgid="3719330231217994482">"Tillad, at apps bruger dine lokationsoplysninger"</string>
     <string name="restricted_profile_switch_to" msgid="6193201935877168764">"Skift til begrænset profil"</string>
     <string name="restricted_profile_switch_out" msgid="3589381233390753413">"Forlad begrænset profil"</string>
     <string name="restricted_profile_delete_title" msgid="7153982195273379506">"Slet begrænset profil"</string>
@@ -977,7 +977,7 @@
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
     <string name="backup_erase_dialog_message" msgid="222169533402624861">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt rydde alle kopier på Google-servere?"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"Sikkerhedskopiér mine data"</string>
-    <string name="privacy_backup_account" msgid="4527813051841860610">"Konto til backup"</string>
+    <string name="privacy_backup_account" msgid="4527813051841860610">"Konto til sikkerhedskopiering"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Automatisk gendannelse"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"Nulstil enheden"</string>
     <string name="factory_reset_description" msgid="6697396335158766785">"Dette gendanner din enhed til standardindstillingerne og rydder alle data, konti, filer og downloadede apps."</string>
@@ -1048,7 +1048,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Giv apps tilladelse til at indstille alarmer og planlægge tidsbestemte handlinger. Disse apps vil køre i baggrunden, hvor de muligvis bruger mere batteri.\n\nHvis denne tilladelse er deaktiveret, vil eksisterende alarmer og tidsbestemte handlinger, der er planlagt af disse apps, ikke fungere."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Aktivér skærmen"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Tillad aktivering af skærmen"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Tillad, at en app aktiverer skærmen. Hvis du giver denne tilladelse, kan appen til enhver tid aktiverer skærmen, uden at du eksplicit har bedt om det."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Tillad, at en app aktiverer skærmen. Hvis du giver denne tilladelse, kan appen til enhver tid aktivere skærmen, uden at du eksplicit har bedt om det."</string>
     <string name="special_access" msgid="21806055758289916">"Særlig appadgang"</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">"Lyd"</string>
@@ -1090,7 +1090,7 @@
     <string name="uninstall_device_admin" msgid="6301368408620948266">"Afinstaller appen"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"Deaktiver og afinstaller"</string>
     <string name="select_device_admin_msg" msgid="8475934459999710332">"Apps til enhedsadministration"</string>
-    <string name="add_device_admin_msg" msgid="5390773166682603421">"Aktivér appen til enhedsadministration?"</string>
+    <string name="add_device_admin_msg" msgid="5390773166682603421">"Aktivér appen til enheds­administration?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"Aktivér denne app til enhedsadministration"</string>
     <string name="device_admin_warning" msgid="7399916080685200660">"Hvis denne administratorapp aktiveres, får appen <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til at foretage følgende handlinger:"</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"Denne enhed administreres og overvåges af <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
@@ -1109,6 +1109,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Der blev oprettet forbindelse"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Vis alle"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Søger"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Hensigten om at tilføje kontoen kunne ikke hentes fra Authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Kontoen kunne ikke tilføjes, eller kontotypen er ikke tilgængelig."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanaler og indgange"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanaler, eksterne indgange"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanaler"</string>
@@ -1126,4 +1128,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktiverer:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Vær opmærksom på, at denne tilstand kan øge energiforbruget på enheden."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivér \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 508d999c4..1a1f6076b 100644
--- a/Settings/res/values-de/energy-modes.xml
+++ b/Settings/res/values-de/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Grundlegende Netzwerkfunktionen"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niedrigerer Stromverbrauch"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Netzwerkverbindung deaktivieren, wenn der Fernseher nicht verwendet wird."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Wichtige Updates und Funktionen"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Empfohlene Netzwerkfunktionen"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimierter Stromverbrauch"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Aktiviert Funktionen, durch die der Ruhemodus des Fernsehers über das Netzwerk beendet werden kann (Bereitschaftsbetrieb)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Zusätzliche Netzwerkfunktionen"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Höherer Stromverbrauch"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Durch diese Option werden neben empfohlenen Funktionen zusätzliche Funktionen aktiviert, durch die der Stromverbrauch steigen kann, wenn der Fernseher nicht verwendet wird."</string>
+    <string 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-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 ed8429217..55411614c 100644
--- a/Settings/res/values-de/strings.xml
+++ b/Settings/res/values-de/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App-Einstellungen"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Standort, Nutzung &amp; Diagnose, Werbung"</string>
     <string name="add_account" msgid="7386223854837017129">"Konto hinzufügen"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Unbekanntes Konto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Konto entfernen"</string>
     <string name="account_sync" msgid="4315295293211313989">"Synchronisierte Apps auswählen"</string>
     <string name="sync_now" msgid="4335217984374620551">"Jetzt synchronisieren"</string>
@@ -156,7 +157,7 @@
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Bevorzugter dynamischer Bereich"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Vom System bevorzugte Umwandlung"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Die Umwandlung von Formaten wird vom System verwaltet"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Wenn diese Option ausgewählt wird, ermittelt das System einen geeigneten dynamischen Bereich, das an dein Display gesendet wird, und wandelt Inhalte nach Bedarf in diesen dynamischen Bereich um."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Wenn diese Option ausgewählt wird, ermittelt das System einen geeigneten dynamischen Bereich, der an dein Display gesendet wird, und wandelt Inhalte nach Bedarf in diesen dynamischen Bereich um."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Das Format des Inhalts wird nicht verändert"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Umwandlung erzwingen"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Erzwingt die Umwandlung in ein bevorzugtes Format"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Beispieltext"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Der Zauberer von Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kapitel 11: Die wundervolle Smaragdstadt von Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Obwohl ihre Augen durch die grünen Gläser der Brillen geschützt waren, wurden Dorothy und ihren Freunden vom Glanz und vom Schimmer der wundervollen Stadt beinahe schwindelig. Prächtige Häuser aus grünem Marmor, die mit Smaragden besetzt waren, säumten die Straßen. Auch das Straßenpflaster bestand aus feinstem grünem Marmor und die Fugen waren mit glitzernden Smaragden bestückt. Sie funkelten und leuchteten in der Sonne. Die Fensterscheiben der Häuser bestanden aus grünem Glas, der Himmel über der Stadt schimmerte hellgrün, und sogar die Strahlen der Sonne wirkten leicht grünlich. \n\nIn der Stadt gab es viel Leben. Männer, Frauen und Kinder liefen geschäftig durch die Straßen. Alle waren grün gekleidet und trugen eine grüne Brille. Ihre Haut schien leicht grün zu sein und sie sahen Dorothy und ihre Freunde mit großen verwunderten Augen an. Als die Kinder den Löwen sahen, rannten sie davon, um sich hinter ihren Müttern zu verstecken. Niemand richtete das Wort an die Wanderer. Es gab auch viele Geschäfte in der Smaragdstadt und sogar die Auslagen der Läden waren grün. Da gab es grüne Bonbons, grünes Popcorn, grüne Schuhe, grüne Hüte und viele grüne Kleider. Ein Mann verkaufte grüne Limonade und Dorothy sah die Kinder mit grünem Geld dafür bezahlen. \n\nPferde oder andere Tiere konnte Dorothy nirgendwo entdecken. Dafür begegneten ihnen immer wieder Männer, die auf ihren kleinen grünen Karren Lasten durch die Stadt schoben. Alle schienen glücklich und zufrieden zu sein."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Obwohl ihre Augen durch die grünen Gläser der Brillen geschützt waren, wurden Dorothy und ihren Freunden vom Glanz und vom Schimmer der wundervollen Stadt beinahe schwindelig. Prächtige Häuser aus grünem Marmor, die mit Smaragden besetzt waren, säumten die Straßen. Auch das Straßenpflaster bestand aus feinstem grünem Marmor und die Fugen waren mit glitzernden Smaragden bestückt. Sie funkelten und leuchteten in der Sonne. Die Fensterscheiben der Häuser bestanden aus grünem Glas, der Himmel über der Stadt schimmerte hellgrün, und sogar die Strahlen der Sonne wirkten leicht grünlich.\n\nIn der Stadt gab es viel Leben. Männer, Frauen und Kinder liefen geschäftig durch die Straßen. Alle waren grün gekleidet und trugen eine grüne Brille. Ihre Haut schien leicht grün zu sein und sie sahen Dorothy und ihre Freunde mit großen verwunderten Augen an. Als die Kinder den Löwen sahen, rannten sie davon, um sich hinter ihren Müttern zu verstecken. Niemand richtete das Wort an die Wanderer. Es gab auch viele Geschäfte in der Smaragdstadt und sogar die Auslagen der Läden waren grün. Da gab es grüne Bonbons, grünes Popcorn, grüne Schuhe, grüne Hüte und viele grüne Kleider. Ein Mann verkaufte grüne Limonade und Dorothy sah die Kinder mit grünem Geld dafür bezahlen.\n\nPferde oder andere Tiere konnte Dorothy nirgendwo entdecken. Dafür begegneten ihnen immer wieder Männer, die auf ihren kleinen grünen Karren Lasten durch die Stadt schoben. Alle schienen glücklich und zufrieden zu sein."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formatauswahl"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatisch"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuell"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Auflösung in %1$s ändern?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Wähle „OK“ aus, um die neue Auflösung %1$s von jetzt an zu verwenden"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision wird für %1$s nicht unterstützt und in den erweiterten Displayeinstellungen deaktiviert."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Dieser Modus unterstützt %1$s. Auf einigen Fernsehern musst du möglicherweise erweitertes HDMI aktivieren, um weitere HDR-Formate aktivieren zu können. Sieh in den Einstellungen deines Fernsehers nach, ob dies unterstützt wird."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Dieser Modus unterstützt: %1$s\nUm weitere HDR-Formate nutzen zu können, musst du auf einigen Fernsehern möglicherweise erweitertes HDMI aktivieren. Sieh in den Einstellungen deines Fernsehers nach, ob dies unterstützt wird."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Abbrechen"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Daten im Cache löschen?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Daten im Cache werden für alle Apps gelöscht."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Verbunden"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Nicht verbunden"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Du bist nicht zur Änderung der Bluetooth-Einstellungen berechtigt."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Für TV-Audio verwenden"</string>
     <string name="send_feedback" msgid="936698637869795473">"Feedback geben"</string>
     <string name="launch_help" msgid="2607478763131952469">"Hilfe"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Dieses Gerät wird von deiner Organisation verwaltet."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> verwaltet."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Weitere Informationen"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera-App}other{Kamera-Apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalender-App"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktivieren"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> kann den gesamten eingegebenen Text erfassen, einschließlich personenbezogener Daten wie Kreditkartennummern, jedoch keine Passwörter."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> darf deinen Bildschirm lesen, andere Apps mit Inhalten überdecken, deine Interaktionen mit Apps oder Hardwaresensoren verfolgen und in deinem Namen mit Apps interagieren."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g> beenden?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Durch Auswählen von „OK“ wird <xliff:g id="SERVICE">%1$s</xliff:g> beendet."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Sprachausgabe"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Verbindung hergestellt"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Alle anzeigen"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Wird gesucht"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Intent zum Hinzufügen des Kontos konnte nicht vom Authenticator abgerufen werden."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Das Konto konnte nicht hinzugefügt werden oder der Kontotyp ist nicht verfügbar."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanäle &amp; Eingänge"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanäle, externe Eingänge"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanäle"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktiviert:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Beachte, dass der Stromverbrauch des Geräts in diesem Modus höher sein kann."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"„<xliff:g id="ENERGYMODENAME">%s</xliff:g>“ aktivieren?"</string>
+    <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_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 0f482a12c..0a3778fd1 100644
--- a/Settings/res/values-el/energy-modes.xml
+++ b/Settings/res/values-el/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Απαραίτητες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Χαμηλή χρήση ενέργειας"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Απενεργοποιήστε τη σύνδεση δικτύου όταν η τηλεόραση δεν χρησιμοποιείται."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Σημαντικές ενημερώσεις και λειτουργίες"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Προτεινόμενες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Βελτιστοποιημένη χρήση ενέργειας"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ενεργοποιεί λειτουργίες που ενεργοποιούν την τηλεόραση μέσω δικτύου (δικτυωμένη λειτουργία αναμονής)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Εισαγωγή λειτουργίας 1]"</item>
     <item msgid="8724721267222341891">"[Εισαγωγή λειτουργίας 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Πρόσθετες λειτουργίες δικτύου"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Αυξημένη χρήση ενέργειας"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Εκτός από τις προτεινόμενες λειτουργίες, η συγκεκριμένη επιλογή ενεργοποιεί πρόσθετες λειτουργίες όταν η τηλεόραση είναι απενεργοποιημένη, οι οποίες μπορεί να αυξήσουν τη χρήση ενέργειας."</string>
+    <string 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-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 5c8d4978c..2f1395caa 100644
--- a/Settings/res/values-el/strings.xml
+++ b/Settings/res/values-el/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Ρυθμίσεις εφαρμογής"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Τοποθεσία, χρήση και διαγνωστικά στοιχεία, διαφημίσεις"</string>
     <string name="add_account" msgid="7386223854837017129">"Προσθήκη λογαριασμού"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Άγνωστος λογαριασμός"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Κατάργηση λογαριασμού"</string>
     <string name="account_sync" msgid="4315295293211313989">"Επιλέξτε εφαρμογές"</string>
     <string name="sync_now" msgid="4335217984374620551">"Συγχρονισμός τώρα"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Σύνθετες ρυθμίσεις ήχου"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Να επιτρέπεται η λειτουργία παιχνιδιού"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Αντιστοίχιση με δυναμικό εύρος του περιεχομένου"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Όταν ενεργοποιήσετε αυτήν την επιλογή, το σύστημα θα κάνει εναλλαγή διάφορων μορφών δυναμικού εύρους για να εντοπίσει εκείνη που αντιστοιχεί στο περιεχόμενο. Ενδέχεται να εμφανιστεί μια κενή οθόνη κατά την εναλλαγή μορφών.\n\nΚάντε κλικ στις Σύνθετες ρυθμίσεις οθόνης για να δείτε περισσότερες επιλογές δυναμικού εύρους."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Όταν ενεργοποιήσετε αυτή την επιλογή, το σύστημα θα κάνει εναλλαγή διάφορων μορφών δυναμικού εύρους για να εντοπίσει εκείνη που αντιστοιχεί στο περιεχόμενο. Ενδέχεται να εμφανιστεί μια κενή οθόνη κατά την εναλλαγή μορφών.\n\nΚάντε κλικ στις Σύνθετες ρυθμίσεις οθόνης για να δείτε περισσότερες επιλογές δυναμικού εύρους."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Προτιμώμενο δυναμικό εύρος"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Μετατροπή που είναι προτιμώμενη από το σύστημα"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Επιτρέπει στο σύστημα να διαχειρίζεται τη μετατροπή μορφής"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Δείγμα κειμένου"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Ο Θαυμάσιος Μάγος του Οζ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Κεφάλαιο 11: Η Θαυμάσια Πόλη Έμεραλντ του Οζ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Παρόλο που είχαν καλύψει τα μάτια τους με τα πράσινα γυαλιά, η Ντόροθι και οι φίλοι της αρχικά θαμπώθηκαν από τη λαμπρότητα της υπέροχης Πόλης. Στους δρόμους υπήρχαν σειρές με όμορφα σπίτια, όλα φτιαγμένα από πράσινο μάρμαρο και διακοσμημένα με λαμπερά σμαράγδια. Περπάτησαν σε ένα πεζοδρόμιο φτιαγμένο από το ίδιο πράσινο μάρμαρο, ενώ εκεί που ενώνονταν τα κομμάτια του πεζοδρομίου, υπήρχαν σειρές με σμαράγδια, τοποθετημένα το ένα δίπλα στο άλλο, που άστραφταν με τη φωτεινότητα του ήλιου. Τα τζάμια των παραθύρων ήταν φτιαγμένα από πράσινο γυαλί. Ακόμα και ο ουρανός πάνω από την πόλη είχε μια πράσινη απόχρωση και οι ακτίνες του ήλιου ήταν πράσινες. \n\nΠολλοί άνθρωποι, άνδρες, γυναίκες και παιδιά, περπατούσαν στους δρόμους και ήταν όλοι ντυμένοι με πράσινα ρούχα, ενώ το δέρμα τους ήταν πρασινωπό. Κοιτούσαν τη Ντόροθι και την παράξενη παρέα της με περιέργεια, ενώ όλα τα παιδιά έτρεξαν και κρύφτηκαν πίσω από τις μαμάδες τους μόλις αντίκρισαν το Λιοντάρι. Όμως, κανείς δεν τους μίλησε. Υπήρχαν πολλά καταστήματα στο δρόμο και η Ντόροθι παρατηρούσε πως όλα ήταν πράσινα στο εσωτερικό τους. Πουλούσαν πράσινα γλυκά και πράσινο ποπ κορν, καθώς και πράσινα παπούτσια, πράσινα καπέλα και πράσινα ρούχα όλων των ειδών. Σε κάποιο σημείο, ένας άνδρας πουλούσε πράσινη λεμονάδα και η Ντόροθι παρατήρησε ότι τα παιδιά την πλήρωσαν με πράσινα νομίσματα. \n\nΔεν υπήρχαν ούτε άλογα ούτε άλλα ζώα. Οι άνδρες κουβαλούσαν πράγματα σε μικρά πράσινα κάρα, τα οποία μετακινούσαν σπρώχνοντάς τα. Όλοι έμοιαζαν πολύ ευτυχισμένοι και ευκατάστατοι."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Παρόλο που είχαν καλύψει τα μάτια τους με τα πράσινα γυαλιά, η Ντόροθι και οι φίλοι της αρχικά θαμπώθηκαν από τη λαμπρότητα της υπέροχης Πόλης. Στους δρόμους υπήρχαν σειρές με όμορφα σπίτια, όλα φτιαγμένα από πράσινο μάρμαρο και διακοσμημένα με λαμπερά σμαράγδια. Περπάτησαν σε ένα πεζοδρόμιο φτιαγμένο από το ίδιο πράσινο μάρμαρο, ενώ εκεί που ενώνονταν τα κομμάτια του πεζοδρομίου, υπήρχαν σειρές με σμαράγδια, τοποθετημένα το ένα δίπλα στο άλλο, που άστραφταν με τη φωτεινότητα του ήλιου. Τα τζάμια των παραθύρων ήταν φτιαγμένα από πράσινο γυαλί. Ακόμα και ο ουρανός πάνω από την Πόλη είχε μια πράσινη απόχρωση και οι ακτίνες του ήλιου ήταν πράσινες. \n\nΠολλοί άνθρωποι, άνδρες, γυναίκες και παιδιά, περπατούσαν στους δρόμους και ήταν όλοι ντυμένοι με πράσινα ρούχα, ενώ το δέρμα τους ήταν πρασινωπό. Κοιτούσαν τη Ντόροθι και την παράξενη παρέα της με περιέργεια, ενώ όλα τα παιδιά έτρεξαν και κρύφτηκαν πίσω από τις μαμάδες τους μόλις αντίκρισαν το Λιοντάρι. Όμως, κανείς δεν τους μίλησε. Υπήρχαν πολλά καταστήματα στον δρόμο και η Ντόροθι παρατηρούσε πως όλα ήταν πράσινα στο εσωτερικό τους. Πουλούσαν πράσινα γλυκά και πράσινο ποπ κορν, καθώς και πράσινα παπούτσια, πράσινα καπέλα και πράσινα ρούχα όλων των ειδών. Σε κάποιο σημείο, ένας άνδρας πουλούσε πράσινη λεμονάδα και η Ντόροθι παρατήρησε ότι τα παιδιά την πλήρωσαν με πράσινα νομίσματα. \n\nΔεν υπήρχαν ούτε άλογα ούτε άλλα ζώα. Οι άνδρες κουβαλούσαν πράγματα σε μικρά πράσινα κάρα, τα οποία μετακινούσαν σπρώχνοντάς τα. Όλοι έμοιαζαν πολύ ευτυχισμένοι και ευκατάστατοι."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Επιλογή μορφής"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Αυτόματη"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Μη αυτόματη"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Αλλαγή ανάλυσης σε %1$s;"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Επιλέξτε ΟΚ για να χρησιμοποιείτε στο εξής ανάλυση %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Το Dolby Vision δεν υποστηρίζεται σε ανάλυση %1$s και θα απενεργοποιηθεί στις Σύνθετες ρυθμίσεις οθόνης"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Αυτή η λειτουργία υποστηρίζει %1$s. Σε ορισμένες τηλεοράσεις, μπορεί να χρειαστεί να ενεργοποιήσετε το Enhanced HDMI για να ενεργοποιήσετε περισσότερες μορφές HDR. Ελέγξτε τις ρυθμίσεις της τηλεόρασης για να δείτε αν υποστηρίζεται αυτή η λειτουργία."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Η συγκεκριμένη λειτουργία υποστηρίζει: %1$s\nΣε ορισμένες τηλεοράσεις, μπορεί να χρειαστεί να ενεργοποιήσετε τη λειτουργία Βελτιωμένο HDMI για να ενεργοποιήσετε περισσότερες μορφές HDR. Ελέγξτε τις ρυθμίσεις της τηλεόρασης για να δείτε αν υποστηρίζεται αυτή η λειτουργία."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Ακύρωση"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ΟΚ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Να διαγραφούν τα δεδομένα κρυφής μνήμης;"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Διαγραφή κρυφής μνήμης όλων των εφαρμογών."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Συνδέθηκε"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Αποσυνδέθηκε"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Δεν έχετε άδεια να αλλάξετε τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Χρήση για ήχο στην τηλεόραση"</string>
     <string name="send_feedback" msgid="936698637869795473">"Αποστολή σχολίων"</string>
     <string name="launch_help" msgid="2607478763131952469">"Κέντρο βοήθειας"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Αυτή η συσκευή είναι διαχειριζόμενη από τον οργανισμό σας."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Τη συσκευή διαχειρίζεται ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Μάθετε περισσότερα"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Εφαρμογή κάμερας}other{Εφαρμογές κάμερας}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Εφαρμογή ημερολογίου"</string>
@@ -359,7 +359,7 @@
     <string name="tutorials" msgid="7880770425872110455">"Οδηγοί"</string>
     <string name="about_system_update" msgid="7421264399111367755">"Ενημέρωση συστήματος"</string>
     <string name="system_update_description" msgid="998883510488461766">"Το λογισμικό του συστήματός σας θα ενημερωθεί στην πιο πρόσφατη έκδοση. Θα γίνει επανεκκίνηση της συσκευής σας."</string>
-    <string name="system_update_content_description" msgid="5702888187682876466">"Ενημέρωση συστήματος, Με αυτήν την ενέργεια θα ενημερωθεί το λογισμικό του συστήματός σας στην πιο πρόσφατη έκδοση. Η συσκευή σας θα επανεκκινηθεί."</string>
+    <string name="system_update_content_description" msgid="5702888187682876466">"Ενημέρωση συστήματος, Με αυτή την ενέργεια θα ενημερωθεί το λογισμικό του συστήματός σας στην πιο πρόσφατη έκδοση. Η συσκευή σας θα επανεκκινηθεί."</string>
     <string name="about_preference" msgid="9112690446998150670">"Πληροφορίες"</string>
     <string name="device_name" msgid="566626587332817733">"Όνομα συσκευής"</string>
     <string name="restart_button_label" msgid="911750765086382990">"Επανεκκίνηση"</string>
@@ -577,7 +577,7 @@
     <string name="storage_wizard_migrate_progress_title" msgid="2623480667090826800">"Μετακίνηση δεδομένων σε <xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_migrate_progress_description" msgid="4023358325977284145">"Αυτό μπορεί να διαρκέσει λίγη ώρα. Μην καταργήσετε το δίσκο.\nΟρισμένες εφαρμογές δεν θα λειτουργούν σωστά κατά τη μετακίνηση."</string>
     <string name="storage_wizard_format_slow_title" msgid="7640229918512394316">"Αυτός ο δίσκος φαίνεται να είναι αργός."</string>
-    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"Μπορείτε να συνεχίσετε, αλλά οι εφαρμογές που έχουν μετακινηθεί σε αυτήν την τοποθεσία ενδέχεται να παρουσιάσουν δυσκολίες στη λειτουργία και οι μεταφορές δεδομένων ενδέχεται να καθυστερήσουν. Μπορείτε να χρησιμοποιήσετε έναν ταχύτερο δίσκο για καλύτερη απόδοση."</string>
+    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"Μπορείτε να συνεχίσετε, αλλά οι εφαρμογές που έχουν μετακινηθεί σε αυτή την τοποθεσία ενδέχεται να παρουσιάσουν δυσκολίες στη λειτουργία και οι μεταφορές δεδομένων ενδέχεται να καθυστερήσουν. Μπορείτε να χρησιμοποιήσετε έναν ταχύτερο δίσκο για καλύτερη απόδοση."</string>
     <string name="storage_wizard_format_action" msgid="3275676687226857170">"Μορφοποίηση"</string>
     <string name="storage_wizard_backup_apps_action" msgid="1402199004931596519">"Δημιουργία αντιγράφων ασφαλείας εφαρμογών"</string>
     <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"Εφαρμογές αποθηκευμένες σε <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ενεργοποίηση"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Διαμόρφωση"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Χρήση - <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> μπορεί να συλλέξει όλο το κείμενο που πληκτρολογείτε, εκτός από τους κωδικούς πρόσβασης. Αυτό περιλαμβάνει προσωπικά δεδομένα όπως αριθμούς πιστωτικών καρτών."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"Επιλέξτε OK για να διακοπεί η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Κείμενο σε ομιλία"</string>
@@ -850,14 +850,14 @@
     <string name="title_current_autofill_service" msgid="9029001041887283153">"Τρέχουσα υπηρεσία αυτόματης συμπλήρωσης"</string>
     <string name="title_select_autofill_service" msgid="696559582725756848">"Επιλογή Υπηρεσίας αυτόματης συμπλήρωσης"</string>
     <string name="autofill_none" msgid="1615056985649424207">"Καμία"</string>
-    <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή&lt;/b&gt; Η εφαρμογή &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Password service&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
+    <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτή την εφαρμογή&lt;/b&gt; Η εφαρμογή &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Password service&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
     <string name="computing_size" msgid="8623916230485437579">"Υπολογισμός…"</string>
     <string name="title_select_wifi_network" msgid="935820896444071617">"Επιλογή δικτύου Wi-Fi"</string>
     <string name="accessories_wifi_display_rename_device" msgid="8803397194143132061">"Μετονομασία"</string>
     <string name="accessories_wifi_display_enable" msgid="2385467074170316302">"Οθόνη Wi-Fi"</string>
     <string name="accessories_wifi_display_pin_required" msgid="5434960694140426664">"Απαιτείται κωδικός PIN"</string>
     <string name="whichApplication" msgid="4510042089342879264">"Ολοκλήρωση ενέργειας με χρήση"</string>
-    <string name="alwaysUseQuestion" msgid="2643084054296937138">"Χρήση της επιλογής πάντα για αυτήν την ενέργεια;"</string>
+    <string name="alwaysUseQuestion" msgid="2643084054296937138">"Χρήση της επιλογής πάντα για αυτή την ενέργεια;"</string>
     <string name="alwaysUseOption" msgid="8799609235198714441">"Χρήση πάντα"</string>
     <string name="justOnceOption" msgid="6714005843102804865">"Μόνο μία φορά"</string>
     <string name="noApplications" msgid="7511175717026318399">"Δεν υπάρχουν εφαρμογές για εκτέλεση της ενέργειας."</string>
@@ -924,11 +924,11 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"Αν επιβάλετε τη διακοπή μιας εφαρμογής, ενδέχεται να μη λειτουργήσει σωστά."</string>
     <string name="device_apps_app_management_uninstall" msgid="4171103696233332967">"Απεγκατάσταση"</string>
     <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"Απεγκατάσταση ενημερώσεων"</string>
-    <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"Θα καταργηθεί η εγκατάσταση όλων των ενημερώσεων σε αυτήν την εφαρμογή συστήματος Android."</string>
+    <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"Θα καταργηθεί η εγκατάσταση όλων των ενημερώσεων σε αυτή την εφαρμογή συστήματος Android."</string>
     <string name="device_apps_app_management_disable" msgid="819003297535493633">"Απενεργοποίηση"</string>
-    <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"Θέλετε να απενεργοποιήσετε αυτήν την εφαρμογή;"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"Θέλετε να απενεργοποιήσετε αυτή την εφαρμογή;"</string>
     <string name="device_apps_app_management_enable" msgid="9173340340253029114">"Ενεργοποίηση"</string>
-    <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"Θέλετε να ενεργοποιήσετε αυτήν την εφαρμογή;"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"Θέλετε να ενεργοποιήσετε αυτή την εφαρμογή;"</string>
     <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"Αποθηκευτικός χώρος που χρησιμοποιείται"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"Χρησιμοποιούνται <xliff:g id="SIZE">%1$s</xliff:g> σε <xliff:g id="VOLUME">%2$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Διαγραφή δεδομένων"</string>
@@ -951,7 +951,7 @@
     <string name="device_daydreams_select" msgid="7203264446482623438">"Προφύλαξη οθόνης"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"Έναρξη τώρα"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"Πότε να ενεργοποιείται"</string>
-    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Η προφύλαξη οθόνης ενεργοποιείται μετά από αυτήν την περίοδο αδράνειας. Εάν δεν έχει οριστεί κάποια επιλογή προφύλαξης οθόνης, η οθόνη σβήνει."</string>
+    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Η προφύλαξη οθόνης ενεργοποιείται μετά από αυτή την περίοδο αδράνειας. Εάν δεν έχει οριστεί κάποια επιλογή προφύλαξης οθόνης, η οθόνη σβήνει."</string>
     <string name="device_daydreams_sleep_summary" msgid="3081688734381995693">"Μετά από <xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
     <string name="device_energy_saver_screen_off" msgid="6908468996426629480">"Απενεργοποίηση οθόνης"</string>
     <!-- no translation found for device_energy_saver_timeout_description (3206609135199137514) -->
@@ -979,9 +979,9 @@
     <string name="privacy_backup_account" msgid="4527813051841860610">"Εφεδρικός λογαριασμός"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Αυτόματη επαναφορά"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"Επαναφορά συσκευής"</string>
-    <string name="factory_reset_description" msgid="6697396335158766785">"Με αυτήν την ενέργεια θα γίνει επαναφορά της συσκευής στις προεπιλεγμένες ρυθμίσεις της και θα διαγραφούν όλα τα δεδομένα, οι λογαριασμοί, τα αρχεία και οι ληφθείσες εφαρμογές."</string>
-    <string name="factory_reset_info_description" msgid="5098454670833183487">"Με αυτήν την ενέργεια θα γίνει επαναφορά της συσκευής στις προεπιλεγμένες ρυθμίσεις της και θα διαγραφούν όλα τα δεδομένα, οι λογαριασμοί, τα αρχεία και οι ληφθείσες εφαρμογές."</string>
-    <string name="factory_reset_content_description" msgid="1677022688420116803">"Επαναφορά εργοστασιακών ρυθμίσεων, Με αυτήν την ενέργεια θα γίνει επαναφορά της συσκευής στις προεπιλεγμένες ρυθμίσεις της και θα διαγραφούν όλα τα δεδομένα, οι λογαριασμοί, τα αρχεία και οι ληφθείσες εφαρμογές."</string>
+    <string name="factory_reset_description" msgid="6697396335158766785">"Με αυτή την ενέργεια θα γίνει επαναφορά της συσκευής στις προεπιλεγμένες ρυθμίσεις της και θα διαγραφούν όλα τα δεδομένα, οι λογαριασμοί, τα αρχεία και οι ληφθείσες εφαρμογές."</string>
+    <string name="factory_reset_info_description" msgid="5098454670833183487">"Με αυτή την ενέργεια θα γίνει επαναφορά της συσκευής στις προεπιλεγμένες ρυθμίσεις της και θα διαγραφούν όλα τα δεδομένα, οι λογαριασμοί, τα αρχεία και οι ληφθείσες εφαρμογές."</string>
+    <string name="factory_reset_content_description" msgid="1677022688420116803">"Επαναφορά εργοστασιακών ρυθμίσεων, Με αυτή την ενέργεια θα γίνει επαναφορά της συσκευής στις προεπιλεγμένες ρυθμίσεις της και θα διαγραφούν όλα τα δεδομένα, οι λογαριασμοί, τα αρχεία και οι ληφθείσες εφαρμογές."</string>
     <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές σε αυτήν τη συσκευή; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"Διαγραφή όλων"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"Επιλέξτε ένα όνομα για τη συσκευή <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
@@ -1039,7 +1039,7 @@
     <string name="write_settings_off" msgid="6730113471695092167">"Όχι"</string>
     <string name="manage_external_storage_title" msgid="8139593207533811077">"Πρόσβαση σε όλα τα αρχεία"</string>
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"Να επιτρέπεται η πρόσβαση για τη διαχείριση όλων των αρχείων"</string>
-    <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"Να επιτρέπεται σε αυτήν την εφαρμογή η ανάγνωση, η τροποποίηση και η διαγραφή όλων των αρχείων σε αυτήν τη συσκευή και σε κάθε συνδεδεμένη μονάδα αποθήκευσης. Εάν εκχωρηθούν σχετικά δικαιώματα, η εφαρμογή μπορεί να έχει πρόσβαση σε αρχεία χωρίς να έχετε ενημερωθεί ρητά."</string>
+    <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"Να επιτρέπεται σε αυτή την εφαρμογή η ανάγνωση, η τροποποίηση και η διαγραφή όλων των αρχείων σε αυτήν τη συσκευή και σε κάθε συνδεδεμένη μονάδα αποθήκευσης. Εάν εκχωρηθούν σχετικά δικαιώματα, η εφαρμογή μπορεί να έχει πρόσβαση σε αρχεία χωρίς να έχετε ενημερωθεί ρητά."</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"Να επιτρέπεται η λειτουργία picture-in-picture"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Καμία από τις εγκατεστημένες εφαρμογές δεν υποστηρίζει τη λειτουργία picture-in-picture"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Η σύνδεση είναι επιτυχής"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Εμφάνιση όλων"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Αναζήτηση"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Η ανάκτηση intent προσθήκης λογαριασμού από το πρόγραμμα ελέγχου ταυτότητας απέτυχε."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Η προσθήκη λογαριασμού απέτυχε ή ο τύπος λογαριασμού δεν είναι διαθέσιμος."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Κανάλια και Είσοδοι"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Κανάλια, εξωτερικές είσοδοι"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Κανάλια"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Ενεργοποιεί:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Έχετε υπόψη ότι η συγκεκριμένη λειτουργία μπορεί να αυξήσει την κατανάλωση ενέργειας της συσκευής."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ενεργοποίηση <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 b85af7b00..4c4a71d17 100644
--- a/Settings/res/values-en-rAU/energy-modes.xml
+++ b/Settings/res/values-en-rAU/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Critical updates and functions"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimised energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features that may increase energy use when the TV is not in use."</string>
+    <string 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-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 26b1484ed..acefe48fb 100644
--- a/Settings/res/values-en-rAU/strings.xml
+++ b/Settings/res/values-en-rAU/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App settings"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Location, Usage &amp; diagnostics, Ads"</string>
     <string name="add_account" msgid="7386223854837017129">"Add account"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Unknown account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remove account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Choose synced apps"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sync now"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced display settings for more dynamic range options."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lets the system manage the format conversion"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Sample text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chapter 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Even with eyes protected by the green spectacles, Dorothy and her friends were at first dazzled by the brilliance of the wonderful city. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the city had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses or animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Even with eyes protected by the green spectacles, Dorothy and her friends were at first dazzled by the brilliance of the wonderful City. The streets were lined with beautiful houses, all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and they were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green popcorn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. In one place, a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses, nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Format selection"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatic"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \'Advanced display settings\'"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connected"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Disconnected"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Use for TV audio"</string>
     <string name="send_feedback" msgid="936698637869795473">"Send feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Help Centre"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Enable"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> can collect all of the text that you type, except passwords. This includes personal data such as credit card numbers."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> will be able to read your screen, display content over other apps, track your interactions with apps or hardware sensors, and interact with apps on your behalf."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Selecting OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connection successful"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Show all"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Searching"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Failed to retrieve add account intent from authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Failed to add account or the account type is not available."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Channels and inputs"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Channels, external inputs"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Channels"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
+    <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="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 8db883041..dc4507514 100644
--- a/Settings/res/values-en-rCA/energy-modes.xml
+++ b/Settings/res/values-en-rCA/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Critical updates and functions"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimized energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features when the TV is not in use that may increase energy use."</string>
+    <string 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-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 6c0e430e7..b9e77dd12 100644
--- a/Settings/res/values-en-rCA/strings.xml
+++ b/Settings/res/values-en-rCA/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App Settings"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Location, usage and diagnostics, ads"</string>
     <string name="add_account" msgid="7386223854837017129">"Add account"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Unknown Account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remove account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Choose synced apps"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sync now"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Sample text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chapter 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seeemed happy and contented and prosperous."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy and contented and prosperous."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Format selection"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatic"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,7 +219,7 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \"Advanced Display Settings\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
@@ -277,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connected"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Disconnected"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"You don’t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Use for TV audio"</string>
     <string name="send_feedback" msgid="936698637869795473">"Send feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Help Center"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -343,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organization."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" "</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -742,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Enable"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> can collect all of the text you type, except passwords. This includes personal data such as credit card numbers."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> will be able to read your screen, display content over other apps, track your interactions with apps or hardware sensors, and interact with apps on your behalf."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Selecting OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -1107,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connection successful"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Show all"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Searching"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Failed to retrieve add account intent from authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Failed to add account or the account type is not available."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Channels &amp; Inputs"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Channels, external inputs"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Channels"</string>
@@ -1124,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 b85af7b00..4c4a71d17 100644
--- a/Settings/res/values-en-rGB/energy-modes.xml
+++ b/Settings/res/values-en-rGB/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Critical updates and functions"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimised energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features that may increase energy use when the TV is not in use."</string>
+    <string 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-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 b0b0f75d0..eebc5b1ff 100644
--- a/Settings/res/values-en-rGB/strings.xml
+++ b/Settings/res/values-en-rGB/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App settings"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Location, Usage &amp; diagnostics, Ads"</string>
     <string name="add_account" msgid="7386223854837017129">"Add account"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Unknown account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remove account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Choose synced apps"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sync now"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced display settings for more dynamic range options."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lets the system manage the format conversion"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Sample text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chapter 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Even with eyes protected by the green spectacles, Dorothy and her friends were at first dazzled by the brilliance of the wonderful city. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the city had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses or animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Even with eyes protected by the green spectacles, Dorothy and her friends were at first dazzled by the brilliance of the wonderful City. The streets were lined with beautiful houses, all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and they were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green popcorn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. In one place, a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses, nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Format selection"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatic"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \'Advanced display settings\'"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connected"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Disconnected"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Use for TV audio"</string>
     <string name="send_feedback" msgid="936698637869795473">"Send feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Help Centre"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Enable"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> can collect all of the text that you type, except passwords. This includes personal data such as credit card numbers."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> will be able to read your screen, display content over other apps, track your interactions with apps or hardware sensors, and interact with apps on your behalf."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Selecting OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connection successful"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Show all"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Searching"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Failed to retrieve add account intent from authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Failed to add account or the account type is not available."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Channels and inputs"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Channels, external inputs"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Channels"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
+    <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="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 b85af7b00..4c4a71d17 100644
--- a/Settings/res/values-en-rIN/energy-modes.xml
+++ b/Settings/res/values-en-rIN/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essential network features"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Low energy use"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Turn off network connection when the TV is not in use."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Critical updates and functions"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recommended network features"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimised energy use"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Turns on features that wake the TV over the network (networked standby)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Additional network features"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Increased energy use"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"In addition to recommended features, this option turns on additional features that may increase energy use when the TV is not in use."</string>
+    <string 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-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 b0b0f75d0..eebc5b1ff 100644
--- a/Settings/res/values-en-rIN/strings.xml
+++ b/Settings/res/values-en-rIN/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App settings"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Location, Usage &amp; diagnostics, Ads"</string>
     <string name="add_account" msgid="7386223854837017129">"Add account"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Unknown account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remove account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Choose synced apps"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sync now"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced sound settings"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Allow game mode"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Match content dynamic range"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced Display settings for more dynamic range options."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"When enabling this option, the system will switch between different dynamic range formats to match the content. This may cause a black screen during a format switch.\n\nClick Advanced display settings for more dynamic range options."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferred dynamic range"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"System-preferred conversion"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Lets the system manage the format conversion"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Sample text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chapter 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Even with eyes protected by the green spectacles, Dorothy and her friends were at first dazzled by the brilliance of the wonderful city. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the city had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses or animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Even with eyes protected by the green spectacles, Dorothy and her friends were at first dazzled by the brilliance of the wonderful City. The streets were lined with beautiful houses, all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. \n\nThere were many people, men, women and children, walking about, and they were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green popcorn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. In one place, a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. \n\nThere seemed to be no horses, nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy, contented and prosperous."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Format selection"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatic"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Change resolution to %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Select OK to use %1$s from now on."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision is not supported at %1$s and will be disabled in \'Advanced display settings\'"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"This mode supports %1$s. On some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"This mode supports: %1$s\nOn some TVs, you may need to turn on enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancel"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Clear cached data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"This will clear cached data for all apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connected"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Disconnected"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"You don\'t have permission to change Bluetooth settings."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Use for TV audio"</string>
     <string name="send_feedback" msgid="936698637869795473">"Send feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Help Centre"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"This device is managed by your organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Learn more"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}other{Camera apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar app"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Enable"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> can collect all of the text that you type, except passwords. This includes personal data such as credit card numbers."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> will be able to read your screen, display content over other apps, track your interactions with apps or hardware sensors, and interact with apps on your behalf."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Selecting OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connection successful"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Show all"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Searching"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Failed to retrieve add account intent from authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Failed to add account or the account type is not available."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Channels and inputs"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Channels, external inputs"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Channels"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Enables:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Note that this mode may increase the power consumption of the device."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Enable \'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\'"</string>
+    <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="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 4708075f4..7af8bb2ee 100644
--- a/Settings/res/values-en-rXC/energy-modes.xml
+++ b/Settings/res/values-en-rXC/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎Essential network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎Low energy use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎Turn off network connection when the TV is not in use.‎‏‎‎‏‎"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎Critical updates and functions‎‏‎‎‏‎"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎Recommended network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎Optimized energy use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎Turns on features that wake the TV over the network (networked standby).‎‏‎‎‏‎"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎[Insert feature 1]‎‏‎‎‏‎"</item>
     <item msgid="8724721267222341891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎[Insert feature 2]‎‏‎‎‏‎"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎Additional network features‎‏‎‎‏‎"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎Increased energy use‎‏‎‎‏‎"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎In addition to recommended features, this option turns on additional features when the TV is not in use that may increase energy use.‎‏‎‎‏‎"</string>
+    <string 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-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 c22fed975..cda8be025 100644
--- a/Settings/res/values-en-rXC/strings.xml
+++ b/Settings/res/values-en-rXC/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎App Settings‎‏‎‎‏‎"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎Location, Usage &amp; Diagnostics, Ads‎‏‎‎‏‎"</string>
     <string name="add_account" msgid="7386223854837017129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎Add account‎‏‎‎‏‎"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎Unknown Account‎‏‎‎‏‎"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎Remove account‎‏‎‎‏‎"</string>
     <string name="account_sync" msgid="4315295293211313989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎Choose synced apps‎‏‎‎‏‎"</string>
     <string name="sync_now" msgid="4335217984374620551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‎Sync now‎‏‎‎‏‎"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎Sample text‎‏‎‎‏‎"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎The Wonderful Wizard of Oz‎‏‎‎‏‎"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎Chapter 11: The Wonderful Emerald City of Oz‎‏‎‎‏‎"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seeemed happy and contented and prosperous.‎‏‎‎‏‎"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. The window panes were of green glass; even the sky above the City had a green tint, and the rays of the sun were green. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There were many people, men, women and children, walking about, and these were all dressed in green clothes and had greenish skins. They looked at Dorothy and her strangely assorted company with wondering eyes, and the children all ran away and hid behind their mothers when they saw the Lion; but no one spoke to them. Many shops stood in the street, and Dorothy saw that everything in them was green. Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts. At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them. Everyone seemed happy and contented and prosperous.‎‏‎‎‏‎"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎Format selection‎‏‎‎‏‎"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎Automatic‎‏‎‎‏‎"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎Manual‎‏‎‎‏‎"</string>
@@ -218,7 +219,7 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎Change resolution to %1$s?‎‏‎‎‏‎"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎Select OK to use %1$s from now on.‎‏‎‎‏‎"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎Dolby Vision is not supported at %1$s and will be disabled in \"Advanced Display Settings\"‎‏‎‎‏‎"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎This mode supports %1$s. On some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported.‎‏‎‎‏‎"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎This mode supports: %1$s‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎On some TVs, you may need to turn on Enhanced HDMI to enable more HDR formats. Check your TV settings to see if this is supported.‎‏‎‎‏‎"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎Cancel‎‏‎‎‏‎"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎OK‎‏‎‎‏‎"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎Hz‎‏‎‎‏‎"</string>
@@ -277,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎Connected‎‏‎‎‏‎"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎Disconnected‎‏‎‎‏‎"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎You don’t have permission to change Bluetooth settings.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎Use for TV audio‎‏‎‎‏‎"</string>
     <string name="send_feedback" msgid="936698637869795473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎Send feedback‎‏‎‎‏‎"</string>
     <string name="launch_help" msgid="2607478763131952469">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎Help Center‎‏‎‎‏‎"</string>
     <string name="system_cast" msgid="6081391679828510058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎Google Cast‎‏‎‎‏‎"</string>
@@ -343,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎This device is managed by your organization.‎‏‎‎‏‎"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎This device is managed by ‎‏‎‎‏‏‎<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎ ‎‏‎‎‏‎"</string>
-    <string name="word_separator" msgid="3175619900852797955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎,‎‏‎‎‏‎"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎ ‎‏‎‎‏‎"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎- %1$s‎‏‎‎‏‎"</string>
     <string name="learn_more" msgid="820336467414665686">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎Learn more‎‏‎‎‏‎"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎Camera app‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎Camera apps‎‏‎‎‏‎}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎Calendar app‎‏‎‎‏‎"</string>
@@ -742,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎Enable‎‏‎‎‏‎"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎Configuration‎‏‎‎‏‎"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎Use ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ can collect all of the text you type, except passwords. This includes personal data such as credit card numbers.‎‏‎‎‏‎"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be able to read your screen, display content over other apps, track your interactions with apps or hardware sensors, and interact with apps on your behalf.‎‏‎‎‏‎"</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎Stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎Selecting OK will stop ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎Text to speech‎‏‎‎‏‎"</string>
@@ -1107,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎Connection successful‎‏‎‎‏‎"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎Show all‎‏‎‎‏‎"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎Searching‎‏‎‎‏‎"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎Failed to retrieve add account intent from authenticator.‎‏‎‎‏‎"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎Failed to add account or the account type is not available.‎‏‎‎‏‎"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎Channels &amp; Inputs‎‏‎‎‏‎"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎Channels, external inputs‎‏‎‎‏‎"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎Channels‎‏‎‎‏‎"</string>
@@ -1124,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎Enables:‎‏‎‎‏‎"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎Note that this mode may increase the power consumption of the device.‎‏‎‎‏‎"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎Enable \"‎‏‎‎‏‏‎<xliff:g id="ENERGYMODENAME">%s</xliff:g>‎‏‎‎‏‏‏‎\"‎‏‎‎‏‎"</string>
+    <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_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 a5d929607..c386d1a97 100644
--- a/Settings/res/values-es-rUS/energy-modes.xml
+++ b/Settings/res/values-es-rUS/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funciones de red esenciales"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Bajo consumo de energía"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva la conexión de red cuando la TV no esté en uso."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Funciones y actualizaciones importantes"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funciones de red recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo de energía optimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funciones que encienden la TV por la red (modo en espera en red)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insertar función 1]"</item>
     <item msgid="8724721267222341891">"[Insertar función 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funciones de red adicionales"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consumo de energía aumentado"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Además de las funciones recomendadas, esta opción activa otras funciones cuando la TV no está en uso que podrían aumentar el uso de energía."</string>
+    <string 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-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 3516ecdd9..11b016dc3 100644
--- a/Settings/res/values-es-rUS/strings.xml
+++ b/Settings/res/values-es-rUS/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Configuración de apps"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Ubicación, Uso y Diagnóstico, Anuncios"</string>
     <string name="add_account" msgid="7386223854837017129">"Agregar cuenta"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Cuenta desconocida"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Quitar cuenta"</string>
     <string name="account_sync" msgid="4315295293211313989">"Elegir aplic. sincronizadas"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizar ahora"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Configuración de sonido avanzada"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Habilitar modo de juego"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Coincidir con el rango dinámico del contenido"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Si se habilita esta opción, el sistema cambiará entre los diferentes formatos de rango dinámico para coincidir con el contenido. Esto puede provocar una pantalla negra durante el cambio de formato.\n\nHaz clic en Configuración de pantalla avanzada para ver más opciones de rango dinámico."</string>
+    <string name="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="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>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"¿Quieres forzar la compatibilidad con HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De forma predeterminada, la conversión se forzará a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"La pantalla funcionará con una resolución de 1080p/60 Hz Esta opción no es compatible con tu pantalla cuando funciona con la resolución de 4K/60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Por el momento, Dolby Vision no es compatible con esta resolución. Si habilitas Dolby Vision de forma manual, se cambiará la resolución de la pantalla a 1080p/60 Hz."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"¿Quieres cambiar la resolución a 1080p/60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forzar siempre la conversión a Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si la opción Dolby Vision está desactivada en formatos HDR en la Configuración de pantalla avanzada, forzar la conversión a Dolby Vision volverá a activarla."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forzar siempre la conversión a HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Texto de muestra"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"El maravilloso mago de Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítulo 11: La maravillosa Ciudad Esmeralda de Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Aunque contaban con la protección de los lentes verdes, en un primer momento, Dorothy y sus amigos se sintieron encandilados por el brillo de la maravillosa ciudad. Las calles estaban bordeadas por hermosas casas de mármol verde y adornadas con esmeraldas brillantes. Caminaron por pavimento del mismo mármol verde y, donde se unían las calles, había filas de esmeraldas juntas que brillaban con el sol. Los vidrios de las ventanas eran verdes y hasta el cielo sobre la ciudad y los rayos del sol tenían un matiz verde. \n\nHabía muchas personas caminando: hombres, mujeres y niños, todos vestidos de verde y de piel verdosa. Miraban a Dorothy y a sus extraños acompañantes con asombro. Los niños corrían despavoridos detrás de sus madres cuando veían al León, pero nadie les hablaba. Había muchas tiendas en la calle, y Dorothy vio que todo lo que vendían era verde: caramelos verdes, palomitas de maíz verdes, zapatos verdes, sombreros verdes y ropa verde de todo tipo. En una tienda, un hombre vendía limonada verde y Dorothy observó que los niños que la compraban pagaban con monedas verdes. \n\nParecía no haber caballos ni animales de ningún tipo. Los hombres cargaban objetos en pequeñas carretas verdes que llevaban delante de ellos. Todos parecían felices, contentos y afortunados."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Aunque contaban con la protección de los lentes verdes, en un primer momento, Dorothy y sus amigos se sintieron encandilados por el brillo de la maravillosa ciudad. Las calles estaban bordeadas por hermosas casas de mármol verde y adornadas con esmeraldas brillantes. Caminaron por pavimento del mismo mármol verde y, donde se unían las calles, había filas de esmeraldas juntas que brillaban con el sol. Los vidrios de las ventanas eran verdes y hasta el cielo sobre la ciudad y los rayos del sol tenían un matiz verde. \n\nHabía muchas personas caminando: hombres, mujeres y niños, todos vestidos de verde y de piel verdosa. Miraban a Dorothy y a sus extraños acompañantes con asombro. Los niños corrían despavoridos detrás de sus madres cuando veían al León, pero nadie les hablaba. Había muchas tiendas en la calle, y Dorothy vio que todo lo que vendían era verde: caramelos verdes, palomitas de maíz verdes, zapatos verdes, sombreros verdes y ropa verde de todo tipo. En una tienda, un hombre vendía limonada verde, y Dorothy observó que los niños que la compraban pagaban con monedas verdes. \n\nParecía no haber caballos ni animales de ningún tipo. Los hombres cargaban objetos en pequeñas carretas verdes que llevaban delante de ellos. Todos parecían felices, contentos y exitosos."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Selección de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"¿Quieres cambiar la resolución a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Seleccionar Aceptar para usar %1$s a partir de ahora."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no es compatible en %1$s, por lo que se desactivará en \"Configuración de pantalla avanzada\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo admite %1$s. En algunas TVs, es posible que debas activar el HDMI mejorado para habilitar otros formatos HDR. Consulta la configuración de la TV para ver si se admite."</string>
+    <string name="resolution_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>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"¿Deseas borrar los datos almacenados en caché?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Se borrarán los datos almacenados en caché de todas las aplicaciones."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Conectado"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconectado"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usar para el audio de la TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Enviar comentarios"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centro de ayuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -303,7 +302,7 @@
     <string name="no_device_admins" msgid="4628974717150185625">"No hay apps de administración de dispositivo disponibles"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"El administrador inhabilitó la opción"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"No disponible"</string>
-    <string name="manage_device_admin" msgid="5714217234035017983">"Apps de administración"</string>
+    <string name="manage_device_admin" msgid="5714217234035017983">"Apps de administración de dispositivos"</string>
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"No hay apps activas"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"Inhabilitada: admin, encriptación o credenciales"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"Información del dispositivo administrado"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Tu organización administra este dispositivo."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Más información"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de cámara}other{Apps de cámara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App de calendario"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Habilitar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuración"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> puede recopilar todo el texto que escribes, excepto las contraseñas. Esto incluye datos personales, como los números de tarjetas de crédito"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> podrá leer tu pantalla, mostrar contenido sobre otras apps, realizar un seguimiento de las interacciones con apps o sensores de hardware, y también podrá interactuar con apps por ti."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"¿Detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Si seleccionas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Texto a voz"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Conexión exitosa"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostrar todo"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Buscando"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Se produjo un error al recuperar el intent del autenticador para agregar la cuenta."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Se produjo un error al agregar la cuenta, o bien el tipo no está disponible."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canales y entradas"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canales y entradas externas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canales"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Habilita lo siguiente:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ten en cuenta que este modo podría aumentar el consumo de energía del dispositivo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Habilitar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 68448b60e..f704e239b 100644
--- a/Settings/res/values-es/energy-modes.xml
+++ b/Settings/res/values-es/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funciones de red esenciales"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Bajo consumo de energía"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva la conexión de red cuando no se está usando la televisión."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Actualizaciones y funciones críticas"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funciones de red recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo de energía optimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funciones que encienden la televisión a través de la red (modo de espera en red)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funciones de red adicionales"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Mayor consumo de energía"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Además de las funciones recomendadas, esta opción activa otras funciones cuando no se está usando la televisión que pueden aumentar el consumo de energía."</string>
+    <string 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-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 1eda3921b..86e74c147 100644
--- a/Settings/res/values-es/strings.xml
+++ b/Settings/res/values-es/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Ajustes de aplicaciones"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Ubicación, uso y diagnóstico, y anuncios"</string>
     <string name="add_account" msgid="7386223854837017129">"Añadir cuenta"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Cuenta desconocida"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Quitar cuenta"</string>
     <string name="account_sync" msgid="4315295293211313989">"Elegir aplicaciones sincronizadas"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizar ahora"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Texto de ejemplo"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"El maravilloso mago de Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítulo 11: La Ciudad Esmeralda"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Aun con los ojos protegidos por las gafas verdes, Dorothy y sus amigos quedaron deslumbrados en un primer momento por el brillo de aquella maravillosa ciudad. Las calles estaban formadas por preciosas casas construidas con mármol verde y todo estaba salpicado de relucientes esmeraldas. Pasearon por un camino de mármol verde cuyas baldosas se unían con hileras de esmeraldas, colocadas muy juntas y que relucían bajo la luz del sol. Las ventanas eran de cristal verde y hasta el cielo de la ciudad y los rayos del sol tenían un tono verdoso. \n\nHabía muchos hombres, mujeres y niños paseando, y todos tenían la piel verdosa y vestían ropa verde. Miraban con asombro a Dorothy y a sus extraños acompañantes, y los niños corrían a esconderse detrás de sus madres cuando veían al león, pero nadie les dirigía la palabra. Había también muchas tiendas y Dorothy observó que todo lo que había en ellas era verde. Vendían caramelos y palomitas de maíz verdes y también zapatos, sombreros y todo tipo de ropa del mismo color. En una de ellas, un hombre vendía limonada y Dorothy pudo comprobar que los niños pagaban con monedas verdes. \n\nNo parecía que en aquel lugar hubiese caballos ni animales de ningún tipo, pues los hombres lo transportaban todo empujando pequeños carros de este color. Todos parecían felices, satisfechos y afortunados."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Aun con los ojos protegidos por las gafas verdes, Dorothy y sus amigos quedaron deslumbrados en un primer momento por el brillo de aquella maravillosa ciudad. Las calles estaban formadas por preciosas casas construidas con mármol verde y todo estaba salpicado de relucientes esmeraldas. Pasearon por un camino de mármol verde cuyas baldosas se unían con hileras de esmeraldas, colocadas muy juntas y que relucían bajo la luz del sol. Las ventanas eran de cristal verde y hasta el cielo de la ciudad y los rayos del sol tenían un tono verdoso. \n\nHabía muchos hombres, mujeres y niños paseando, y todos tenían la piel verdosa y vestían ropa verde. Miraban con asombro a Dorothy y a sus extraños acompañantes, y los niños corrían a esconderse detrás de sus madres cuando veían al león, pero nadie les dirigía la palabra. Había también muchas tiendas y Dorothy observó que todo lo que había en ellas era verde. Vendían caramelos y palomitas de maíz verdes y también zapatos, sombreros y todo tipo de ropa del mismo color. En una de ellas, un hombre vendía limonada y Dorothy pudo comprobar que los niños pagaban con monedas verdes. \n\nNo parecía que en aquel lugar hubiese caballos ni animales de ningún tipo, pues los hombres lo transportaban todo empujando pequeños carros verdes. Todos parecían felices, satisfechos y afortunados."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Selección de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,17 +219,16 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"¿Cambiar la resolución a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecciona Aceptar para usar %1$s a partir de ahora."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision no es compatible en %1$s. Se inhabilitará en \"Ajustes avanzados de la pantalla\"."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo admite %1$s. Es posible que en algunas televisiones tengas que activar el HDMI mejorado para habilitar más formatos HDR. Ve a la configuración de la TV para comprobar si puedes hacerlo."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo admite: %1$s\nEn algunas televisiones, puede que tengas que activar el HDMI mejorado para habilitar más formatos de HDR. Consulta los ajustes de la TV para comprobar si puedes hacerlo."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Aceptar"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"¿Borrar datos almacenados en caché?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Se borrarán datos en caché de las aplicaciones."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"Añadir accesorio"</string>
-    <string name="accessory_state_pairing" msgid="15908899628218319">"Vinculando…"</string>
+    <string name="accessory_state_pairing" msgid="15908899628218319">"Emparejando…"</string>
     <string name="accessory_state_connecting" msgid="6560241025917621212">"Estableciendo conexión..."</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"Error al emparejar"</string>
     <string name="accessory_state_canceled" msgid="4794837663402063770">"Cancelada"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Conectado"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconectado"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"No tienes permiso para cambiar los ajustes de Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usar para audio de TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Enviar comentarios"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centro de Ayuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo está administrado por tu organización."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Más información"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicación de cámara}other{Aplicaciones de cámara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicación de calendario"</string>
@@ -680,7 +680,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Texto en negrita"</string>
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Corrección de color"</string>
-    <string name="color_correction_usage" msgid="4160611639548748657">"Usar corrección de color"</string>
+    <string name="color_correction_usage" msgid="4160611639548748657">"Usar Corrección de color"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Modo de color"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Deuteronomalía"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Rojo-verde"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Habilitar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Ajustes"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> puede recoger todo el texto que escribes (excepto las contraseñas), incluidos datos personales, como números de tarjetas de crédito."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> podrá leer el contenido de tu pantalla, mostrar contenido sobre otras aplicaciones, rastrear tus interacciones con aplicaciones o sensores de hardware e interactuar con aplicaciones en tu nombre."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"¿Detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Si seleccionas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Conversión de texto a voz"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Se ha conectado correctamente"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostrar todo"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Buscando"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"No se ha podido recuperar el intento del autenticador de añadir cuenta."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"No se ha podido añadir la cuenta o el tipo de cuenta no está disponible."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canales y fuentes de entrada"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canales, entradas externas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canales"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Habilita lo siguiente:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ten en cuenta que este modo puede aumentar el consumo de energía del dispositivo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Habilitar <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 6f6e88593..85c19d952 100644
--- a/Settings/res/values-et/energy-modes.xml
+++ b/Settings/res/values-et/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Peamised võrgufunktsioonid"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Vähene energiatarbimine"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Lülitab võrguühenduse välja, kui telerit ei ‏kas‏utata."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kriitilised värskendused ja funktsioonid"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Soovitatavad võrgufunktsioonid"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimeeritud energiatarbimine"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Lülitab sisse funktsioonid, mis teleri võrgu kaudu äratavad (võrgupõhine ooterežiim)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Täiendavad võrgufunktsioonid"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Suurem energiatarbimine"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Lisaks soovitatud funktsioonidele lülitab see valik sisse lisafunktsioonid, kui telerit ei kasutata. See võib energiatarbimist suurendada."</string>
+    <string 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-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 ab0b5c4fb..77dd5a5ec 100644
--- a/Settings/res/values-et/strings.xml
+++ b/Settings/res/values-et/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Rakenduse seaded"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Asukoht, kasutus ja diagnostika, reklaamid"</string>
     <string name="add_account" msgid="7386223854837017129">"Lisa konto"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Tundmatu konto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Eemalda konto"</string>
     <string name="account_sync" msgid="4315295293211313989">"Valige sünkroonitavad rakendused"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sünkrooni kohe"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Kas soovite jõustada HDR-väljundi?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Vaikimisi jõustatakse konvertimise tüübiks <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Teie ekraan töötab 1080p ja 60 Hz eraldusvõimega. See valik ei ühildu teie ekraaniga, kui see töötab 4K ja 60 Hz eraldusvõimega."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Visionit ei toetata praeguse eraldusvõime juures. Kui lubate Dolby Visioni käsitsi, määratakse teie ekraani eraldusvõimeks 1080p 60 Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Kas määrata eraldusvõimeks 1080p 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Alati konvertimise jõustamine Dolby Visionile"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Kui Dolby Vision on HDR-vormingutes menüüs „Täpsemad kuvaseaded” keelatud, lubatakse Dolby Visioni konvertimise jõustamisel see uuesti."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Alati konvertimise jõustamine HDR10-le"</string>
@@ -180,7 +179,7 @@
     <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Kui HDR10+ on HDR-vormingutes menüüs „Täpsemad kuvaseaded” keelatud, lubatakse HDR10+ konvertimise jõustamisel see uuesti."</string>
     <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Alati konvertimise jõustamine SDR-le"</string>
     <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR-i konvertimise jõustamisel keelatakse kõik vormingud HDR-vormingutes jaotises Täpsemad kuvaseaded."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Vastenda sisu kaadrisagedusega"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Vastendamine sisu kaadrisagedusega"</string>
     <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Ainult sujuv"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Kui rakendus seda taotleb, vastendab teie seade väljundi vaadatava sisu algse kaadrisagedusega AINULT siis, kui teie teler on sujuvaks üleviimiseks suuteline."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Teie ühendatud ekraan ei toeta värskendussageduse sujuvat üleviimist. Sellel valikul ei ole mõju, kui te ei võta kasutusele ekraani, mis seda funktsiooni toetab."</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Näidistekst"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Võlur Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. peatükk: Ozi imeline smaragdlinn"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Kuigi rohelised prillid olid silmade kaitseks ninale asetatud, olid Dorothy ja tema sõbrad esialgu selle imelise linna särast pimestatud. Tänavaid ääristasid ilusad rohelisest marmorist majad, mida kaunistasid säravad smaragdid. Tänavakivid olid samuti rohelisest marmorist ja nende vahel särasid päikesevalguses tihedad smaragdiread. Aknad olid rohelisest klaasist ja isegi taevas linna kohal oli rohekas. Pilvede vahelt piilusid rohelised päikesekiired. \n\nInimesi oli palju – mehed, naised ja lapsed olid kõik rõivastatud rohelisse ning ka nende nahal oli rohekas jume. Nad vaatasid uudistavalt Dorothyt ja tema kummalisi kaaslasi ning lõvi nähes jooksid lapsed oma emade selja taha peitu. Kuid keegi ei rääkinud nendega. Tänaval oli palju poode ja Dorothy märkas, et kõik seal oli roheline. Müügil olid rohelised kommid ja popkorn, rohelised kingad, mütsid ning mitmesugused rõivad. Ühes poekeses müüs kaupmees rohelist limonaadi ja lapsed tasusid selle eest roheliste pennidega. \n\nHobuseid ega muid loomi ei paistnud kusagil. Mehed vedasid asju väikestes rohelistes korvides, mida nad enda ees lükkasid. Kõik näisid rõõmsad, rahulolevad ja jõukad."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Kuigi rohelised prillid olid silmade kaitseks ninale asetatud, olid Dorothy ja tema sõbrad esialgu selle imelise linna särast pimestatud. Tänavaid ääristasid ilusad rohelisest marmorist majad, mida kaunistasid säravad smaragdid. Tänavakivid olid samuti rohelisest marmorist ja nende vahel särasid päikesevalguses tihedad smaragdiread. Aknad olid rohelisest klaasist ja isegi taevas linna kohal oli rohekas. Pilvede vahelt piilusid rohelised päikesekiired. \n\nInimesi oli palju – mehed, naised ja lapsed olid kõik rõivastatud rohelisse ning ka nende nahal oli rohekas jume. Nad vaatasid uudistavalt Dorothyt ja tema kummalisi kaaslasi ning lõvi nähes jooksid lapsed oma emade selja taha peitu. Kuid keegi ei rääkinud nendega. Tänaval oli palju poode ja Dorothy märkas, et kõik seal oli roheline. Müügil olid rohelised kommid ja popkorn, rohelised kingad, mütsid ning mitmesugused rõivad. Ühes poekeses müüs kaupmees rohelist limonaadi ja lapsed tasusid selle eest roheliste pennidega. \n\nHobuseid ega muid loomi ei paistnud kusagil. Mehed vedasid asju väikestes rohelistes korvides, mida nad enda ees lükkasid. Kõik näisid rõõmsad, rahulolevad ja jõukad."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Vormingu valimine"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automaatne"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Käsitsi"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Kas määrata eraldusvõimeks %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Valige OK, et edaspidi kasutada eraldusvõimet %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Visionit režiimis %1$s ei toetata ja see on menüüs „Täpsemad kuvaseaded“ keelatud"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"See režiim toetab valikut %1$s. Mõnes teleris peate võib-olla sisse lülitama täiustatud HDMI, et lubada rohkem HDR-vorminguid. Vaadake oma teleri seadetest, kas seda toetatakse."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"See režiim toetab: %1$s\nMõnes teleris peate võib-olla sisse lülitama täiustatud HDMI, et lubada rohkem HDR-vorminguid. Vaadake oma teleri seadetest, kas seda toetatakse."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Tühista"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Kas soovite vahemälus olevad andmed kustutada?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Kustutab rakenduste vahemälus olevad andmed."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Ühendatud"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Pole ühendatud"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Teil ei ole luba Bluetoothi seadete muutmiseks."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Kasuta teleriheli jaoks"</string>
     <string name="send_feedback" msgid="936698637869795473">"Tagasiside saatmine"</string>
     <string name="launch_help" msgid="2607478763131952469">"Abikeskus"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Seda seadet haldab teie organisatsioon."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Seda seadet haldab <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Lisateave"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kaamerarakendus}other{Kaamerarakendused}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendrirakendus"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Luba"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguratsioon"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Kas kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> võib koguda kogu sisestatud teksti, v.a paroolid. Kogutud tekst sisaldab isiklikke andmeid, nt krediitkaardinumbreid."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> saab lugeda teie ekraani, kuvada sisu teiste rakenduste kohal, jälgida teie suhtlust rakenduste või riistvaraanduritega ning suhelda rakendustega teie nimel."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Kas peatada teenus <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Kui valite OK, siis teenus <xliff:g id="SERVICE">%1$s</xliff:g> peatatakse."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Kõnesüntees"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Ühendamine õnnestus"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Kuva kõik"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Otsimine"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Autentijalt konto lisamise kavatsuse toomine ebaõnnestus."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Konto lisamine ebaõnnestus või konto tüüp ei ole saadaval."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanalid ja sisendid"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanalid, välised sisendid"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanalid"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Lubab järgmised."</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Pange tähele, et see režiim võib suurendada seadme energiatarbimist."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Luba režiim „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
+    <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_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 3471ded1e..672b196ee 100644
--- a/Settings/res/values-eu/energy-modes.xml
+++ b/Settings/res/values-eu/energy-modes.xml
@@ -16,27 +16,29 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Sarearen ezinbesteko eginbideak"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Energia-kontsumo txikia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desaktibatu sareko konexioa telebista erabiltzen ari ez zarenean."</string>
+    <string 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-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Eguneratze eta funtzio garrantzitsuak"</item>
+    <item msgid="4976202876230149030">"eguneratze eta funtzio garrantzitsuak"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Sarearen eginbide gomendatuak"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Energia-kontsumo optimizatua"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Sarearen bidez (sare bidezko egonean modua) telebista aktibatzen duten eginbideak aktibatzen ditu."</string>
+    <string 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-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Idatzi lehenengo eginbidea]"</item>
-    <item msgid="8724721267222341891">"[Idatzi bigarren eginbidea]"</item>
+    <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="4428472238583662129">"Sarearen eginbide gehigarriak"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Energia-kontsumo handia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Gomendatutako eginbideez gain, agian energia-kontsumo handiagoa duten eginbide gehigarriak aktibatzen ditu aukera honek telebista erabiltzen ari ez zarenean."</string>
+    <string 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-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Idatzi lehenengo eginbidea]"</item>
-    <item msgid="170760143032597722">"[Idatzi bigarren eginbidea]"</item>
+    <item msgid="3018897868803319747">"[Gehitu lehenengo eginbidea]"</item>
+    <item msgid="170760143032597722">"[Gehitu bigarren eginbidea]"</item>
   </string-array>
     <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
     <skip />
diff --git a/Settings/res/values-eu/strings.xml b/Settings/res/values-eu/strings.xml
index e6edc37df..614e8f013 100644
--- a/Settings/res/values-eu/strings.xml
+++ b/Settings/res/values-eu/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Aplikazioaren ezarpenak"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Kokapena, erabilera eta diagnosikoak, iragarkiak"</string>
     <string name="add_account" msgid="7386223854837017129">"Gehitu kontu bat"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Kontu ezezaguna"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Kendu kontua"</string>
     <string name="account_sync" msgid="4315295293211313989">"Aukeratu sinkronizatutako aplikazioak"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinkronizatu"</string>
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"Berrezarri jatorrizko datuak"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrazioa"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"Itzaltzeko tenporizadorea"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Ezarri tenporizadoreak telebista itzaltzeko eta energia aurrezteko moduan"</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Ezarri tenporizadoreak telebista itzaltzeko eta energia aurrezteko"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Gailuak"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Hautatu formatuak"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Testu-lagina"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Ozeko azti miragarria"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. kapitulua: Esmeraldazko Oz hiri harrigarria"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela atzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta bere lagunak txundituta geratu ziren Hiri zoragarriaren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde horretaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren Lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela atzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita oinetako berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta, haur batzuek limonada erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Pozik, alai eta zoriontsu zeuden denak."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formatu-hautapena"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatikoa"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Eskuzkoa"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"%1$s ezarri nahi duzu bereizmen gisa?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Hemendik aurrera %1$s erabiltzeko, hautatu Ados."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ek ez du %1$s modua onartzen eta pantailaren ezarpen aurreratuetan desgaituko da"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Moduak hauek onartzen ditu: %1$s. Telebista batzuetan, baliteke HDMI hobetua aktibatu behar izatea HDR formatu gehiago gaitzeko. Aukera hori duzun jakiteko, ikusi telebistaren ezarpenak."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Moduak hauek onartzen ditu: %1$s\nTelebista batzuetan, baliteke HDMI hobetua aktibatu behar izatea HDR formatu gehiago gaitzeko. Aukera hori duzun jakiteko, ikusi telebistaren ezarpenak."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Utzi"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Ados"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Cacheko datuak garbitu nahi dituzu?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Aplikazio guztien cacheko datuak garbituko dira."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Konektatuta"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Deskonektatuta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Ez daukazu Bluetootharen ezarpenak aldatzeko baimenik."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Erabili telebistaren audio gisa"</string>
     <string name="send_feedback" msgid="936698637869795473">"Bidali oharrak"</string>
     <string name="launch_help" msgid="2607478763131952469">"Laguntza-zentroa"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Zure erakundeak kudeatzen du gailua."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen du gailu hau."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Lortu informazio gehiago"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera-aplikazioa}other{Kamera-aplikazioak}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Egutegi-aplikazioa"</string>
@@ -373,8 +373,8 @@
     <string name="about_build" msgid="8467840394761634575">"Android TV-ren sistema eragilearen konpilazioa"</string>
     <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{# urrats falta zaizu garatzaile izateko}other{# urrats falta zaizkizu garatzaile izateko}}"</string>
     <string name="about_ads" msgid="7662896442040086522">"Iragarkiak"</string>
-    <string name="ads_description" msgid="8081069475265061074">"Kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate IDa."</string>
-    <string name="ads_content_description" msgid="1006489792324920289">"Iragarkiak: kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate IDa."</string>
+    <string name="ads_description" msgid="8081069475265061074">"Kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate-identifikatzailea."</string>
+    <string name="ads_content_description" msgid="1006489792324920289">"Iragarkiak: kudeatu iragarkien ezarpenak; adibidez, berrezarri publizitate-identifikatzailea."</string>
     <string name="show_dev_on" msgid="612741433124106067">"Garatzailea zara!"</string>
     <string name="show_dev_already" msgid="1522591284776449818">"Ez dago zertan, dagoeneko garatzailea zara"</string>
     <string name="device_info_default" msgid="2374506935205518448">"Ezezaguna"</string>
@@ -421,11 +421,11 @@
     <item msgid="6005053494500517261">"Bikaina"</item>
   </string-array>
     <string name="title_mac_address" msgid="7511588678922209883">"Gailuaren MAC helbidea"</string>
-    <string name="title_randomized_mac_address" msgid="3359532498635833471">"Ausaz antolatutako MAC helbidea"</string>
+    <string name="title_randomized_mac_address" msgid="3359532498635833471">"Ausazko MAC helbidea"</string>
     <string name="title_signal_strength" msgid="5047116893338315998">"Seinalearen indarra"</string>
     <string name="title_random_mac_settings" msgid="6685812569356353378">"Pribatutasuna"</string>
   <string-array name="random_mac_settings_entries">
-    <item msgid="3457228452595715533">"Ausaz aukeratutako MAC helbide bat (lehenetsia)"</item>
+    <item msgid="3457228452595715533">"Erabili ausazko MAC helbide bat (lehenetsia)"</item>
     <item msgid="2490415280467390067">"Erabili gailuaren MAC helbidea"</item>
   </string-array>
     <string name="mac_address_not_available" msgid="2992935344891853369">"Ez dago erabilgarri"</string>
@@ -516,7 +516,7 @@
     <string name="title_wifi_anonymous_identity" msgid="5965175781722004334">"Idatzi <xliff:g id="SSID">%1$s</xliff:g> sarearen identitate anonimoa"</string>
     <string name="wifi_setup_summary_title_connected" msgid="2725439590655448489">"<xliff:g id="SSID">%1$s</xliff:g> sarera konektatuta zaude"</string>
     <string name="wifi_summary_title_connected" msgid="201105022065577659">"Sarea konektatu da"</string>
-    <string name="wifi_summary_title_not_connected" msgid="7991004795297065201">"Ez zaude sarera konektatuta"</string>
+    <string name="wifi_summary_title_not_connected" msgid="7991004795297065201">"Ez zaude konektatuta sarera"</string>
     <string name="wifi_summary_description_connected_to_wifi_network" msgid="8796747274977762311">"<xliff:g id="SSID">%1$s</xliff:g> sarera konektatuta zaude. Beste sare batera konektatu nahi duzu?"</string>
     <string name="wifi_summary_unknown_network" msgid="8044143986439139664">"sare ezezaguna"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7326314737931342236">"Ez duzu wifi-sarea aldatzeko baimenik."</string>
@@ -682,7 +682,7 @@
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Koloreen zuzenketa"</string>
     <string name="color_correction_usage" msgid="4160611639548748657">"Erabili koloreen zuzenketa"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Kolore modua"</string>
-    <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Daltonismoa"</string>
+    <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Deuteranomalia"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Gorri-berdea"</string>
     <string name="color_correction_mode_protanomaly" msgid="8105793166015115037">"Protanopia"</string>
     <string name="color_correction_mode_protanomaly_summary" msgid="3247619910784115563">"Gorri-berdea"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Gaitu"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurazioa"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak idazten duzun guztia bil dezake, pasahitzak izan ezik. Datu pertsonalak hartzen ditu barne; besteak beste, kreditu-txartelen zenbakiak."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> zure pantaila irakurtzeko gai izango da, beste aplikazio batzuetako edukia erakutsi ahal izango du, aplikazioekin edo hardwareen sentsoreekin dituzun interakzioen jarraipena egin eta beste aplikazio batzuekin zure izenean interakzioan jardun."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g> gelditu?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ados sakatuta, <xliff:g id="SERVICE">%1$s</xliff:g> gelditu egingo da."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Testua ahots bihurtzeko eginbidea"</string>
@@ -799,7 +799,7 @@
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Optimizatu pantaila bereizmen edo irudi-abiadura handiena izan dezan. Ezarpen honek Ultra HD motako pantailetan soilik du eragina. Ezarpena aldatuz gero, gailua berrabiaraziko da."</string>
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Gaitu Bluetooth HCI miatze-erregistroa"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Aktibatu arazketa modua USBa konektatzean"</string>
-    <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Araztutako aplikazioa araztailea erantsi arte itxaroten ari da exekutatu aurretik"</string>
+    <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Araztutako aplikazioak araztailea erantsi arte itxaroten du exekutatu aurretik"</string>
     <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Erakutsi bideo zatiaren mugak, marjinak, etab."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Distirarazi leiho barruko ikuspegiak GPUz marraztean"</string>
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Distirarazi hardware-geruzak berdez haiek eguneratzean"</string>
@@ -934,7 +934,7 @@
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Garbitu datuak"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"Aplikazio honetako datu guztiak betiko ezabatuko dira.\nBesteak beste, fitxategiak, ezarpenak, kontuak eta datu-baseak."</string>
     <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Garbitu lehenespenak"</string>
-    <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"Zehaztu aplikazioa noiz abiarazi"</string>
+    <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"Zehaztu aplikazioa noiz exekutatu"</string>
     <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"Ez da ezarri balio lehenetsirik"</string>
     <string name="device_apps_app_management_clear_cache" msgid="2678301483598915479">"Garbitu cachea"</string>
     <string name="device_apps_app_management_notifications" msgid="1687529279264810317">"Jakinarazpenak"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Konektatu da"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Erakutsi guztiak"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Bilatzen"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Ezin izan da eskuratu kontua gehitzeko intent-a autentifikatzailetik."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Ezin izan da gehitu kontua, edo kontu mota ez dago erabilgarri."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanalak eta sarrerak"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanalak, kanpoko sarrerak"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanalak"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Hauek gaitzen ditu:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Kontuan izan agian modu honek gailuaren energia-kontsumoa handituko duela."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Gaitu <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 e47f0e57e..317272aec 100644
--- a/Settings/res/values-fa/energy-modes.xml
+++ b/Settings/res/values-fa/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ویژگی‌های ضروری شبکه"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"مصرف کم انرژی"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"هنگامی که از تلویزیون استفاده نمی‌شود اتصال شبکه خاموش شود."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"عملکردها و به‌روزرسانی‌های بسیار مهم"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ویژگی‌های توصیه‌شده شبکه"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"مصرف بهینه انرژی"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ویژگی‌هایی را روشن می‌کند که تلویزیون را ازطریق شبکه بیدار می‌کند (آماده‌به‌کار متصل به شبکه)"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[درج ویژگی ۱]"</item>
     <item msgid="8724721267222341891">"[درج ویژگی ۲]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ویژگی‌های اضافی شبکه"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"مصرف بیشتر انرژی"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"علاوه‌بر ویژگی‌های توصیه‌شده، این گزینه در مواقعی که از تلویزیون استفاده نمی‌شود ویژگی‌هایی اضافی روشن می‌کند که می‌تواند مصرف انرژی را افزایش دهد."</string>
+    <string 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-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 705c610a7..55d978468 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"تنظیمات برنامه"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"مکان، استفاده و عیب‌یابی، آگهی‌ها"</string>
     <string name="add_account" msgid="7386223854837017129">"افزودن حساب"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"حساب نامشخص"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"حذف کردن حساب"</string>
     <string name="account_sync" msgid="4315295293211313989">"انتخاب برنامه‌های همگام‌ شده"</string>
     <string name="sync_now" msgid="4335217984374620551">"اکنون همگام‌سازی شود"</string>
@@ -92,7 +93,7 @@
     <string name="connectivity_network_diagnostics" msgid="4396132865849151854">"عیب‌یابی شبکه"</string>
     <string name="apps_recently_used_category_title" msgid="7877660412428813933">"برنامه‌های اخیراً بازشده"</string>
     <string name="apps_see_all_apps" msgid="2002886135933443688">"مشاهده همه برنامه‌ها"</string>
-    <string name="apps_permissions_category_title" msgid="8099660060701465267">"مجوزها"</string>
+    <string name="apps_permissions_category_title" msgid="8099660060701465267">"اجازه‌ها"</string>
     <string name="overlay_security_slice_title" msgid="4895032817538300187"></string>
     <string name="update_slice_title" msgid="6553763903108611747"></string>
     <string name="all_apps_title" msgid="3717294436135280133">"همه برنامه‌ها"</string>
@@ -151,12 +152,12 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"تنظیمات پیشرفته صدا"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"مجاز کردن حالت بازی"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مطابقت دادن بازه پویای محتوا"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"هنگام فعال کردن این گزینه، سیستم بین قالب‌های مختلف بازه پویا جابه‌جا می‌شود تا با محتوا مطابقت پیدا کند. به‌همین دلیل ممکن است درطول تغییر قالب، صفحه سیاهی ببینید.\n\nبرای گزینه‌های بازه پویای بیشتر، روی «تنظیمات پیشرفته نمایشگر» کلیک کنید."</string>
-    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"بازه پویای ترجیحی"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مطابقت دادن دامنه پویای محتوا"</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"هنگام فعال کردن این گزینه، سیستم بین قالب‌های مختلف دامنه پویا جابه‌جا می‌شود تا با محتوا مطابقت پیدا کند. به‌همین دلیل ممکن است درطول تغییر قالب، صفحه سیاهی ببینید.\n\nبرای گزینه‌های دامنه پویای بیشتر، روی «تنظیمات پیشرفته نمایشگر» کلیک کنید."</string>
+    <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"دامنه پویای ترجیحی"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"تبدیل ترجیحی سیستم"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"به سیستم اجازه داده می‌شود تبدیل قالب را مدیریت کند"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"وقتی این گزینه انتخاب شود، سیستم محدوده پویای مناسبی را برای ارسال به صفحه‌نمایش شما تعیین می‌کند و درصورت نیاز محتوا را به این محدوده پویا تبدیل می‌کند."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"وقتی این گزینه انتخاب شود، سیستم دامنه پویای مناسبی را برای ارسال به صفحه‌نمایش شما تعیین می‌کند و درصورت نیاز محتوا را به این دامنه پویا تبدیل می‌کند."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"همیشه با قالب محتوا مطابقت دارد"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"تبدیل اجباری"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"تبدیل به قالب ترجیحی را اجباری می‌کند"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"نوشتار نمونه"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"جادوگر شهر اوز"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"فصل ۱۱: شهر زمردی شگفت‌انگیز اوز"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"با وجودی که دورتی و دوستانش عینک‌هایی سبز به چشم داشتند چشمانشان در اولین نگاه از درخشندگی این شهر فوق‌العاده خیره شد. خیابان‌ها با ردیف خانه‌هایی که همه از مرمر سبز ساخته شده بودند و در همه جای آن با زمردهای درخشنده تزئین شده بود می‌درخشید. آن‌ها در پیاده‌رویی از همان مرمر سبز راه می‌رفتند و سنگفرش‌های پیاده‌رو با ردیف‌های زمردی که نزدیک به هم قرار گرفته بودند و در نور خورشید می‌درخشیدند به هم پیوسته بود. قاب‌های پنجره‌ها از شیشه سبز بود؛ حتی آسمان بالای شهر رنگ‌مایه سبز داشت و اشعه خورشید سبزرنگ بود. \n\nمردم زیادی از مرد و زن و بچه در اطراف راه می‌رفتند که همه لباس‌های سبزی پوشیده بودند و پوست بدنشان ته رنگ سبزی داشت. آن‌ها به دوروتی و دوستان عجیبش با تعجب نگاه می‌کردند. بچه‌ها به‌محض دیدن شیر همه فرار کردند و پشت سر مادرانشان پنهان شدند؛ اما هیچ‌کس با آن‌ها صحبت نکرد. تعداد زیادی مغازه در خیابان بود و دوروتی متوجه شد که همه‌چیز در این مغازه‌ها به رنگ سبز است. آبنبات سبز و پف فیل سبز برای فروش گذاشته شده بود، همین‌طور همه مدل کفش، کلاه و لباس که همه به رنگ سبز بودند. در جایی مردی لیموناد سبز می‌فروخت و وقتی بچه‌ها از او خرید می‌کردند دوروتی دید که پول آن را با سکه‌هایی سبزرنگ پرداختند. \n\nبه‌نظر می‌رسید که اسب یا حیوان دیگری در آنجا نیست؛ مردها چیزها را با گاری‌های کوچک سبزی به این طرف و آن طرف حمل می‌کردند و گاری را در جلوشان هل می‌دادند. به‌نظر می‌رسید همه شاد و راضی و مرفه بودند."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"با وجودی که دوروتی و دوستانش عینک‌هایی سبز به چشم داشتند، باز هم چشمانشان در اولین نگاه از درخشندگی این شهر فوق‌العاده خیره مانده بود. خیابان‌ها با ردیف خانه‌هایی که همه از مرمر سبز ساخته شده بودند و همه جای آن‌ها با زمردهای درخشنده تزیین شده بود می‌درخشید. آن‌ها در پیاده‌رویی از همان مرمر سبز راه می‌رفتند و سنگفرش‌های پیاده‌رو با ردیف‌های زمردی که نزدیک به هم قرار گرفته بودند و در نور خورشید می‌درخشیدند به هم پیوسته بود. قاب پنجره‌ها از شیشه سبز بود؛ حتی آسمان بالای شهر رنگ‌مایه سبز داشت و اشعه‌های خورشید سبزرنگ بود. \n\nمردم زیادی از مرد و زن و بچه در آن اطراف راه می‌رفتند که همه لباس‌های سبزی پوشیده بودند و پوست بدنشان ته‌رنگ سبز داشت. آن‌ها به دوروتی و دوستان عجیبش با تعجب نگاه می‌کردند. بچه‌ها به‌محض دیدن شیر همه فرار کردند و پشت سر مادرانشان پنهان شدند؛ اما هیچ‌کس با آن‌ها صحبت نکرد. تعداد زیادی مغازه در خیابان بود و دوروتی متوجه شد که همه‌چیز در این مغازه‌ها به رنگ سبز است. آبنبات سبز و پف فیل سبز برای فروش گذاشته شده بود، همین‌طور همه مدل کفش، کلاه، و لباس که همه به رنگ سبز بودند. در جایی مردی لیموناد سبز می‌فروخت و وقتی بچه‌ها از او خرید می‌کردند دوروتی دید که پول آن را با سکه‌هایی سبزرنگ می‌پردازند. \n\nبه‌نظر می‌رسید که اسب یا حیوان دیگری در آنجا نیست؛ مردها چیزها را با گاری‌های کوچک سبزی به این طرف و آن طرف حمل می‌کردند و گاری را در جلوشان هل می‌دادند. به‌نظر می‌رسید همه شاد و راضی و مرفه هستند."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"انتخاب قالب‌بندی"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"خودکار"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"دستی"</string>
@@ -217,18 +218,17 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"وضوح تغییر کرده است"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"وضوح به %1$s تغییر کند؟"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"«تأیید» را انتخاب کنید تا ازاین‌پس از %1$s استفاده شود."</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision در %1$s پشتیبانی نمی‌شود و در «تنظیمات پیشرفته نمایشگر» غیرفعال می‌شود."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"این حالت از %1$s پشتیبانی می‌کند. در برخی‌از تلویزیون‌ها ممکن است نیاز باشد HDMI بهبودیافته را روشن کنید تا قالب‌های HDR بیشتری فعال شود. تنظیمات تلویزیون را بررسی کنید تا ببینید این مورد پشتیبانی می‌شود یا نه."</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"‫Dolby Vision در %1$s پشتیبانی نمی‌شود و در «تنظیمات پیشرفته نمایشگر» غیرفعال می‌شود."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"این حالت از این موارد پشتیبانی می‌کند: %1$s\nدر برخی‌از تلویزیون‌ها، باید «HDMI بهبودیافته» را روشن کنید تا قالب‌های HDR بیشتری فعال شود. تنظیمات تلویزیون را بررسی کنید تا ببینید این مورد پشتیبانی می‌شود یا نه."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"لغو"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"تأیید"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"هرتز"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> هرتز)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"اطلاعات در حافظه پنهان پاک شود؟"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"اطلاعات در حافظه پنهان همه برنامه‌ها پاک می‌شود."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"افزودن وسیله جانبی"</string>
-    <string name="accessory_state_pairing" msgid="15908899628218319">"در حال مرتبط‌سازی..."</string>
+    <string name="accessory_state_pairing" msgid="15908899628218319">"درحال جفت کردن..."</string>
     <string name="accessory_state_connecting" msgid="6560241025917621212">"در حال اتصال..."</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"مرتبط‌سازی انجام نشد"</string>
     <string name="accessory_state_canceled" msgid="4794837663402063770">"لغو شد"</string>
@@ -236,13 +236,13 @@
     <string name="accessory_options" msgid="774592782382321681">"وسیله جانبی"</string>
     <string name="accessory_unpair" msgid="2473411128146068804">"لغو مرتبط‌سازی"</string>
     <string name="accessory_battery" msgid="2283700366184703548">"باتری ٪٪<xliff:g id="PERCENTAGE">%1$d</xliff:g>"</string>
-    <string name="accessory_unpairing" msgid="2529195578082286563">"‫در حال لغو مرتبط‌سازی دستگاه..."</string>
+    <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="accessories_add_accessibility_title" msgid="1300294413423909579">"مرتبط‌سازی بلوتوث."</string>
     <string name="accessories_add_title" msgid="7704824893011194433">"در حال جستجوی لوازم جانبی…"</string>
-    <string name="accessories_add_bluetooth_inst" msgid="2508151218328384366">"قبل از مرتبط کردن دستگاه‌های بلوتوث، مطمئن شوید در حالت مرتبط‌سازی باشند."</string>
+    <string name="accessories_add_bluetooth_inst" msgid="2508151218328384366">"قبل از جفت کردن دستگاه‌های بلوتوث، مطمئن شوید در حالت مرتبط‌سازی باشند."</string>
     <string name="accessories_autopair_msg" msgid="2501824457418285019">"دستگاهی یافت شد و به‌طور خودکار بعد از <xliff:g id="COUNTDOWN">%1$s</xliff:g> ثانیه مرتبط می‌شود"</string>
     <string name="error_action_not_supported" msgid="5377532621386080296">"این عملکرد پشتیبانی نمی‌شود"</string>
     <string name="bluetooth_pairing_request" msgid="6120176967230348092">"درخواست مرتبط‌سازی با بلوتوث"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"متصل"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"متصل نیست"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"اجازه ندارید تنظیمات بلوتوث را تغییر دهید."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"استفاده برای صدای تلویزیون"</string>
     <string name="send_feedback" msgid="936698637869795473">"ارسال بازخورد"</string>
     <string name="launch_help" msgid="2607478763131952469">"مرکز راهنمایی"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"این دستگاه را سازمانتان مدیریت می‌کند."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"این دستگاه توسط <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> مدیریت می‌شود."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"،"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"بیشتر بدانید"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{برنامه دوربین}one{برنامه دوربین}other{برنامه‌های دوربین}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"برنامه تقویم"</string>
@@ -702,7 +702,7 @@
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"سرویس میان‌بر"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"وقتی میان‌بر روشن است، اگر دکمه‌های برگشت و پایین را با هم فشار دهید و ۳ ثانیه نگه دارید ویژگی دسترس‌پذیری شروع خواهد شد."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"زیرنویس"</string>
-    <string name="accessibility_captions_description" msgid="3827820027578548160">"تنظیمات وضعیت متن زیرنویس روی ویدئو"</string>
+    <string name="accessibility_captions_description" msgid="3827820027578548160">"تنظیمات وضعیت متن زیرنویس روی ویدیو"</string>
     <string name="captions_display" msgid="2598662495450633375">"نمایش"</string>
     <string name="captions_display_on" msgid="480438033345455728">"روشن"</string>
     <string name="captions_display_off" msgid="87881163874948539">"خاموش"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"فعال کردن"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"پیکربندی"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"از <xliff:g id="SERVICE">%1$s</xliff:g> استفاده شود؟"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> می‌تواند همه متنی را که تایپ می‌کنید، به‌غیراز گذرواژه، جمع‌آوری کند. این متن شامل داده‌های شخصی مانند شماره کارت‌‌های اعتباری نیز می‌شود."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -810,7 +810,7 @@
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"منابع ناشناس"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"اجازه نصب برنامه‌ها از منابعی غیر از فروشگاه Play"</string>
     <string name="security_unknown_sources_confirm_title" msgid="4600896691987804985">"اجازه به منابع ناشناس"</string>
-    <string name="security_unknown_sources_confirm_desc" msgid="7883820068140189584">"دستگاه و داده‌های شخصی‌تان در برابر حمله برنامه‌هایی با منابع ناشناس بیشتر آسیب‌پذیرند. شما می‌پذیرید که مسئولیت انحصاری هرگونه آسیب به دستگاه یا ازبین رفتن داده دراثر استفاده از این برنامه‌ها با خودتان است."</string>
+    <string name="security_unknown_sources_confirm_desc" msgid="7883820068140189584">"دستگاه و داده‌های شخصی‌تان دربرابر حمله برنامه‌هایی با منابع ناشناس بیشتر آسیب‌پذیرند. شما می‌پذیرید که مسئولیت انحصاری هرگونه آسیب به دستگاه یا ازبین رفتن داده دراثر استفاده از این برنامه‌ها با خودتان است."</string>
     <string name="system_hdcp_checking_never" msgid="3251512398865365135">"هیچ‌وقت"</string>
     <string name="system_hdcp_checking_drm" msgid="2159124883496899278">"برای محتوای DRM"</string>
     <string name="system_hdcp_checking_always" msgid="5868177105455148262">"همیشه"</string>
@@ -898,7 +898,7 @@
     <string name="restricted_profile_configure_title" msgid="3327502517511010296">"تنظیمات"</string>
     <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"برنامه‌های مجاز شده"</string>
     <string name="restricted_profile_allowed" msgid="970921490464867884">"مجاز شد"</string>
-    <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"مجاز نیست"</string>
+    <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"مجاز نبودن"</string>
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"سفارشی کردن محدودیت‌ها"</string>
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"یک لحظه..."</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"تغییر پین"</string>
@@ -939,7 +939,7 @@
     <string name="device_apps_app_management_clear_cache" msgid="2678301483598915479">"پاک کردن حافظه پنهان"</string>
     <string name="device_apps_app_management_notifications" msgid="1687529279264810317">"اعلان‌ها"</string>
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"منبع شخص ثالث"</string>
-    <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"مجوزها"</string>
+    <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"اجازه‌ها"</string>
     <string name="device_apps_app_management_not_available" msgid="4198634078194500518">"برنامه دردسترس نیست"</string>
     <string name="unused_apps" msgid="5539166745483454543">"برنامه‌های استفاده‌نشده"</string>
     <string name="settings_ok" msgid="5950888975075541964">"تأیید"</string>
@@ -996,13 +996,13 @@
     <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>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"هنگام ارسال عکس، ویدیو و محتوایی دیگر از تلفنتان، از این نام استفاده کنید"</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"هنگام ارسال عکس، ویدیو و سایر محتواها از تلفنتان، از این نام استفاده کنید"</string>
     <string name="change_setting" msgid="7211706374208138343">"تغییر داده شود"</string>
     <string name="keep_settings" msgid="703474489210093961">"تغییر داده نشود"</string>
-    <string name="apps_permissions" msgid="7876407267050498394">"مجوزها"</string>
+    <string name="apps_permissions" msgid="7876407267050498394">"اجازه‌ها"</string>
     <string name="device_apps_permissions" msgid="8421323706003063878">"اجازه‌های برنامه"</string>
     <string name="app_permissions_group_summary" msgid="6818210080117761117">"<xliff:g id="COUNT_0">%1$d</xliff:g> از <xliff:g id="COUNT_1">%2$d</xliff:g> برنامه‌های مجاز"</string>
-    <string name="bluetooth_permission_request" msgid="7788089036741496993">"درخواست مجوز بلوتوث"</string>
+    <string name="bluetooth_permission_request" msgid="7788089036741496993">"درخواست اجازه بلوتوث"</string>
     <string name="security_patch" msgid="8924741264829495392">"سطح وصله امنیتی «سیستم‌عامل Android TV»"</string>
     <string name="choose_application" msgid="2375936782103669988">"انتخاب برنامه"</string>
     <string name="experimental_preference" msgid="3982593252210557436">"(آزمایشی)"</string>
@@ -1013,7 +1013,7 @@
     <string name="available_virtual_keyboard_category" msgid="7445262027711560629">"صفحه‌کلیدهای مجازی در دسترس"</string>
     <string name="manage_keyboards" msgid="7983890675377321912">"مدیریت صفحه‌کلیدها"</string>
     <string name="app_permission_summary_allowed" msgid="5359622119044147500">"مجاز"</string>
-    <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"غیرمجاز"</string>
+    <string name="app_permission_summary_not_allowed" msgid="5131611341738385303">"مجاز نبودن"</string>
     <string name="usage_access" msgid="8402350645248312782">"دسترسی به داده‌های مصرف"</string>
     <string name="usage_access_description" msgid="3276026988575551587">"دسترسی به داده‌های مصرف اجازه ردیابی برنامه‌هایی را که استفاده می کنید، چندوقت یک‌بار از آن‌ها استفاده می کنید، همچنین شرکت مخابراتی، تنظیمات زبان، و سایر جزئیات را به برنامه می‌دهد."</string>
     <string name="high_power_apps" msgid="5841073958519976562">"بهینه‌سازی انرژی"</string>
@@ -1047,7 +1047,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"به برنامه‌ها اجازه می‌دهد زنگ ساعت تنظیم کنند و کنش‌های حساس به زمان زمان‌بندی کنند. این تنظیم به برنامه‌ها اجازه می‌دهد در پس‌زمینه اجرا شوند که می‌تواند مصرف باتری را افزایش دهد.\n\nاگر این اجازه خاموش باشد، زنگ‌های ساعت موجود و رویدادهای زمان‌محوری که این برنامه زمان‌بندی کرده است، کار نخواهند کرد."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"روشن کردن صفحه‌نمایش"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"مجاز کردن روشن کردن صفحه‌نمایش"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"به برنامه اجازه می‌دهد صفحه‌نمایش را روشن کند. اگر اجازه داده شود، برنامه ممکن است در هر زمانی بدون هدف صریح شما صفحه‌نمایش را روشن کند."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"به برنامه اجازه می‌دهد صفحه‌نمایش را روشن کند. اگر اجازه داده شود، برنامه ممکن است بی‌آنکه شما مستقیماً خواسته باشید صفحه‌نمایش را روشن کند."</string>
     <string name="special_access" msgid="21806055758289916">"دسترسی ویژه به برنامه"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>، <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"صدا"</string>
@@ -1080,9 +1080,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"نمی‌توان این برنامه را باز کرد"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"اگر سؤالی دارید، با سرپرست فناوری اطلاعات تماس بگیرید"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"جزئیات بیشتر"</string>
-    <string name="admin_profile_owner_message" msgid="5729169873349157622">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این نمایه کاری (ازجمله تنظیمات، مجوزها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
-    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این کاربر (ازجمله تنظیمات، مجوزها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
-    <string name="admin_device_owner_message" msgid="1935507216776040907">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این دستگاه (ازجمله تنظیمات، مجوزها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
+    <string name="admin_profile_owner_message" msgid="5729169873349157622">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این نمایه کاری (ازجمله تنظیمات، اجازه‌ها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
+    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این کاربر (ازجمله تنظیمات، اجازه‌ها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
+    <string name="admin_device_owner_message" msgid="1935507216776040907">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این دستگاه (ازجمله تنظیمات، اجازه‌ها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"حذف نمایه کار"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"برنامه سرپرست دستگاه"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"غیرفعال کردن این برنامه سرپرست دستگاه"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"اتصال برقرار شد"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"نمایش همه"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"درحال جستجو"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"هدف افزودن حساب از برنامه اصالت‌سنجی بازیابی نشد."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"حساب اضافه نشد یا نوع حساب دردسترس نیست."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"کانال‌ها و ورودی‌ها"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"کانال‌ها،‌ ورودی‌های خارجی"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"کانال‌ها"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"این حالت را فعال می‌کند:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"توجه داشته باشید که ممکن است این حالت مصرف برق دستگاه را افزایش دهد."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"فعال کردن «<xliff:g id="ENERGYMODENAME">%s</xliff:g>»"</string>
+    <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_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 b441948ee..e10aec977 100644
--- a/Settings/res/values-fi/energy-modes.xml
+++ b/Settings/res/values-fi/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Tärkeät verkko-ominaisuudet"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Käyttää vähän energiaa"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Katkaise verkkoyhteys, kun TV ei ole käytössä."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Tärkeät päivitykset ja toiminnot"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Suositellut verkko-ominaisuudet"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Energiankäyttö optimoitu"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Laittaa päälle ominaisuudet, jotka aktivoivat TV:n verkon kautta (verkkovalmiustila)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Verkon lisäominaisuudet"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Käyttää enemmän energiaa"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Suositeltujen ominaisuuksien lisäksi tämä valinta laittaa päälle lisäominaisuuksia, jotka saattavat kuluttaa enemmän energiaa, kun TV ei ole käytössä."</string>
+    <string 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-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 bcbcc64fa..327dff6dc 100644
--- a/Settings/res/values-fi/strings.xml
+++ b/Settings/res/values-fi/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Sovellusasetukset"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Sijainti, käyttö, diagnostiikka, mainokset"</string>
     <string name="add_account" msgid="7386223854837017129">"Lisää tili"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Tuntematon tili"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Poista tili"</string>
     <string name="account_sync" msgid="4315295293211313989">"Valitse synkronoitavat sovellukset"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synkronoi nyt"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Esimerkkiteksti"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Ihmemaa Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Luku 11: Ozin ihastuttava smaragdikaupunki"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Vihreistä silmälaseista huolimatta kaupungin loiste sokaisi aluksi Dorothyn ja ystävät. Teiden varsilla oli kauniita, vihreästä marmorista rakennettuja ja smaragdein koristeltuja taloja. Jalkakäytävä heidän jalkojensa alla oli samaa vihreää marmoria. Laattojen välissä oli tiiviissä riveissä smaragdeja, jotka kimmelsivät auringonpaisteessa. Ikkunaruudut olivat vihreää lasia, kaupungin yllä kaartuva taivas vihersi ja jopa auringon säteet olivat vihreitä.\n\nKaduilla käveli vihreään pukeutuneita ihmisiä, joiden iho oli vihreänsävyinen. He katsoivat Dorothya ja hänen seuralaisiaan hämmästellen. Leijonan nähdessään lapset piiloutuivat äitinsä taakse, mutta kukaan ei sanonut muukalaisille mitään. Kadun varrella oli monia kauppoja, joiden ikkunoissa Dorothy näki pelkästään vihreitä tuotteita. Myytävänä oli vihreitä makeisia, popcornia, kenkiä, hattuja ja kaikenlaisia vaatteita. Yhdessä liikkeessä myytiin vihreää limonadia. Dorothy huomasi, että lapset ostivat limonadia vihreillä penneillä.\n\nKaupungissa ei näkynyt hevosia tai muita eläimiä: tavaroita kuljetettiin pienillä vihreillä työnnettävillä kärryillä. Kaikki ihmiset vaikuttivat onnellisilta ja vaurailta."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Vihreistä silmälaseista huolimatta kaupungin loiste sokaisi aluksi Dorothyn ja ystävät. Teiden varsilla oli kauniita, vihreästä marmorista rakennettuja ja smaragdein koristeltuja taloja. Jalkakäytävä heidän jalkojensa alla oli samaa vihreää marmoria. Laattojen välissä oli tiiviissä riveissä smaragdeja, jotka kimmelsivät auringonpaisteessa. Ikkunaruudut olivat vihreää lasia, kaupungin yllä kaartuva taivas vihersi ja jopa auringon säteet olivat vihreitä.\n\nKaduilla käveli vihreään pukeutuneita ihmisiä, joiden iho oli vihreänsävyinen. He katsoivat Dorothya ja hänen seuralaisiaan hämmästellen. Leijonan nähdessään lapset piiloutuivat äitinsä taakse, mutta kukaan ei sanonut muukalaisille mitään. Kadun varrella oli monia kauppoja, joiden ikkunoissa Dorothy näki pelkästään vihreitä tuotteita. Myytävänä oli vihreitä makeisia, popcornia, kenkiä, hattuja ja kaikenlaisia vaatteita. Yhdessä liikkeessä myytiin vihreää limonadia. Dorothy huomasi, että lapset ostivat limonadia vihreillä penneillä.\n\nKaupungissa ei näkynyt hevosia tai muita eläimiä: tavaroita kuljetettiin pienillä vihreillä työnnettävillä kärryillä. Kaikki ihmiset vaikuttivat onnellisilta ja vaurailta."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Muodon valinta"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automaattinen"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuaalinen"</string>
@@ -218,12 +219,11 @@
     <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="7378290600353021584">"%1$s on tuettu tässä tilassa. Parannettu HDMI pitää laittaa päälle joillain televisioilla, jotta saat käyttöön enemmän HDR-muotoja. Tarkista, tuetaanko tätä TV:n asetuksista."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"%1$s on tuettu tässä tilassa.\nParannettu HDMI pitää laittaa päälle joillain televisioilla, jotta saat käyttöön enemmän HDR-muotoja. Tarkista, tuetaanko tätä TV:n asetuksista."</string>
     <string name="resolution_selection_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>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Tyhjennetäänkö välimuistitiedot?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Sovellusten välimuistit tyhjennetään."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Yhdistetty"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Yhteys katkaistu"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Sinulla ei ole lupaa muuttaa Bluetooth-asetuksia."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Käytä TV:n audiota varten"</string>
     <string name="send_feedback" msgid="936698637869795473">"Lähetä palautetta"</string>
     <string name="launch_help" msgid="2607478763131952469">"Ohjekeskus"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Organisaatiosi hallinnoi tätä laitetta."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Tätä laitetta hallitsee <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Lue lisää"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamerasovellus}other{Kamerasovellukset}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenterisovellus"</string>
@@ -502,7 +502,7 @@
     <string name="wifi_gateway_description" msgid="8902481147103929271">"Anna kelvollinen IP-osoite tai jätä tämä kohta tyhjäksi.\nEsimerkki: <xliff:g id="ID_1">192.168.1.1</xliff:g>"</string>
     <string name="wifi_network_prefix_length_description" msgid="2670994968279018896">"Anna kelvollinen verkon etuliitteen pituus.\nEsimerkki: <xliff:g id="ID_1">24</xliff:g>"</string>
     <string name="proxy_error_invalid_host" msgid="5629893736174170157">"Isäntänimi on virheellinen"</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="1762079966901078116">"Poissulkemisluettelo on virheellinen. Anna pilkuilla erotettu poissuljettujen verkkotunnusten luettelo."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="1762079966901078116">"Poissulkemislista on virheellinen. Anna pilkuilla erotettu poissuljettujen verkkotunnusten lista."</string>
     <string name="proxy_error_empty_port" msgid="692020249267351015">"Portin kenttä ei voi olla tyhjä"</string>
     <string name="proxy_error_empty_host_set_port" msgid="5347712018244852847">"Jos isäntäkenttä on tyhjä, jätä portin kenttä tyhjäksi"</string>
     <string name="proxy_error_invalid_port" msgid="5307010810664745294">"Portti on virheellinen"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ota käyttöön"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Määritykset"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Käytetäänkö: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> voi kerätä kaiken kirjoittamasi tekstin paitsi salasanat. Palvelu voi kerätä myös henkilökohtaisia ​​tietoja, kuten luottokorttien numeroita."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> voi lukea näyttöä, näyttää sisältöä muiden sovellusten päällä, seurata toimintaasi sovelluksilla tai laitteistoantureilla ja käyttää sovelluksia puolestasi."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Pysäytetäänkö <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Valitse OK, niin <xliff:g id="SERVICE">%1$s</xliff:g> pysäytetään."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Tekstistä puheeksi"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Yhteyden muodostus onnistui"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Näytä kaikki"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Haetaan"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Tilin lisäämistavoitetta ei voitu noutaa todentajalta."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Tiliä ei voitu lisätä tai tilityyppi ei ole käytettävissä."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanavat ja tulot"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanavat, ulkoiset tulot"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanavat"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Ottaa käyttöön nämä:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Huomaa, että tämä tila voi lisätä laitteen virrankulutusta."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ota <xliff:g id="ENERGYMODENAME">%s</xliff:g> käyttöön"</string>
+    <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_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 4ee970aca..99aa7050c 100644
--- a/Settings/res/values-fr-rCA/energy-modes.xml
+++ b/Settings/res/values-fr-rCA/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Fonctionnalités réseau essentielles"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Faible consommation d\'énergie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Désactiver la connexion réseau lorsque le téléviseur n\'est pas en cours d\'utilisation."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Mises à jour et fonctionnalités essentielles"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Fonctionnalités réseau recommandées"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consommation d\'énergie optimisée"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Active les fonctionnalités qui activent le téléviseur par le biais du réseau (veille en réseau)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Fonctionnalités réseau supplémentaires"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consommation d\'énergie accrue"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Outre les fonctionnalités recommandées, cette option active des fonctionnalités supplémentaires lorsque le téléviseur n\'est pas en cours d\'utilisation. Ces dernières sont susceptibles d\'augmenter la consommation d\'énergie."</string>
+    <string 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-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 e7288409f..1502d8583 100644
--- a/Settings/res/values-fr-rCA/strings.xml
+++ b/Settings/res/values-fr-rCA/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Paramètres des applications"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Localisation, utilisation et diagnostics, et annonces"</string>
     <string name="add_account" msgid="7386223854837017129">"Ajouter un compte"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Compte inconnu"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Supprimer le compte"</string>
     <string name="account_sync" msgid="4315295293211313989">"Sélectionner applis synchro"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synchroniser maintenant"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Voulez-vous forcer la sortie HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Par défaut, la conversion sera forcée au format <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Votre écran affichera une résolution de 1080p à 60 Hz. Cette option n\'est pas compatible avec votre écran lorsqu\'il affiche une résolution de 4K à 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision n\'est pas pris en charge à la résolution actuelle. Si vous activez Dolby Vision manuellement, votre écran passera à une résolution de 1080p à 60 Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Passer à une résolution de 1080p à 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Toujours forcer la conversion en Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si Dolby Vision est désactivé dans les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion en Dolby Vision le réactivera."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Toujours forcer la conversion en HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exemple de texte"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Le Magicien d\'Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chapitre 11 : La merveilleuse cité d\'émeraude d\'Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Malgré leurs lunettes vertes, Dorothée et ses amis ont d\'abord été éblouis par l\'éclat de la cité merveilleuse. Les rues étaient bordées de maisons splendides, toutes faites de marbre vert et incrustées d\'étincelantes émeraudes. Ils marchaient sur une chaussée ornée du même marbre, et la jointure des dalles était sertie de rangs serrés d\'émeraudes qui resplendissaient sous le soleil. Les panneaux de verre des fenêtres étaient verts, le ciel au-dessus de la cité avait une teinte verte, et le soleil lui-même lançait des rayons verts. \n\nBeaucoup de gens déambulaient dans les rues, hommes, femmes et enfants. Tous étaient vêtus de vert et avaient un teint verdâtre. Étonnés, ils dévisageaient Dorothée et son étrange escorte. Les enfants couraient se cacher derrière leurs mères à la vue du lion, mais personne ne leur adressait la parole. Il y avait de nombreuses boutiques et Dorothée a remarqué que tout y était vert à l\'intérieur. Tout ce qu\'on y vendait était vert : les bonbons et le maïs éclaté, les chaussures, les chapeaux et les vêtements. Dans un magasin, un homme vendait de la limonade verte, et Dorothée a vu que les enfants payaient avec des sous verts. \n\nIl semblait n\'y avoir ni chevaux ni animaux d\'aucune espèce; les hommes transportaient diverses choses dans de petites charrettes vertes, qu\'ils poussaient devant eux. Tout le monde avait un air heureux et satisfait, et tous les habitants semblaient prospères."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Malgré leurs lunettes vertes, Dorothée et ses amis ont d\'abord été éblouis par l\'éclat de la cité merveilleuse. Les rues étaient bordées de maisons splendides, toutes faites de marbre vert et incrustées d\'étincelantes émeraudes. Ils marchaient sur une chaussée ornée du même marbre, et la jointure des dalles était sertie de rangs serrés d\'émeraudes qui resplendissaient sous le soleil. Les panneaux de verre des fenêtres étaient verts, le ciel au-dessus de la cité avait une teinte verte, et le soleil lui-même lançait des rayons verts. \n\nBeaucoup de gens déambulaient dans les rues, hommes, femmes et enfants. Tous étaient vêtus de vert et avaient un teint verdâtre. Étonnés, ils dévisageaient Dorothée et son étrange escorte. Les enfants couraient se cacher derrière leurs mères à la vue du lion, mais personne ne leur adressait la parole. Il y avait de nombreuses boutiques et Dorothée a remarqué que tout y était vert à l\'intérieur. Tout ce qu\'on y vendait était vert : les bonbons et le maïs éclaté, les chaussures, les chapeaux et les vêtements. Dans un magasin, un homme vendait de la limonade verte, et Dorothée a vu que les enfants payaient avec des sous verts. \n\nIl semblait n\'y avoir ni chevaux ni animaux d\'aucune espèce; les hommes transportaient diverses choses dans de petites charrettes vertes, qu\'ils poussaient devant eux. Tout le monde semblait heureux, satisfait et prospère."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Sélection du format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatique"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuel"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Modifier la résolution à %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Sélectionnez OK pour utiliser %1$s à partir de maintenant."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision n\'est pas pris en charge par %1$s et sera désactivé dans « Paramètres d\'affichage avancés »"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ce mode prend en charge %1$s. Sur certains téléviseurs, vous devrez peut-être activer le mode HDMI amélioré pour activer davantage de formats HDR. Vérifiez les paramètres de votre téléviseur pour savoir si ce mode est pris en charge."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ce mode soutient : %1$s\nSur certains téléviseurs, vous devrez peut-être activer le mode HDMI amélioré pour activer davantage de formats HDR. Vérifiez les paramètres de votre téléviseur pour savoir si ce mode est pris en charge."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuler"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Effacer les données mises en cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Les données en cache des applis seront effacées."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connecté"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Déconnecté"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Utiliser pour l\'audio du téléviseur"</string>
     <string name="send_feedback" msgid="936698637869795473">"Envoyer des commentaires"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centre d’aide"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Cet appareil est géré par votre organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" \\2060"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"En savoir plus"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Application d\'appareil photo}one{Application d\'appareil photo}other{Applications d\'appareil photo}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Application d\'agenda"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Activer"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> peut recueillir la totalité du texte que vous entrez, à l\'exception des mots de passe. Cela comprend les données personnelles, telles que les numéros de carte de crédit."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> pourra lire votre écran, afficher du contenu par-dessus d\'autres applications, suivre vos interactions avec des applications ou des capteurs matériels, et interagir avec des applications en votre nom."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Si vous sélectionnez OK, cela interrompt <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Synthèse vocale"</string>
@@ -1093,7 +1091,7 @@
     <string name="select_device_admin_msg" msgid="8475934459999710332">"Applications d\'administration d\'appareils"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"Activer l\'appli d\'admin de l\'appareil?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"Activer l\'application d\'administration de l\'appareil"</string>
-    <string name="device_admin_warning" msgid="7399916080685200660">"L\'activation de cette application d\'administration permettra à <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
+    <string name="device_admin_warning" msgid="7399916080685200660">"Lorsque l\'application d\'administration est activée, <xliff:g id="APP_NAME">%1$s</xliff:g> pourra effectuer les opérations suivantes :"</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"Cet appareil sera géré et surveillé par <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
     <string name="device_admin_status" msgid="5467001937240455367">"Cette application d\'administration est active et permet à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"En continuant, votre utilisateur sera géré par votre administrateur, qui pourra aussi stocker des données associées en plus de vos données personnelles.\n\nVotre administrateur peut surveiller et gérer les paramètres, l\'accès, les applications et les données associées à cet utilisateur, y compris l\'activité réseau et les données de localisation de votre appareil."</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connexion réussie"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Tout afficher"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Recherche en cours…"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Impossible de récupérer l\'intention d\'ajouter un compte à partir de l\'authentifiant."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Impossible d\'ajouter un compte, ou le type de compte n\'est pas accessible."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Chaînes et entrées"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Chaînes, entrées externes"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Chaînes"</string>
@@ -1123,8 +1123,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éliorer l\'efficacité énergétique lorsque le téléviseur n\'est pas en cours d\'utilisation"</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_mode_enables" msgid="357960364751477627">"Active :"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Notez que ce mode peut augmenter la consommation d\'énergie de l\'appareil."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activer « <xliff:g id="ENERGYMODENAME">%s</xliff:g> »"</string>
+    <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_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 bca5b5558..feffcade3 100644
--- a/Settings/res/values-fr/energy-modes.xml
+++ b/Settings/res/values-fr/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Fonctionnalités réseau essentielles"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Faible consommation d\'énergie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Désactivez la connexion réseau lorsque le téléviseur n\'est pas utilisé."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Mises à jour et fonctions essentielles"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Fonctionnalités réseau recommandées"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consommation d\'énergie optimisée"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Active les fonctionnalités qui réveillent le téléviseur via le réseau (mode veille avec maintien de la connexion réseau)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insérer la fonctionnalité 1]"</item>
     <item msgid="8724721267222341891">"[Insérer la fonctionnalité 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Fonctionnalités réseau supplémentaires"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consommation d\'énergie accrue"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"En plus des fonctionnalités recommandées, cette option active des fonctionnalités supplémentaires lorsque le téléviseur n\'est pas utilisé, qui peuvent augmenter la consommation d\'énergie."</string>
+    <string 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-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 1185d19f5..1879a80bf 100644
--- a/Settings/res/values-fr/strings.xml
+++ b/Settings/res/values-fr/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Paramètres des applications"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Localisation, utilisation et diagnostics, annonces"</string>
     <string name="add_account" msgid="7386223854837017129">"Ajouter un compte"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Compte inconnu"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Supprimer le compte"</string>
     <string name="account_sync" msgid="4315295293211313989">"Sélectionner les applis synchronisées"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synchroniser"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Voulez-vous forcer la sortie HDR ?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Par défaut, la conversion sera forcée en <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Votre écran fonctionnera avec une résolution 1080p de 60 Hz. Cette option n\'est pas compatible avec une résolution 4K de 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision n\'est pas compatible avec la résolution actuelle. Si vous activez Dolby Vision manuellement, la résolution de l\'écran passera à 1080p et 60 Hz."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Faire passer la résolution à 1080p et 60 Hz ?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Toujours forcer la conversion vers Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Si la technologie Dolby Vision est désactivée pour les formats HDR dans les paramètres d\'affichage avancés, forcer la conversion vers cette technologie la réactivera."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Toujours forcer la conversion vers HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exemple de texte"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Le Magicien d\'Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chapitre 11 : La merveilleuse cité d\'émeraude"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Malgré leurs lunettes vertes, Dorothée et ses amis, au début, furent éblouis par l\'éclat de la Cité merveilleuse. Les rues étaient bordées de maisons splendides, toutes de marbre vert et incrustées d\'émeraudes étincelantes. Ils marchaient sur une chaussée du même marbre, et la jointure des dalles était sertie de rangs serrés d\'émeraudes qui resplendissaient au soleil. Les carreaux aux fenêtres étaient verts, le ciel au-dessus de la Cité avait une teinte verte, et le soleil lui-même lançait des rayons verts. \n\nBeaucoup de gens déambulaient dans les rues, hommes, femmes et enfants ; tous étaient vêtus de vert et avaient le teint verdâtre. Étonnés, ils dévisageaient Dorothée et son étrange escorte, les enfants couraient se cacher derrière leurs mères à la vue du Lion ; mais personne ne leur adressait la parole. Il y avait de nombreuses boutiques et Dorothée remarqua que tout y était vert à l\'intérieur. Tout ce qu\'on y vendait était vert : le sucre candi et le pop-corn, les souliers, les chapeaux et les habits. Dans une boutique, un homme vendait de la limonade verte et Dorothée vit que les enfants payaient avec des sous verts. \n\nIl semblait n\'y avoir ni chevaux, ni animaux d\'aucune espèce ; les hommes transportaient diverses choses dans de petites charrettes vertes qu\'ils poussaient devant eux. Tout le monde avait un air heureux et satisfait, et chacun respirait la prospérité."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Malgré leurs lunettes vertes, Dorothée et ses amis furent d\'abord éblouis par l\'éclat de la Cité merveilleuse. Les rues étaient bordées de splendides maisons, toutes de marbre vert et incrustées d\'émeraudes étincelantes. Ils marchaient sur une chaussée du même marbre, et la jointure des dalles était sertie de rangs serrés d\'émeraudes qui brillaient au soleil. Les carreaux aux fenêtres étaient verts, le ciel au-dessus de la Cité avait une teinte verte, et le soleil lui-même lançait des rayons verts. \n\nDes gens déambulaient dans les rues, hommes, femmes et enfants ; ils étaient tous vêtus de vert et avaient le teint verdâtre. Étonnés, ils dévisageaient Dorothée et son escorte, les enfants couraient se cacher derrière leurs mères à la vue du Lion ; mais personne ne leur parlait. Dorothée remarqua que tout était vert à l\'intérieur des nombreuses boutiques. Tout ce qu\'on y vendait était vert : le sucre candi, le pop-corn, les souliers, les chapeaux et les vêtements. Dans une boutique, un homme vendait de la limonade verte et Dorothée vit que les enfants payaient avec de l\'argent vert. \n\nIl semblait n\'y avoir ni chevaux, ni animaux d\'aucune sorte ; les hommes transportaient des choses dans de petites charrettes vertes. Tout le monde avait l\'air heureux et satisfait, et chacun respirait la prospérité."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Sélection du format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatique"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuelle"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Passer en résolution %1$s ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Sélectionnez \"OK\" pour utiliser %1$s à partir de maintenant."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"La technologie Dolby Vision n\'est pas compatible à %1$s et sera désactivée dans \"Paramètres d\'affichage avancés\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ce mode est compatible avec %1$s. Sur certains téléviseurs, vous devrez peut-être activer le HDMI amélioré pour activer d\'autres formats HDR. Examinez les paramètres de votre téléviseur pour vérifier la compatibilité."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ce mode est compatible avec : %1$s\nSur certains téléviseurs, vous devrez peut-être activer le HDMI amélioré pour activer d\'autres formats HDR. Examinez les paramètres de votre téléviseur pour vérifier la compatibilité."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuler"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Effacer les données mises en cache ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Les données en cache des applis seront effacées."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connecté"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Déconnecté"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Utiliser pour l\'audio TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Envoyer des commentaires"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centre d’aide"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Cet appareil est géré par votre organisation."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"En savoir plus"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Appli d\'appareil photo}one{Appli d\'appareil photo}other{Applis d\'appareil photo}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Agenda"</string>
@@ -427,7 +425,7 @@
     <string name="title_signal_strength" msgid="5047116893338315998">"Intensité du signal"</string>
     <string name="title_random_mac_settings" msgid="6685812569356353378">"Confidentialité"</string>
   <string-array name="random_mac_settings_entries">
-    <item msgid="3457228452595715533">"Utiliser MAC aléatoire (par défaut)"</item>
+    <item msgid="3457228452595715533">"Utiliser une adresse MAC aléatoire (par défaut)"</item>
     <item msgid="2490415280467390067">"Utiliser MAC de l\'appareil"</item>
   </string-array>
     <string name="mac_address_not_available" msgid="2992935344891853369">"Indisponible"</string>
@@ -655,7 +653,7 @@
     <string name="system_network_location_confirm" msgid="7128162421781085332">"Votre position sera enregistrée"</string>
     <string name="location_mode_title" msgid="728244518174115443">"Mode"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Demandes localisation récentes"</string>
-    <string name="location_no_recent_apps" msgid="7033474075806435793">"Aucune appli n\'a demandé à accéder à votre position récemment"</string>
+    <string name="location_no_recent_apps" msgid="7033474075806435793">"Aucune appli n\'a récemment demandé la position"</string>
     <string name="location_high_battery_use" msgid="5325556609027887602">"Forte utilisation de la batterie"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Faible utilisation de batterie"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Utiliser le Wi-Fi pour estimer la localisation"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Activer"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> peut recueillir la totalité du texte que vous saisissez, y compris les données personnelles telles que le numéro de votre carte de paiement, à l\'exception des mots de passe."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> pourra lire votre écran, afficher du contenu par-dessus d\'autres applis, suivre vos interactions avec des applis ou des capteurs matériels et interagir avec des applis en votre nom."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Interrompre <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Appuyez sur \"OK\" pour interrompre <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Synthèse vocale"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connexion réussie"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Tout afficher"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Recherche en cours"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Échec de la récupération de l\'intent d\'ajout de compte auprès de l\'authentificateur."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Échec de l\'ajout du compte, ou le type de compte n\'est pas disponible."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Chaînes et entrées"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Chaînes, entrées externes"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Chaînes"</string>
@@ -1124,7 +1124,12 @@
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Code d\'association Ethernet"</string>
     <string name="energy_modes" msgid="1331693860386361744">"Modes d\'énergie"</string>
     <string name="energy_modes_summary" msgid="7196407759836930799">"Améliorer l\'efficacité énergétique lorsque le téléviseur n\'est pas utilisé"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"Activations :"</string>
+    <string name="energy_mode_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_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">"É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_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 2ed330ff2..4a38ac425 100644
--- a/Settings/res/values-gl/energy-modes.xml
+++ b/Settings/res/values-gl/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcións de rede básicas"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Consumo enerxético baixo"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desactiva a conexión de rede cando non se está usando a televisión."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Actualizacións e funcións esenciais"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcións de rede recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo enerxético optimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Activa funcións que reactivan a televisión con conexión de rede (modo de espera con conexión de rede)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcións de rede adicionais"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior consumo enerxético"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ademais das funcións recomendadas, esta opción activa outras que permanecen habilitadas cando a televisión non se está usando, o cal pode aumentar o consumo enerxético."</string>
+    <string 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-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 6a517ded1..8fbf5b630 100644
--- a/Settings/res/values-gl/strings.xml
+++ b/Settings/res/values-gl/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Configuración da aplicación"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Localización, uso e diagnóstico, anuncios"</string>
     <string name="add_account" msgid="7386223854837017129">"Engadir conta"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Conta descoñecida"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Quitar conta"</string>
     <string name="account_sync" msgid="4315295293211313989">"Seleccionar aplicacións sincronizadas"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizar agora"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Queres forzar a saída HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"De forma predeterminada, forzarase a conversión a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"A pantalla terá unha resolución de 1080p e 60 Hz. Esta opción non é compatible coa túa pantalla cando se executa a unha resolución 4K de 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision non é compatible coa resolución actual. Se activas Dolby Vision de forma manual, a resolución da pantalla cambiarase a 1080p 60 Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Queres cambiar a resolución a 1080p 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forzar sempre conversión a Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se o formato Dolby Vision está desactivado en Formatos HDR, en Configuración avanzada da pantalla, volverase activar ao forzar a conversión a Dolby Vision."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forzar sempre conversión a HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Texto de mostra"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"O marabilloso mago de Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítulo 11: A marabillosa Cidade Esmeralda de Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Ao principio, aínda cos ollos protexidos polas lentes verdes, Dorothy e os seus amigos quedaron cegados polo brillo daquela marabillosa cidade. As rúas estaban formadas por preciosas casas construídas con mármore verde e todo estaba salpicado de relucentes esmeraldas. Pasearon por un camiño de mármore verde cuxas placas se unían con fileiras de esmeraldas, colocadas moi xuntas e que relucían baixo a luz do sol. As ventás tiñan cristal verde e ata o ceo e os raios do sol tiraban a verde. \n\nHabía moitos homes, mulleres e nenos paseando e todos tiñan a pel verdosa e vestían roupa verde. Miraban con asombro a Dorothy e os seus estraños acompañantes, e os nenos corrían a esconderse detrás das súas nais cando vían o león, pero ninguén lles dirixía a palabra. Había tamén moitas tendas e Dorothy observou que todo o que había nelas era verde. Vendían caramelos e flocos de millo verdes, así como zapatos, chapeus e todo tipo de roupa da mesma cor. Nunha delas, un home vendía limoada verde e Dorothy puido comprobar que os nenos pagaban con moedas verdes. \n\nNon parecía que naquel lugar houbese cabalos nin animais de ningún tipo, pois os homes transportábano todo tirando de pequenos carros desta cor. Todos parecían felices, satisfeitos e afortunados."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Ao principio, aínda cos ollos protexidos polas lentes verdes, Dorothy e os seus amigos quedaron cegados polo brillo daquela marabillosa cidade. As rúas estaban formadas por preciosas casas construídas con mármore verde e todo estaba salpicado de relucentes esmeraldas. Pasearon por un camiño de mármore verde cuxas placas se unían con fileiras de esmeraldas, colocadas moi xuntas e que relucían baixo a luz do sol. As ventás tiñan cristal verde e ata o ceo e os raios do sol tiraban a verde. \n\nHabía moitos homes, mulleres e nenos paseando e todos tiñan a pel verdosa e vestían roupa verde. Miraban con asombro a Dorothy e os seus estraños acompañantes, e os nenos corrían a esconderse detrás das súas nais cando vían o león, pero ninguén lles dirixía a palabra. Había tamén moitas tendas e Dorothy observou que todo o que había nelas era verde. Vendían caramelos e flocos de millo verdes, así como zapatos, chapeus e todo tipo de roupa da mesma cor. Nunha delas, un home vendía limoada verde e Dorothy puido comprobar que os nenos pagaban con moedas verdes. \n\nNon parecía que naquel lugar houbese cabalos nin animais de ningún tipo, pois os homes transportábano todo tirando de pequenos carros desta cor. Todos parecían felices, satisfeitos e afortunados."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Selección de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Queres cambiar a resolución a %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Se queres utilizar %1$s a partir de agora, selecciona Aceptar."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision non é compatible con %1$s e desactivarase en Configuración avanzada da pantalla"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo é compatible con %1$s. Nalgunhas televisións, é posible que necesites activar o HDMI mellorado para habilitar máis formatos HDR. Comproba a configuración da televisión para ver se é compatible."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo é compatible con: %1$s\nNalgunhas televisións, é posible que necesites activar o HDMI mellorado para habilitar máis formatos HDR. Comproba a configuración da televisión para ver se é compatible."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Aceptar"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Queres borrar os datos da caché?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Isto borrará datos da caché para as aplicacións"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Conectado"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconectado"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Non tes permiso para cambiar a configuración de Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usar para o audio da televisión"</string>
     <string name="send_feedback" msgid="936698637869795473">"Enviar comentarios"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centro de Axuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo está xestionado pola túa organización."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo está xestionado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Máis información"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicación de cámara}other{Aplicacións de cámara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicación do calendario"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Activar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuración"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> pode recompilar todo o texto que escribes (excepto os contrasinais), incluídos datos persoais, como números de tarxetas de crédito."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> poderá ler contido da túa pantalla, mostrar contido noutras aplicacións, facer un seguimento das túas interaccións con aplicacións ou sensores de hardware e interactuar con aplicacións no teu nome."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Deter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Se seleccionas Aceptar, deterase <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Conversión de texto a voz"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Conexión correcta"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostrar todo"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Buscando"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Produciuse un erro ao recuperar o intent de engadir a conta desde Authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Produciuse un erro ao engadir a conta ou o tipo de conta non está dispoñible."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canles e entradas"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canles e entradas externas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canles"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Activa as seguintes funcións:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ten en conta que este modo pode aumentar o consumo de enerxía do dispositivo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activar o modo <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Localizar 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_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 86a2a2a1e..66a8ac25c 100644
--- a/Settings/res/values-gu/energy-modes.xml
+++ b/Settings/res/values-gu/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"આવશ્યક નેટવર્ક સુવિધાઓ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ઓછો ઊર્જા વપરાશ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે નેટવર્ક કનેક્શન બંધ કરો."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"મહત્ત્વપૂર્ણ અપડેટ અને કાર્યો"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"સુઝાવ આપેલી નેટવર્ક સુવિધાઓ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ઑપ્ટિમાઇઝ કરેલો ઊર્જા વપરાશ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"નેટવર્ક પર ટીવીને સક્રિય કરતી સુવિધાઓ ચાલુ કરે છે (નેટવર્ક સ્ટેન્ડબાય પર છે)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[સુવિધા 1 દાખલ કરો]"</item>
     <item msgid="8724721267222341891">"[સુવિધા 2 દાખલ કરો]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"વધારાની નેટવર્ક સુવિધાઓ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ઊર્જાના વપરાશમાં વધારો થયો"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"સુઝાવ આપેલી સુવિધાઓ ઉપરાંત, જ્યારે ટીવી ઉપયોગમાં ન હોય ત્યારે આ વિકલ્પ વધારાની સુવિધાઓ ચાલુ કરે છે જે ઊર્જાના વપરાશમાં વધારો કરી શકે છે."</string>
+    <string 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-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 36be1360b..f53070e14 100644
--- a/Settings/res/values-gu/strings.xml
+++ b/Settings/res/values-gu/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ઍપના સેટિંગ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"સ્થાન, વપરાશ અને નિદાન, જાહેરાતો"</string>
     <string name="add_account" msgid="7386223854837017129">"એકાઉન્ટ ઉમેરો"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"અજાણ્યું એકાઉન્ટ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"એકાઉન્ટ દૂર કરો"</string>
     <string name="account_sync" msgid="4315295293211313989">"સમન્વયિત ઍપ્લિકેનોને પસંદ કરો"</string>
     <string name="sync_now" msgid="4335217984374620551">"હમણાં સમન્વયિત કરો"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"શું તમે HDR આઉટપુટને ફરજિયાત લાગુ કરવા માગો છો?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ડિફૉલ્ટ તરીકે રૂપાંતરણને <xliff:g id="HDR_TYPE">%s</xliff:g>માં ફરજિયાત લાગુ કરવામાં આવશે."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"તમારા ડિસ્પ્લેને 1080p 60Hz રિઝોલ્યુશન પર ચલાવવામાં આવશે. જ્યારે તમારા ડિસ્પ્લેને 4k 60Hz રિઝોલ્યુશન પર ચલાવવામાં આવી રહ્યું હોય ત્યારે આ વિકલ્પ તેની સાથે સુસંગત હોતો નથી."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"હાલના રિઝોલ્યુશનમાં Dolby Vision સપોર્ટેડ નથી. જો તમે મેન્યુઅલી Dolby Vision ચાલુ કરશો, તો તમારા ડિસ્પ્લેનું રિઝોલ્યુશન 1080p 60Hzમાં બદલાઈ જશે"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"રિઝોલ્યુશનને 1080p 60Hzમાં બદલીએ?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"જો ડિસ્પ્લેના વિગતવાર સેટિંગમાં Dolby Visionને HDR ફૉર્મેટ માટે બંધ કરવામાં આવ્યું હોય, તો Dolby Visionમાં ફરજિયાત રીતે રૂપાંતરણ કરવા પર તે ફરીથી ચાલુ થઈ જશે."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 માટે, હંમેશાં ફરજિયાત રીતે રૂપાંતરણ કરો"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ટેક્સ્ટના કદનો નમૂનો"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ધ વન્ડરફુલ વિઝાર્ડ ઑફ ઓઝ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ચૅપ્ટર 11: ધ વન્ડરફુલ એમરલ્ડ સિટી ઑફ ઓઝ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"લીલા રંગના ચશ્મા પહેર્યા હોવા છતાં પણ ડોરોથી અને તેના મિત્રો આ અદ્દભુત શહેરના ભપકાદાર દેખાવથી આશ્ચર્યચકિત થઈ ગયા હતા. શેરીઓ લીલા રંગના માર્બલથી બનેલા એક હરોળમાં આવેલા સુંદર મકાનોથી સજ્જ હતી અને સર્વત્ર ચમકતા નીલમ જડેલા હતા. તેઓ એ જ લીલા માર્બલ પર ચાલવા લાગ્યા, જ્યાં પાસે-પાસે રાખેલા બ્લૉક એકબીજા સાથે જોડાઈ રહ્યાં હતા. તે નીલમની પંક્તિઓ હતી અને સૂરજના પ્રકાશમાં ચમકી રહી હતી, બારીઓના કાંચ લીલા રંગના હતા, એટલું જ નહીં શહેરની ઉપર આકાશની રંગછટા પણ લીલા રંગની હતી અને સૂર્યના કિરણો પણ લીલા રંગના હતા. \n\nત્યાં ઘણા પુરુષો, સ્ત્રીઓ અને બાળકો હતા, એ બધા લોકો ચાલી રહ્યાં હતા અને તેમણે લીલા રંગના કપડાં પહેર્યા હતા, એટલું જ નહીં તેમની ત્વચા પણ લીલા રંગની હતી. તેઓ વિસ્મય પામેલી નજરોથી ડોરોથી તેમજ તેના વિચિત્ર મિત્રોને જોઈ રહ્યાં હતા અને જ્યારે બાળકોએ સિંહને જોયો તો તે બધા ત્યાંથી નાસી છુટ્યા અને તેમની માતાની પાછળ જઈને સંતાઈ ગયા, પરંતુ કોઈએ પણ તેમની સાથે વાત કરી નહીં. શેરીમાં કેટલીક દુકાનો હતી અને ડોરોથીએ જોયું તો તેમાં મૂકેલી બધી જ વસ્તુઓ લીલા રંગની હતી. લીલા રંગની કૅન્ડી અને લીલા રંગના પૉપ-કોર્ન વેચાઈ રહ્યાં હતા. સાથે જ લીલા રંગના જૂતાં, લીલા રંગની ટોપીઓ અને ભાતભાતના કપડાં પણ લીલા રંગના હતા. એક જગ્યાએ તો એક માણસ લીલા રંગનું લીંબુનું શરબત વેચી રહ્યો હતો અને જ્યારે બાળકોએ તે ખરીદ્યું ત્યારે ડોરોથીએ જોયું કે તેમણે તેના માટે લીલા રંગના સિક્કા આપ્યા. \n\nત્યાં ન તો ઘોડા હતા કે ન કોઈ પ્રાણી, માણસો તેમની સામે નાના લીલા રંગના ગાડામાં સામાન અહીંથી ત્યાં લઈ જઈ રહ્યાં હતા. બધા જ ખુશ, સંતુષ્ટ અને સમૃદ્ધ લાગી રહ્યાં હતા."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"લીલા રંગના ચશ્માં પહેર્યા હોવા છતાં પણ ડોરોથી અને તેના મિત્રો આ અદ્દભુત શહેરના ભપકાદાર દેખાવથી આશ્ચર્યચકિત થઈ ગયા હતા. શેરીઓ લીલા રંગના માર્બલથી બનેલા એક હરોળમાં આવેલા સુંદર મકાનોથી સજ્જ હતી અને ચારે તરફ ચમકતા નીલમ જડેલા હતા. તેઓ એ જ લીલા માર્બલ પર ચાલવા લાગ્યા, જ્યાં પાસે-પાસે રાખેલા બ્લૉક એકબીજા સાથે જોડાઈ રહ્યાં હતા. તે નીલમની પંક્તિઓ હતી અને સૂરજના પ્રકાશમાં ચમકી રહી હતી, બારીઓના કાચ લીલા રંગના હતા, એટલું જ નહીં શહેરની ઉપર આકાશની રંગછટા પણ લીલા રંગની હતી અને સૂર્યના કિરણો પણ લીલા રંગના હતા. \n\nઘણા પુરુષો, સ્ત્રીઓ અને બાળકો હતા, એ બધા લોકો ચાલી રહ્યાં હતા અને તેમણે લીલા રંગના કપડાં પહેર્યા હતા, એટલું જ નહીં તેમની ત્વચા પણ લીલા રંગની હતી. તેઓ વિસ્મય પામેલી નજરોથી ડોરોથી તેમજ તેના વિચિત્ર મિત્રોને જોઈ રહ્યાં હતા અને જ્યારે બાળકોએ સિંહને જોયો તો તે બધા ત્યાંથી નાસી છુટ્યા અને તેમની માતાની પાછળ જઈને સંતાઈ ગયા, પરંતુ કોઈએ પણ તેમની સાથે વાત કરી નહીં. શેરીમાં ઘણી દુકાનો હતી અને ડોરોથીએ જોયું તો તેમાં મૂકેલી બધી જ વસ્તુઓ લીલા રંગની હતી. લીલા રંગની કૅન્ડી અને લીલા રંગના પૉપ-કોર્ન વેચાઈ રહ્યાં હતા. સાથે જ લીલા રંગના જૂતા, લીલા રંગની ટોપીઓ અને ભાતભાતના કપડાં પણ લીલા રંગના હતા. એક જગ્યાએ તો એક માણસ લીલા રંગનું લીંબુનું શરબત વેચી રહ્યો હતો અને જ્યારે બાળકોએ તે ખરીદ્યું ત્યારે ડોરોથીએ જોયું કે તેમણે તેના માટે લીલા રંગના સિક્કા આપ્યા. \n\nત્યાં ન તો ઘોડા હતા કે ન કોઈ પ્રાણી, માણસો તેમની સામે નાના લીલા રંગના ગાડામાં સામાન અહીંથી ત્યાં લઈ જઈ રહ્યાં હતા. બધા જ ખુશ, સંતુષ્ટ અને સમૃદ્ધ લાગી રહ્યાં હતા."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ફૉર્મેટની પસંદગી"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ઑટોમૅટિક રીતે"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"મેન્યુઅલ"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"શું રિઝોલ્યુશન બદલીને %1$s કરીએ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"હવેથી %1$sનો ઉપયોગ કરવા માટે \'ઓકે\' પસંદ કરો."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s પર સપોર્ટેડ નથી અને \"વિગતવાર ડિસ્પ્લે સેટિંગ\"માં તેને બંધ કરવામાં આવશે"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"આ મોડ %1$sને સપોર્ટ કરે છે. અમુક ટીવી પર, વધુ HDR ફૉર્મેટ ચાલુ કરવા માટે, તમારે કદાચ વિસ્તૃત HDMI ચાલુ કરવાની જરૂર પડી શકે છે. આ સપોર્ટેડ છે કે નહીં, તે જોવા માટે તમારા ટીવીના સેટિંગ ચેક કરો."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"આ મોડ આને સપોર્ટ આપે છે: %1$s\nઅમુક ટીવી પર HDRના વધુ ફૉર્મેટ ચાલુ કરવા માટે, તમરે HDRની વધારેલી સુવિધા ચાલુ કરવી જરૂરી હોઈ શકે છે. આ સપોર્ટેડ છે કે નહીં, તે જોવા માટે તમારા ટીવીના સેટિંગ ચેક કરો."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"રદ કરો"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ઓકે"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"કૅશ કરેલ ડેટા સાફ કરીએ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"આ તમામ ઍપ્લિકેશનોનો કેશ્ડ ડેટા સાફ કરશે."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"કનેક્ટ કરેલું"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ડિસ્કનેક્ટ કર્યું"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"તમારી પાસે બ્લૂટૂથ સેટિંગ બદલવાની પરવાનગી નથી."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ટીવીના ઑડિયો માટે ઉપયોગ કરો"</string>
     <string name="send_feedback" msgid="936698637869795473">"પ્રતિસાદ મોકલો"</string>
     <string name="launch_help" msgid="2607478763131952469">"સહાયતા કેન્દ્ર"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"આ ડિવાઇસ તમારી સંસ્થા દ્વારા સંચાલિત થાય છે."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"વધુ જાણો"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{કૅમેરા ઍપ}one{કૅમેરા ઍપ}other{કૅમેરા ઍપ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"કૅલેન્ડર ઍપ્લિકેશન"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"સક્ષમ કરો"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"ગોઠવણી"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g>, પાસવર્ડ સિવાય તમે જે લખો છો તે તમામ ટેક્સ્ટને એકત્રિત કરી શકે છે. આમાં ક્રેડિટ કાર્ડ નંબર જેવા વ્યક્તિગત ડેટાનો સમાવેશ થાય છે."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"કનેક્શન સફળ થયું"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"બધા બતાવો"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"શોધી રહ્યાં છીએ"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"પ્રમાણકર્તા પાસેથી એકાઉન્ટ ઉમેરો ઇન્ટેન્ટ ફરી મેળવવામાં નિષ્ફળ રહ્યાં."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"એકાઉન્ટ ઉમેરવામાં નિષ્ફળ રહ્યાં અથવા એકાઉન્ટનો પ્રકાર ઉપલબ્ધ નથી."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ચૅનલ અને ઇનપુટ"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ચૅનલ, બાહ્ય ઇનપુટ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ચૅનલ"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"આ ચાલુ કરે છે:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"નોંધ કરો કે આ મોડ ડિવાઇસના પાવર વપરાશમાં વધારો કરી શકે છે."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ચાલુ કરો"</string>
+    <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_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 b9b404a73..fbfe8f615 100644
--- a/Settings/res/values-hi/energy-modes.xml
+++ b/Settings/res/values-hi/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"नेटवर्क से जुड़ी ज़रूरी सुविधाएं"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"बिजली की कम खपत"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"जब टीवी का इस्तेमाल न किया जा रहा हो, तो इंटरनेट बंद कर दें."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"गड़बड़ियों से जुड़ी सूचनाएं और फ़ंक्शन"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"सुझाई गई नेटवर्क की सुविधाएं"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"बिजली की खपत को ऑप्टिमाइज़ किया गया"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"नेटवर्क (स्टैंडबाय मोड) पर टीवी को फिर से चालू करने की सुविधा को चालू करें."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"नेटवर्क से जुड़ी अन्य सुविधाएं"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"बिजली की खपत में बढ़ोतरी"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"इस सुविधा का सुझाव देने के अलावा, जब टीवी का इस्तेमाल नहीं किया जाता है, तो यह विकल्प अतिरिक्त सुविधाओं को चालू कर देता है, जिससे बिजली की खपत ज़्यादा हो सकती है."</string>
+    <string 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-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 fffeab1e5..1f5c8a21c 100644
--- a/Settings/res/values-hi/strings.xml
+++ b/Settings/res/values-hi/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ऐप्लिकेशन सेटिंग"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"जगह, इस्तेमाल और गड़बड़ी की जानकारी, विज्ञापन"</string>
     <string name="add_account" msgid="7386223854837017129">"खाता जोड़ें"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"खाते की जानकारी नहीं है"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"खाता निकालें"</string>
     <string name="account_sync" msgid="4315295293211313989">"सिंक किए गए ऐप्लिकेशन चुनें"</string>
     <string name="sync_now" msgid="4335217984374620551">"अभी सिंक करें"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"एचडीआर आउटपुट को लागू करना है?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"डिफ़ॉल्ट रूप से कॉन्टेंट को <xliff:g id="HDR_TYPE">%s</xliff:g> में ज़बरदस्ती बदला जाएगा."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"आपका डिसप्ले 1080 पिक्सल 60Hz रिज़ॉल्यूशन पर चलेगा. जब आपका डिसप्ले 4K 60Hz रिज़ॉल्यूशन पर चल रहा होगा, तब यह तरीका आपके डिसप्ले पर काम नहीं करेगा."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision का इस्तेमाल मौजूदा रिज़ॉल्यूशन में नहीं किया जा सकता. अगर Dolby Vision को मैन्युअल तरीके से चालू किया जाता है, तो आपके डिसप्ले का रिज़ॉल्यूशन बदलकर 1080 पिक्सल 60 हर्ट्ज़ पर सेट हो जाएगा"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"क्या रिज़ॉल्यूशन को बदलकर 1080 पिक्सल 60 हर्ट्ज़ पर सेट करना है?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"एचडीआर फ़ॉर्मैट को Dolby Vision में हमेशा ज़बरदस्ती बदलें"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"अगर डिसप्ले की बेहतर सेटिंग में मौजूद \'एचडीआर फ़ॉर्मैट\' में जाकर Dolby Vision को बंद किया गया है, तो फ़ॉर्मैट को Dolby Vision में ज़बरदस्ती बदलने पर यह वापस चालू हो जाएगा."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"एचडीआर फ़ॉर्मैट को HDR10 में हमेशा ज़बरदस्ती बदलें"</string>
@@ -185,7 +184,7 @@
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"अगर ऐप्लिकेशन ऐसा करने का अनुरोध करता है, तो आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देगा जो आप देख रहे हैं. ऐसा तब होगा, जब आपका टीवी बिना किसी रुकावट के फ़्रेम रेट में बदलाव कर सकता हो."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"बिना किसी रुकावट के रीफ़्रेश दर में बदलाव करने की सुविधा, कनेक्ट किए गए डिवाइस पर काम नहीं करती. यह सुविधा तब तक काम नहीं करेगी, जब तक इसके साथ काम करने वाले डिवाइस से कनेक्ट नहीं किया जाता."</string>
     <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"हमेशा"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"अगर ऐप्लिकेशन ऐसा करने का अनुरोध करता है, तो आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देगा जिसे फिलहाल देखा जा रहा है. वीडियो देखने के दौरान या वीडियो देखना शुरू करते समय, हो सकता है कि डिवाइस की स्क्रीन पर कुछ सेकंड तक कुछ न दिखे."</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"अगर ऐप्लिकेशन ऐसा करने का अनुरोध करता है, तो आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देगा जिसे फ़िलहाल देखा जा रहा है. वीडियो शुरू या बंद करते समय, हो सकता है कि डिवाइस की स्क्रीन पर कुछ सेकंड तक कुछ न दिखे."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"कभी नहीं"</string>
     <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"भले ही, ऐप्लिकेशन ने ऐसा करने का अनुरोध किया हो, लेकिन आपका डिवाइस उस कॉन्टेंट के मूल फ़्रेम रेट के बराबर आउटपुट देने की कोशिश कभी नहीं करेगा जो आप देख रहे हैं."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"टेक्स्ट स्केलिंग"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"सैंपल टेक्स्ट"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"द वंडरफुल विज़र्ड ऑफ़ ऑज़"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"चैप्टर 11: द वंडरफुल एमरल्ड सिटी ऑफ़ ऑज़"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"हरे रंग का चश्मा पहनने के बावजूद, डॉरथी और उसके दोस्त इस अद्भुत शहर की चकाचौंध देखकर हैरान थे. हरे रंग के संगमरमर से बने खूबसूरत घर, सड़कों के किनारे कतार में खड़े थे और उन पर चमचमाते पन्ने जड़े हुए थे. वे उसी हरे रंग के संगमरमर से बने फ़ुटपाथ पर चलने लगे. जहां ब्लॉक आपस में जुड़ रहे थे वहां पन्ने की कतारें थीं, जो बारीकी से सेट की गई थीं और सूरज की रोशनी में चमचमा रही थीं. खिड़कियों के शीशे हरे रंग के थे; यहां तक कि शहर के ऊपर छाए आसमान में भी हरे रंग की झलक थी और सूरज की किरणें भी हरी थीं. \n\nवहां बहुत से लोग घूम रहे थे, जिनमें महिलाएं, पुरुष, और बच्चे शामिल थे. उन सभी ने हरे रंग के कपड़े पहने हुए थे और उनकी त्वचा भी हरे रंग की थी. उन्होंने डॉरथी और उसके अजीबोगरीब दोस्तों की ओर अचरज भरी नज़रों से देखा. जब बच्चों ने शेर को देखा, तो वे सभी अपनी-अपनी मां के पीछे जाकर छिप गए, लेकिन किसी ने भी उनसे बात नहीं की. सड़क पर कई दुकानें थीं और डॉरथी ने देखा कि उन दुकानों में सब कुछ हरा था. हरी कैंडी और हरे पॉपकॉर्न बिक रहे थे. साथ ही, हरे जूते, हरी टोपियां, और सभी तरह के कपड़े भी हरे रंग के थे. एक जगह पर, एक व्यक्ति हरे रंग वाला नींबू का शरबत बेच रहा था. डॉरथी ने देखा कि शरबत खरीदने के लिए बच्चों ने हरे रंग के सिक्के दिए. \n\nवहां घोड़ा या किसी भी तरह का कोई जानवर नहीं था; लोग हरे रंग की छोटी-छोटी गाड़ियों में सामान इधर-उधर ले जा रहे थे, जिन्हें वे धक्का देकर चला रहे थे. हर कोई खुश, संतुष्ट, और समृद्ध नज़र आ रहा था."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"हरे रंग का चश्मा पहनने के बावजूद, डॉरथी और उसके दोस्त इस अद्भुत शहर की चकाचौंध देखकर हैरान थे. सड़कों के किनारे कतार में, हरे रंग के संगमरमर से बने खूबसूरत घर थे और उनमें चमचमाते संगमरमर से बने पन्ने जड़े हुए थे. वे उसी हरे रंग के संगमरमर से बने फ़ुटपाथ पर चलने लगे. जहां ब्लॉक आपस में जुड़ रहे थे वहां पन्ने की कतारें थीं. वे बारीकी से सेट की गई थीं और सूरज की रोशनी में चमचमा रही थीं. खिड़कियों के शीशे हरे रंग के थे; यहां तक कि शहर के ऊपर छाए आसमान में भी हरे रंग की झलक थी और सूरज की किरणें भी हरी थीं. \n\nवहां बहुत से लोग घूम रहे थे. इनमें महिलाएं, पुरुष, और बच्चे शामिल थे. उन सभी ने हरे रंग के कपड़े पहने थे और उनकी त्वचा भी हरे रंग की थी. उन्होंने डॉरथी और उसके अजीबोगरीब दोस्तों की ओर अचरज भरी नज़रों से देखा. जब बच्चों ने शेर को देखा, तो वे सभी अपनी-अपनी मां के पीछे जाकर छिप गए, लेकिन किसी ने भी उनसे बात नहीं की. सड़क पर कई दुकानें थीं और डॉरथी ने देखा कि उन दुकानों में सब कुछ हरा था. हरी कैंडी और हरे पॉपकॉर्न बिक रहे थे. साथ ही, हरे जूते, हरी टोपियां, और सभी तरह के कपड़े भी हरे रंग के थे. एक जगह पर, एक व्यक्ति हरे रंग वाला नींबू का शरबत बेच रहा था. डॉरथी ने देखा कि शरबत खरीदने के लिए बच्चों ने हरे रंग के सिक्के दिए. \n\nवहां घोड़ा या किसी भी तरह का कोई जानवर नहीं था; लोग हरे रंग की छोटी-छोटी गाड़ियों में सामान इधर-उधर ले जा रहे थे, जिन्हें वे धक्का देकर चला रहे थे. हर कोई खुश, संतुष्ट, और समृद्ध नज़र आ रहा था."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"फ़ॉर्मैट चुनें"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"अपने-आप"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"मैन्युअल तौर पर चुनें"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"क्या रिज़ॉल्यूशन को बदलकर %1$s पर सेट करना है?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"अब से %1$s रिज़ॉल्यूशन का इस्तेमाल करने के लिए, \'ठीक है\' चुनें."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision का इस्तेमाल %1$s में नहीं किया जा सकता. इसे \"Advanced Display Settings\" में बंद कर दिया जाएगा"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"इस मोड में %1$s का इस्तेमाल किया जा सकता है. कुछ टीवी पर, एचडीआर के ज़्यादा फ़ॉर्मैट चालू करने के लिए, बेहतर एचडीएमआई की सेटिंग चालू करने की ज़रूरत होती है. अपने टीवी की सेटिंग में जाकर देखें कि क्या यह विकल्प उपलब्ध है."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"इस मोड में %1$s का इस्तेमाल किया जा सकता है\nकुछ टीवी पर एचडीआर के ज़्यादा फ़ॉर्मैट इस्तेमाल करने के लिए, आपको बेहतर एचडीएमआई की सेटिंग चालू करनी पड़ सकती है. अपने टीवी की सेटिंग में जाकर देखें कि क्या यह विकल्प उपलब्ध है."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"अभी नहीं"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ठीक है"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"हर्ट्ज़"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> हर्ट्ज़)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"संचित डेटा साफ़ करें?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"इससे सभी ऐप्‍स का संचित डेटा साफ़ हो जाएगा."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"कनेक्ट हो गया"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"डिसकनेक्ट हो गया"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"आपको ब्लूटूथ सेटिंग में बदलाव करने की अनुमति नहीं है."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"टीवी पर ऑडियो चलाने के लिए इस्तेमाल करें"</string>
     <string name="send_feedback" msgid="936698637869795473">"सुझाव भेजें"</string>
     <string name="launch_help" msgid="2607478763131952469">"सहायता केंद्र"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"इस डिवाइस का प्रबंधन आपका संगठन करता है."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ज़्यादा जानें"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{कैमरा ऐप्लिकेशन}one{कैमरा ऐप्लिकेशन}other{कैमरा ऐप्लिकेशन}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"कैलेंडर ऐप्लिकेशन"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"चालू करें"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"कॉन्फ़िगरेशन"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"पासवर्ड को छोड़कर, <xliff:g id="SERVICE">%1$s</xliff:g>   लिखा गया सभी लेख एकत्रित कर सकती है. इसमें व्‍यक्तिगत डेटा, जैसे क्रेडिट कार्ड नंबर शामिल हैं."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"कनेक्ट हो गया"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"सभी दिखाएं"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"खोज की जा रही है"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"पुष्टि करने वाले से खाता जोड़ने का इंटेंट वापस नहीं लाया जा सका."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"खाता जोड़ा नहीं जा सका या खाता टाइप उपलब्ध नहीं है."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"चैनल और इनपुट"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"चैनल, बाहरी इनपुट"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"चैनल"</string>
@@ -1118,7 +1118,7 @@
     <string name="picture_settings_title" msgid="7643193630924322697">"तस्वीर"</string>
     <string name="screen_settings_title" msgid="7806908869190824434">"स्क्रीन"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"आवाज़"</string>
-    <string name="power_and_energy" msgid="4638182439670702556">"पावर और ऊर्जा"</string>
+    <string name="power_and_energy" msgid="4638182439670702556">"पावर और एनर्जी"</string>
     <string name="power_on_behavior" msgid="927607372303160716">"टीवी के चालू होने पर दिखने वाली स्क्रीन"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"रीसेट करें"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ईथरनेट से जोड़ने का कोड"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"चालू करता है:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ध्यान दें कि यह मोड डिवाइस की बिजली खपत बढ़ा सकता है."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" को चालू करें"</string>
+    <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_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 6bc135357..dcb19727b 100644
--- a/Settings/res/values-hr/energy-modes.xml
+++ b/Settings/res/values-hr/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Neophodne mrežne značajke"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niska potrošnja energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Isključi mrežnu vezu kad se TV ne upotrebljava."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kritična ažuriranja i funkcije"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Preporučene mrežne značajke"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizirana potrošnja energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Uključuje značajke koje aktiviraju TV putem mreže (umreženo stanje pripravnosti)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne mrežne značajke"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povećana potrošnja energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Uz preporučene, ova opcija uključuje dodatne značajke kad se TV ne upotrebljava, koje mogu povećati potrošnju energije."</string>
+    <string 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-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 acc073f01..86023d92a 100644
--- a/Settings/res/values-hr/strings.xml
+++ b/Settings/res/values-hr/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Postavke aplikacije"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokacija, Upotreba i dijagnostika, Oglasi"</string>
     <string name="add_account" msgid="7386223854837017129">"Dodaj račun"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Nepoznati račun"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Uklanjanje računa"</string>
     <string name="account_sync" msgid="4315295293211313989">"Odaberite sink. aplikacije"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinkroniziraj sada"</string>
@@ -156,7 +157,7 @@
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferirani dinamički raspon"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Pretvaranje koje preferira sustav"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Omogućuje sustavu da upravlja pretvaranjem formata"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kada se ta opcija odabere, sustav će odrediti prikladan dinamički raspon koji će se poslati na vaš zaslon i prema potrebi pretvorit će sadržaj na taj dinamički raspon."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Kada se odabere ta opcija, sustav će odrediti prikladan dinamički raspon koji će se poslati na vaš zaslon i prema potrebi konvertirati sadržaj u taj dinamički raspon."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Uvijek se podudara s formatom sadržaja"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Nametanje pretvaranja"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Nameće pretvaranje u preferirani format"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Primjer teksta"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Čarobnjak iz Oza"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. poglavlje: Čudesni Smaragdni Grad čarobnjaka Oza"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Čak i sa zelenim naočalama koje su im štitile oči Dorothy i njezini prijatelji isprva su bili zaslijepljeni sjajem prekrasnoga Grada. Ulicama su se nizale predivne kuće sve izgrađene od zelenog mramora i cijele optočene svjetlucavim smaragdima. Hodali su pločnikom od istog zelenog mramora, a na mjestima gdje su se kameni blokovi spajali nalazili su se redovi gusto postavljenih smaragda koji su svjetlucali na jarkom suncu. Prozori su bili od zelenog stakla, a čak je i nebo iznad Grada imalo zeleni odsjaj i sunčeve su zrake bile zelene boje. \n\nNa ulicama je bilo mnogo ljudi, muškaraca, žena i djece, i svi su bili odjeveni u zeleno i imali zelenkastu put. S čuđenjem su gledali Dorothy i njezinu neobičnu, šaroliku pratnju i sva su se djeca sakrila iza svojih majki kada su ugledala Lava, no nitko im se nije obratio. Mnoge su trgovine bile otvorene na ulicu i Dorothy je mogla vidjeti kako je u njima sve zeleno. Prodavali su se zeleni slatkiši i zelene kokice, kao i zelene cipele, zeleni šeširi i zelena odjeća svakojake vrste. Na jednom je mjestu jedan čovjek prodavao zelenu limunadu, a kad ju je koje dijete kupilo, Dorothy je mogla vidjeti kako je plaća zelenim novčićima. \n\nČinilo se da nije bilo konja niti koje druge životinje, a ljudi su naokolo vozili stvari u malim zelenim kolicima koja su gurali ispred sebe. Svi su se činili sretnima, zadovoljnima i uspješnima."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Čak i sa zelenim naočalama koje su im štitile oči Dorothy i njezini prijatelji isprva su bili zaslijepljeni sjajem prekrasnoga Grada. Ulicama su se nizale predivne kuće sve izgrađene od zelenog mramora i cijele optočene svjetlucavim smaragdima. Hodali su pločnikom od istog zelenog mramora, a na mjestima gdje su se kameni blokovi spajali nalazili su se redovi gusto postavljenih smaragda koji su svjetlucali na jarkom suncu. Prozori su bili od zelenog stakla, a čak je i nebo iznad Grada imalo zeleni odsjaj i sunčeve su zrake bile zelene boje. \n\nNa ulicama je bilo mnogo ljudi, muškaraca, žena i djece, i svi su bili odjeveni u zeleno i imali zelenkastu put. S čuđenjem su gledali Dorothy i njezinu neobičnu, šaroliku pratnju i sva su se djeca sakrila iza svojih majki kada su ugledala Lava, no nitko im se nije obratio. Mnoge su trgovine bile otvorene na ulicu i Dorothy je mogla vidjeti kako je u njima sve zeleno. Prodavali su se zeleni slatkiši i zelene kokice, kao i zelene cipele, zeleni šeširi i zelena odjeća svakojake vrste. Na jednom je mjestu jedan čovjek prodavao zelenu limunadu, a kad ju je koje dijete kupilo, Dorothy je mogla vidjeti kako je plaća zelenim novčićima. \n\nČinilo se da nije bilo konja niti koje druge životinje, a ljudi su naokolo vozili stvari u malim zelenim kolicima koja su gurali ispred sebe. Svi su se činili sretnima, zadovoljnima i uspješnima."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Odabir formata"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatski"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ručno"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Želite li promijeniti razlučivost u %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Odaberite U redu da biste odsad upotrebljavali %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nije podržan u načinu %1$s i onemogućit će se u naprednim postavkama zaslona"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ovaj način podržava %1$s. Na nekim televizorima možda ćete trebati uključiti poboljšani HDMI da biste omogućili više HDR formata. U postavkama televizora provjerite je li to podržano."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ovaj način podržava: %1$s\nNa nekim televizorima možda ćete trebati uključiti poboljšani HDMI da biste omogućili više HDR formata. U postavkama televizora provjerite je li to podržano."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Odustani"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"U redu"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite li izbrisati podatke iz predmemorije?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Obrisat ćete predmemorirane podatke svih aplikacija."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Povezano"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Nije povezano"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nemate dopuštenje za promjenu postavki Bluetootha."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Upotrijebi za zvuk na TV-u"</string>
     <string name="send_feedback" msgid="936698637869795473">"Pošaljite povratne informacije"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centar za pomoć"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ovim uređajem upravlja vaša organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠U+2060"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Saznajte više"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacija fotoaparata}one{Aplikacije fotoaparata}few{Aplikacije fotoaparata}other{Aplikacije fotoaparata}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija Kalendar"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Omogući"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguracija"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> može prikupiti sav tekst koji upisujete, izuzev zaporki. To uključuje osobne podatke kao što su brojevi kreditnih kartica."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> će moći pročitati vaš zaslon, prikazati sadržaj preko drugih aplikacija, pratiti vaše interakcije s aplikacijskim ili hardverskim senzorima i voditi interakciju s aplikacijama u vaše ime."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ako odaberete \"U redu\", usluga <xliff:g id="SERVICE">%1$s</xliff:g> zaustavit će se."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Pretvaranje teksta u govor"</string>
@@ -798,7 +798,7 @@
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Upotrijebi samo za DRM sadržaj"</string>
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Optimiziranje zaslona za maksimalnu rezoluciju ili maksimalan broj sličica u sekundi. To utječe samo na Ultra HD zaslone. Promjena te postavke izazvat će ponovno pokretanje uređaja."</string>
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Omogući zapisnik funkcije \"snoop\" za Bluetooth HCI"</string>
-    <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Otklanjanje pogrešaka putem USB-a"</string>
+    <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Način rada za otklanjanje pogrešaka kada je priključen USB"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Aplikacija čeka program za otklanjanje pogrešaka"</string>
     <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Za isječak prikaži granice, margine itd."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Bljeskanje prikaza u prozorima pri crtanju GPU-om"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Povezivanje je uspjelo"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Prikaži sve"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Pretraživanje"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nije uspjelo dohvaćanje namjere dodavanja računa iz autentifikatora."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Dodavanje računa nije uspjelo ili vrsta računa nije dostupna."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanali i ulazi"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanali, vanjski ulazi"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanali"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Omogućuje:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Napominjemo da taj način može povećati potrošnju energije na uređaju."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogućite <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 6c5b0955e..11b68d915 100644
--- a/Settings/res/values-hu/energy-modes.xml
+++ b/Settings/res/values-hu/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Alapvető hálózati funkciók"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Alacsony energiafelhasználás"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Hálózati kapcsolat kikapcsolása, amikor a TV nincs használatban."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kritikus frissítések és funkciók"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ajánlott hálózati funkciók"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalizált energiafelhasználás"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Bekapcsolja azokat a funkciókat, amelyek felébresztik a tévét a hálózaton keresztül (hálózati készenléti állapot)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"További hálózati funkciók"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Nagyobb energiafelhasználás"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Az ajánlott funkciók mellett ez a lehetőség további olyan funkciókat is bekapcsol, amelyek növelhetik az energiafelhasználást, amikor nincs használatban a tévé."</string>
+    <string 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-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 f7afbfe79..6db755885 100644
--- a/Settings/res/values-hu/strings.xml
+++ b/Settings/res/values-hu/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Alkalmazásbeállítások"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Hely, Használat és diagnosztika, Hirdetések"</string>
     <string name="add_account" msgid="7386223854837017129">"Fiók hozzáadása"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Ismeretlen fiók"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Fiók eltávolítása"</string>
     <string name="account_sync" msgid="4315295293211313989">"Szinkronizáltak kiválasztása"</string>
     <string name="sync_now" msgid="4335217984374620551">"Szinkronizálás most"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Szeretné kikényszeríteni a HDR-kimenetet?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"A rendszer alapértelmezés szerint a következőre kényszeríti a konverziót: <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"A kijelző felbontása 1080p 60 Hz lesz. A beállítás nem kompatibilis a 4k 60 Hz felbontású kijelzőn."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"A Dolby Vision nem támogatott a jelenlegi felbontás mellett. Ha manuálisan engedélyezi a Dolby Vision funkciót, a képernyő felbontása 1080p 60 Hz-re változik."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Módosítja a felbontást 1080p 60 Hz-re?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Mindig legyen kényszerítve a Dolby Visionre való átalakítás"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ha a Dolby Vision le van tiltva HDR-formátumokban a Speciális kijelzőbeállítások között, a Dolby Visionre való átalakítás kényszerítése újra engedélyezi."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Mindig legyen kényszerítve a HDR10-re való átalakítás"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Mintaszöveg"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Óz, a csodák csodája"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. fejezet: A csodálatos Smaragdváros"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Dorothyt és barátait még a zöld szemüvegen át is lenyűgözte a csodálatos Város tündöklése. Az utcákat zöld márványból épült és ragyogó smaragdokkal kirakott, gyönyörű házak sora szegélyezte. Az utak ugyanebből a zöld márványból készültek, az utcaköveket pedig sűrűn rakott smaragdsorok választották el, amelyek csak úgy sziporkáztak a napfényben. Az ablaktáblák zöld üvegből voltak, az ég zöldes színben tündökölt a Város fölött, és még a napsugarak is zöld színben játszottak. \n\nRengeteg ember járkált mindenfelé, férfiak, nők, gyerekek, mind zöld ruhákban, zöldes árnyalatú volt a bőrük is. Csodálkozó szemekkel néztek Dorothyra és furcsa kísérőire, és amikor a gyerekek meglátták az Oroszlánt, elszaladtak, és anyjuk mögé bújtak. De senki sem szólt hozzájuk. Az utcán sok bolt állt, és Dorothy észrevette, hogy ezekben is minden zöld. Lehetett kapni zöld cukorkát és zöld pattogatott kukoricát, zöld cipőt, zöld kalapot és mindenféle zöld ruhát. Az egyik helyen egy férfi zöld limonádét árult, és Dorothy látta, hogy a gyerekek zöld pennykkel fizetnek érte. \n\nNem voltak sehol lovak vagy más állatok; az emberek mindent kis zöld kocsikon hordtak, amelyet maguk előtt toltak. Mindenki boldognak, elégedettnek és jómódúnak tűnt."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Dorothyt és barátait még a zöld szemüvegen át is lenyűgözte a csodálatos Város tündöklése. Az utcákat zöld márványból épült és ragyogó smaragdokkal kirakott, gyönyörű házak sora szegélyezte. Az utak ugyanebből a zöld márványból készültek, az utcaköveket pedig sűrűn rakott smaragdsorok választották el, amelyek csak úgy sziporkáztak a napfényben. Az ablaktáblák zöld üvegből voltak, az ég zöldes színben tündökölt a Város fölött, és még a napsugarak is zöld színben játszottak. \n\nRengeteg ember járkált mindenfelé, férfiak, nők, gyerekek, mind zöld ruhákban, zöldes árnyalatú volt a bőrük is. Csodálkozó szemekkel néztek Dorothyra és furcsa kísérőire, és amikor a gyerekek meglátták az Oroszlánt, elszaladtak, és anyjuk mögé bújtak. De senki sem szólt hozzájuk. Az utcán sok bolt állt, és Dorothy észrevette, hogy ezekben is minden zöld. Lehetett kapni zöld cukorkát és zöld pattogatott kukoricát, zöld cipőt, zöld kalapot és mindenféle zöld ruhát. Az egyik helyen egy férfi zöld limonádét árult, és Dorothy látta, hogy a gyerekek zöld pennykkel fizetnek érte. \n\nNem voltak sehol lovak vagy más állatok; az emberek mindent kis zöld kocsikon hordtak, amelyet maguk előtt toltak. Mindenki boldognak, elégedettnek és jómódúnak tűnt."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formátumválasztás"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatikus"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Kézi"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Módosítja a felbontást a következőre: %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Válassza az OK gombot, ha mostantól a(z) %1$s felbontást szeretné használni."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"A Dolby Vision nem támogatott itt: %1$s, a rendszer pedig letiltja ezt a módot a „Speciális kijelzőbeállítások” között."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ez a mód támogatja a következőt: %1$s. Egyes tévék esetében előfordulhat, hogy a további HDR-formátumok engedélyezéséhez be kell kapcsolnia a javított HDMI lehetőséget. Ellenőrizze a tévé beállításai között, hogy a funkció támogatott-e."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ez a mód támogatja a következőt: %1$s\nEgyes tévék esetében előfordulhat, hogy a további HDR-formátumok engedélyezéséhez be kell kapcsolnia a javított HDMI (Enhanced HDMI) lehetőséget. Ellenőrizze a tévé beállításai között, hogy a funkció támogatott-e."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Mégse"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Törli a gyorsítótárban tárolt adatokat?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ez törli minden alkalmazás gyorsítótárban tárolt adatait"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Csatlakozva"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Leválasztva"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nincs engedélye a Bluetooth-beállítások módosítására."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Tévés hangkimenethez való használat"</string>
     <string name="send_feedback" msgid="936698637869795473">"Visszajelzés küldése"</string>
     <string name="launch_help" msgid="2607478763131952469">"Súgó"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Az eszközt az Ön szervezete kezeli."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Az eszközt a következő szervezet kezeli: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"További információ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraalkalmazás}other{Kameraalkalmazások}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Naptáralkalmazás"</string>
@@ -656,8 +654,8 @@
     <string name="location_mode_title" msgid="728244518174115443">"Mód"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Legutóbbi helylekérdezések"</string>
     <string name="location_no_recent_apps" msgid="7033474075806435793">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat"</string>
-    <string name="location_high_battery_use" msgid="5325556609027887602">"Magas akkumulátorhasználat"</string>
-    <string name="location_low_battery_use" msgid="728585923412018253">"Alacsony akkumulátorhasználat"</string>
+    <string name="location_high_battery_use" msgid="5325556609027887602">"Magas akkuhasználat"</string>
+    <string name="location_low_battery_use" msgid="728585923412018253">"Alacsony akkuhasználat"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Wi-Fi használata a tartózkodási hely meghatározásához"</string>
     <string name="location_status" msgid="3037321737386011224">"Helyállapot"</string>
     <string name="location_services" msgid="551503779736382878">"Helyszolgáltatások"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Engedélyezés"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Beállítások"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Használja: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> összegyűjti az összes beírt szöveget, kivéve a jelszavakat. Ez magában foglalja a személyes adatokat, például a bankkártyaszámokat."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> képes lesz a képernyő tartalmának olvasására, tartalmak más appok fölött való megjelenítésére, az alkalmazásokkal vagy hardveres érzékelőkkel való interakcióinak nyomon követésére, valamint arra, hogy az Ön nevében lépjen interakcióba más appokkal."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Az OK-val leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Szövegfelolvasás"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Sikeres kapcsolódás"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Összes mutatása"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Keresés"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nem sikerült lekérni a fiókintentet a hitelesítőtől."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Nem sikerült hozzáadni a fiókot, vagy nem áll rendelkezésre az adott fióktípus."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Csatornák és bemenetek"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Csatornák, külső bemenetek"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Csatornák"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Engedélyezi a következőket:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Vegye figyelembe, hogy ez az üzemmód növelheti az eszköz energiafogyasztását."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"A következő engedélyezése: „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
+    <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_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 0fa0930a8..cddc226c1 100644
--- a/Settings/res/values-hy/energy-modes.xml
+++ b/Settings/res/values-hy/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Ցանցի կարևոր գործառույթներ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Էներգիայի քիչ ծախս"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Անջատել կապը, որբ հեռուստացույցը չի օգտագործվում։"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Կարևոր թարմացումներ և գործառույթներ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Առաջարկվող ցանցային գործառույթներ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Էներգիայի օպտիմալ ծախս"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Միացնում է գործառույթները, որոնք արթնացնում են հեռուստացույցը ցանցի միջոցով (սպասման ցանցային ռեժիմ)։"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Ներմուծել գործառույթ 1-ը]"</item>
     <item msgid="8724721267222341891">"[Ներմուծել գործառույթ 2-ը]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ցանցի լրացուցիչ գործառույթներ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Էներգիայի մեծ ծախս"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ի լրումն առաջարկվող գործառույթների՝ երբ հեռուստացույցը չի օգտագործվում, այս ընտրանքը միացնում է լրացուցիչ գործառույթներ, ինչի արդյունքում էներգիայի ծախսը կարող է աճել։"</string>
+    <string 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-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 21f5cdf77..cf56fa39d 100644
--- a/Settings/res/values-hy/strings.xml
+++ b/Settings/res/values-hy/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Հավելվածի կարգավորումներ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Տեղադրություն, օգտագործման և դիագնոստիկ տվյալներ, գովազդ"</string>
     <string name="add_account" msgid="7386223854837017129">"Ավելացնել հաշիվ"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Անհայտ հաշիվ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Հաշվի ջնջում"</string>
     <string name="account_sync" msgid="4315295293211313989">"Ընտրեք հավելվածներ"</string>
     <string name="sync_now" msgid="4335217984374620551">"Համաժամացնել հիմա"</string>
@@ -150,12 +151,12 @@
     <string name="advanced_display_settings_title" msgid="6293280819870140631">"Էկրանի լրացուցիչ կարգավորումներ"</string>
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Ձայնի լրացուցիչ կարգավորումներ"</string>
-    <string name="game_mode_title" msgid="7280816243531315755">"Թույլատրեք խաղային ռեժիմը"</string>
+    <string name="game_mode_title" msgid="7280816243531315755">"Թույլատրել խաղային ռեժիմը"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Համապատասխանեցնել բովանդակության դինամիկ դիապազոնը"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Երբ այս պարամետրը միացված է, համակարգը փոխարկաբար կօգտագործի դինամիկ դիապազոնի տարբեր ձևաչափեր՝ բովանդակությանը համապատասխանելու համար։ Ձևաչափի փոփոխման ժամանակ էկրանը կարող է սևանալ։\n\nԴինամիկ դիապազոնի այլ տարբերակներ տեսնելու համար անցեք էկրանի լրացուցիչ կարգավորումներ։"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Նախընտրելի դինամիկ դիապազոն"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Ձևաչափի ավտոմատ կարգավորում"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Թող համակարգը կառավարի ձևաչափի փոխարկումը"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Համակարգն է ավտոմատ ընտրում ձևաչափը"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Եթե միացնեք այս պարամետրը, համակարգը կորոշի ձեր էկրանին համապատասխան դինամիկ դիապազոնը և, անհրաժեշտության դեպքում, կցուցադրի բովանդակությունը այդ դիապազոնում։"</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Միշտ համապատասխանում է բովանդակության ձևաչափին"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Հարկադիր փոխակերպում"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Տեքստի նմուշ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Օզի կախարդը"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Գլուխ 11. Օզի հրաշալի Զմրուխտե քաղաքը"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Նույնիսկ հագնելով կանաչ ապակիներով ակնոցներ՝ Դորոթին և իր ընկերները շլացան այս զարմանահրաշ քաղաքի փայլից։ Փողոցների երկայնքով շարված էին կանաչ մարմարից գեղեցիկ տներ՝ զարդարված փայլուն զմրուխտներով։ Ճամփորդները քայլում էին այդ նույն կանաչ մարմարով պատված մայթերով, որոնց սալիկների արանքները լցված էին արևի շողերի տակ փայլող զմրուխտներով։ Տների պատուհանները կանաչ ապակուց էին։ Զմրուխտե քաղաքում նույնիսկ երկինքն ուներ կանաչ երանգ, իսկ կանաչ արևը պայծառ կանաչ շողեր էր արձակում։ \n\nՇուրջը տղամարդիկ, կանայք և երեխաներ էին քայլում, որոնք բոլորը կրում էին կանաչ հագուստ և ունեին կանաչավուն մաշկ։ Նրանք զարմանքով էին նայում Դորոթիին և նրա տարօրինակ ուղեկիցներին։ Նկատելով Առյուծին՝ երեխաները թաքնվում էին իրենց ծնողների մեջքի ետևում և ոչ-ոք չէր համարձակվում խոսել անծանոթների հետ։ Խանութներում վաճառվում էին կանաչ գույնի ապրանքներ. կանաչ կոնֆետներ և կանաչ ադիբուդի, տարբեր տեսակի կանաչ կոշիկներ, գլխարկներ և զգեստներ։ Վաճառականներից մեկն առաջարկում էր կանաչ լիմոնադ, իսկ նրան շրջապատող երեխաները լիմոնադի համար վճարում էին կանաչ մետաղադրամներով։ \n\nԶմրուխտե քաղաքի փողոցներում ոչ ձիեր, ոչ էլ այլ կենդանիներ կային։ Տղամարդիկ իրենց իրերը կրում էին փոքր կանաչ ձեռնասայլակներով։ Քաղաքի բոլոր բնակիչները ուրախ և անհոգ տեսք ունեին։"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Նույնիսկ հագնելով կանաչ ապակիներով ակնոց՝ Դորոթին և իր ընկերները շլացան այս զարմանահրաշ քաղաքի փայլից։ Փողոցների երկայնքով շարված էին կանաչ մարմարից գեղեցիկ տներ՝ զարդարված փայլուն զմրուխտներով։ Ճամփորդները քայլում էին այդ նույն կանաչ մարմարով պատված մայթերով, որոնց սալիկների արանքները լցված էին արևի շողերի տակ փայլող զմրուխտներով։ Տների պատուհանները կանաչ ապակուց էին։ Զմրուխտե քաղաքում նույնիսկ երկինքն ուներ կանաչ երանգ, իսկ կանաչ արևը պայծառ կանաչ շողեր էր արձակում։ \n\nՇուրջը տղամարդիկ, կանայք և երեխաներ էին քայլում, որոնք բոլորը կրում էին կանաչ հագուստ և ունեին կանաչավուն մաշկ։ Նրանք զարմանքով էին նայում Դորոթիին և նրա տարօրինակ ուղեկիցներին։ Նկատելով Առյուծին՝ երեխաները թաքնվում էին իրենց ծնողների մեջքի հետևում, և ոչ ոք չէր համարձակվում խոսել անծանոթների հետ։ Խանութներում վաճառվում էին կանաչ գույնի ապրանքներ. կանաչ կոնֆետներ և կանաչ ադիբուդի, տարբեր տեսակի կանաչ կոշիկներ, գլխարկներ և զգեստներ։ Վաճառականներից մեկն առաջարկում էր կանաչ լիմոնադ, իսկ նրան շրջապատող երեխաները լիմոնադի համար վճարում էին կանաչ մետաղադրամներով։ \n\nԶմրուխտե քաղաքի փողոցներում ոչ ձիեր, ոչ էլ այլ կենդանիներ կային։ Տղամարդիկ իրենց իրերը կրում էին փոքր կանաչ ձեռնասայլակներով։ Քաղաքի բոլոր բնակիչները ուրախ և անհոգ տեսք ունեին։"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Ձևաչափի ընտրություն"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Ավտոմատ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ձեռքով"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Դարձնե՞լ լուծաչափը %1$s"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Սեղմեք «Եղավ»՝ %1$s լուծաչափն այս պահից սկսած օգտագործելու համար։"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ը չի աջակցվում %1$s ռեժիմում և կանջատվի էկրանի ընդլայնված կարգավորումներում։"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Այս ռեժիմն աջակցում է %1$s ձևաչափերը։ Որոշ հեռուստացույցներում, հնարավոր է, անհրաժեշտ լինի միացնել ընդլայնված HDMI ձևաչափը, որպեսզի ավելի շատ HDR ձևաչափեր համատեղելի լինեն։ Ստուգեք հեռուստացույցի կարգավորումներում՝ արդյոք այս գործառույթն աջակցվում է։"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Այս ռեժիմն աջակցում է հետևյալ ձևաչափերը՝ %1$s\nՀնարավոր է՝ որոշ հեռուստացույցներում անհրաժեշտ լինի միացնել ընդլայնված HDMI ձևաչափը, որպեսզի ավելի շատ HDR ձևաչափեր համատեղելի լինեն։ Ստուգեք հեռուստացույցի կարգավորումներում՝ արդյոք այս գործառույթն աջակցվում է։"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Չեղարկել"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Եղավ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Հց"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Հց)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ջնջե՞լ քեշավորված տվյալները:"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Սա կմաքրի բոլոր ծրագրերի քեշավորված տվյալները:"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Միացված է"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Անջատված է"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Դուք թույլտվություն չունեք փոխելու Bluetooth կարգավորումները:"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Օգտագործել հեռուստացույցի աուդիոյի համար"</string>
     <string name="send_feedback" msgid="936698637869795473">"Կարծիք հայտնել"</string>
     <string name="launch_help" msgid="2607478763131952469">"Օգնության կենտրոն"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Այս սարքի կառավարիչը ձեր կազմակերպությունն է։"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Այս սարքի կառավարիչն է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպությունը։"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Մանրամասն"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Տեսախցիկի հավելված}one{Տեսախցիկի հավելված}other{Տեսախցիկի հավելվածներ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Օրացույցի հավելված"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ակտիվացնել"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Կարգավորում"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը կարող է պահել ցանկացած մուտքագրված տեքստ, բացի գաղտնաբառերից: Պահվում են նաև անձնական տվյալները, ինչպես օրինակ բանկային քարտի համարները և այլն:"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -785,8 +785,8 @@
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Ցույց տալ սարքաշարի մակարդակը"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Ցույց տալ GPU ավելցուկը"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"Ցույց տալ մակերեսի թարմացումները"</string>
-    <string name="system_window_animation_scale" msgid="685477540250939659">"Պատուհանի շարժապատկերի սանդղակ"</string>
-    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Անցումային շարժական սանդղակ"</string>
+    <string name="system_window_animation_scale" msgid="685477540250939659">"Պատուհանի շարժապատկեր"</string>
+    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Անցումների շարժապատկեր"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Շարժանկարի տևողության սանդղակ"</string>
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Խիստ ռեժիմն ակտիվացված է"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"GPU պրոֆիլի ցուցադրում"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Կապը հաստատվեց"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Ցույց տալ բոլորը"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Որոնում"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Չհաջողվեց առբերել հաշվի ինթենթը Authenticator-ից։"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Չհաջողվեց ավելացնել հաշիվը, կամ հաշվի տեսակը հասանելի չէ։"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Ալիքներ և մուտքեր"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Ալիքներ, արտաքին մուտքեր"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Ալիքներ"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Միացնում է՝"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Նկատի ունեցեք, որ այս ռեժիմը կարող է մեծացնել սարքի կողմից էներգիայի ծախսը։"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Միացնել «<xliff:g id="ENERGYMODENAME">%s</xliff:g>» ռեժիմը"</string>
+    <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_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 fc8b201fe..8803f5a00 100644
--- a/Settings/res/values-in/energy-modes.xml
+++ b/Settings/res/values-in/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Fitur jaringan penting"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Penggunaan energi rendah"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Menonaktifkan koneksi jaringan saat TV sedang tidak digunakan."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Update dan fungsi penting"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Fitur jaringan yang direkomendasikan"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Penggunaan energi yang dioptimalkan"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Mengaktifkan fitur yang mengaktifkan TV melalui jaringan (mode standby berjaringan)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Fitur jaringan tambahan"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Peningkatan penggunaan energi"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Selain fitur yang direkomendasikan, opsi ini mengaktifkan fitur tambahan yang dapat meningkatkan penggunaan energi saat TV sedang tidak digunakan."</string>
+    <string 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-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 7437bccc1..a845ec891 100644
--- a/Settings/res/values-in/strings.xml
+++ b/Settings/res/values-in/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Setelan Aplikasi"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokasi, Penggunaan &amp; Diagnostik, Iklan"</string>
     <string name="add_account" msgid="7386223854837017129">"Tambahkan akun"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Akun Tidak Dikenal"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Hapus akun"</string>
     <string name="account_sync" msgid="4315295293211313989">"Pilih aplikasi tersinkron"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinkronkan sekarang"</string>
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"Reset ke setelan pabrik"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Kalibrasi"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"Timer untuk Mematikan TV"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Atur timer untuk mematikan TV dan menghemat energi"</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Setel timer untuk mematikan TV dan menghemat energi"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Perangkat"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Pilih format"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Teks contoh"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Penyihir Oz yang Menakjubkan"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Bab 11: Oz, Kota Zamrud yang Menakjubkan"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Meski terlindung oleh kacamata berwarna hijau, Dorothy dan teman-temannya disilaukan oleh gemerlap Kota yang menakjubkan. Rumah-rumah cantik dari marmer hijau berderet di sepanjang jalan bertaburkan zamrud. Mereka berjalan di trotoar yang juga terbuat dari marmer hijau, di blok yang menyatu rapat dengan deretan zamrud yang berkilauan di tengah terik matahari. Jendela-jendela rumah terbuat dari kaca hijau; langit di atas Kota tampak kehijauan, dan cahaya mataharinya pun hijau. \n\nDi sana ada banyak orang, laki-laki, perempuan, dan anak-anak, semuanya sibuk lalu-lalang; semua berpakaian hijau dan kulit mereka pun berwarna kehijauan. Mereka memandang Dorothy dan rombongannya yang aneh dengan penuh keheranan. Anak-anak berlari dan bersembunyi di belakang ibu mereka saat melihat si Singa; tetapi tidak ada yang berani mengajaknya bicara. Dorothy melihat ada banyak toko di sepanjang jalan, dan semua isinya juga berwarna hijau. Toko-toko itu menjual permen hijau, brondong jagung hijau, sepatu hijau, topi hijau, dan segala macam pakaian hijau. Ketika melewati sebuah tempat, Dorothy melihat seorang pria menjual limun hijau, yang dibeli anak-anak dengan uang koin berwarna hijau. \n\nSepertinya tidak ada kuda atau hewan apa pun di sini; para lelaki membawa barang dalam gerobak dorong kecil berwarna hijau. Semua orang terlihat bahagia, puas, dan sejahtera."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Meski terlindung oleh kacamata berwarna hijau, Dorothy dan teman-temannya disilaukan oleh gemerlap Kota yang menakjubkan. Rumah-rumah cantik dari marmer hijau berderet di sepanjang jalan bertaburkan zamrud. Mereka berjalan di trotoar yang juga terbuat dari marmer hijau, di blok yang menyatu rapat dengan deretan zamrud yang berkilauan di tengah terik matahari. Jendela-jendela rumah terbuat dari kaca hijau; langit di atas Kota tampak kehijauan, dan cahaya mataharinya pun hijau. \n\nDi sana ada banyak orang, laki-laki, perempuan, dan anak-anak, semuanya sibuk lalu-lalang; semua berpakaian hijau dan kulit mereka pun berwarna kehijauan. Mereka memandang Dorothy dan rombongannya yang aneh dengan penuh keheranan. Anak-anak berlari dan bersembunyi di belakang ibu mereka saat melihat si Singa; tetapi tidak ada yang berani mengajaknya bicara. Dorothy melihat ada banyak toko di sepanjang jalan, dan semua isinya juga berwarna hijau. Toko-toko itu menjual permen hijau, brondong jagung hijau, sepatu hijau, topi hijau, dan segala macam pakaian hijau. Ketika melewati sebuah tempat, Dorothy melihat seorang pria menjual limun hijau, yang dibeli anak-anak dengan uang koin berwarna hijau. \n\nSepertinya tidak ada kuda atau hewan apa pun di sini; para lelaki membawa barang dalam gerobak dorong kecil berwarna hijau. Semua orang terlihat bahagia, puas, dan sejahtera."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Pilihan format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Otomatis"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,17 +219,16 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ubah resolusi ke %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pilih Oke untuk menggunakan %1$s mulai sekarang."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision tidak didukung di %1$s dan akan dinonaktifkan di \"Setelan Tampilan Lanjutan\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Mode ini mendukung %1$s. Di beberapa TV, Anda mungkin perlu mengaktifkan HDMI yang Ditingkatkan untuk memungkinkan lebih banyak format HDR. Periksa setelan TV Anda untuk melihat apakah fitur ini didukung."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Mode ini mendukung: %1$s\nDi beberapa TV, Anda mungkin perlu mengaktifkan HDMI yang Ditingkatkan untuk memungkinkan lebih banyak format HDR. Periksa setelan TV Anda untuk melihat apakah fitur ini didukung."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Batal"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Oke"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Hapus data dalam cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ini akan menghapus data cache untuk semua apl."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"Tambahkan aksesori"</string>
-    <string name="accessory_state_pairing" msgid="15908899628218319">"Menyandingkan..."</string>
+    <string name="accessory_state_pairing" msgid="15908899628218319">"Menyambungkan..."</string>
     <string name="accessory_state_connecting" msgid="6560241025917621212">"Menghubungkan…"</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"Tidak dapat menyandingkan"</string>
     <string name="accessory_state_canceled" msgid="4794837663402063770">"Dibatalkan"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Terhubung"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Terputus"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Anda tidak memiliki izin untuk mengubah setelan Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Gunakan untuk audio TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Kirim masukan"</string>
     <string name="launch_help" msgid="2607478763131952469">"Pusat Bantuan"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Perangkat ini dikelola oleh organisasi."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Perangkat ini dikelola oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Pelajari lebih lanjut"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikasi kamera}other{Aplikasi kamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"aplikasi Kalender"</string>
@@ -542,7 +542,7 @@
     <string name="storage_migrate_away" msgid="7880100961434638430">"Pindahkan data ke penyimpanan lainnya"</string>
     <string name="storage_no_apps" msgid="95566375753627272">"Tidak ada aplikasi untuk dicadangkan"</string>
     <string name="storage_forget" msgid="4671975563260507003">"Lupakan penyimpanan perangkat ini"</string>
-    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"Untuk menggunakan aplikasi atau data dalam drive ini, colokkan kembali drive tersebut. Selain itu, Anda dapat memilih untuk melupakan penyimpanan ini jika drive tidak tersedia.\n\nJika Anda memilih Lupakan, semua data di dalam drive akan hilang selamanya.\n\nAnda dapat memasang aplikasi lagi nanti, namun data yang tersimpan dalam drive ini akan hilang."</string>
+    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"Untuk menggunakan aplikasi atau data dalam drive ini, colokkan kembali drive tersebut. Selain itu, Anda dapat memilih untuk melupakan penyimpanan ini jika drive tidak tersedia.\n\nJika Anda memilih Lupakan, semua data di dalam drive akan hilang selamanya.\n\nAnda dapat menginstal aplikasi lagi nanti, namun data yang tersimpan dalam drive ini akan hilang."</string>
     <string name="storage_device_storage_section" msgid="22958375769694027">"Penyimpanan perangkat"</string>
     <string name="storage_removable_storage_section" msgid="280332107650735088">"Penyimpanan yang dapat dicopot"</string>
     <string name="storage_reset_section" msgid="3896575204828589494">"Reset"</string>
@@ -702,7 +702,7 @@
     <string name="accessibility_shortcut_service" msgid="2053250146891420311">"Layanan pintasan"</string>
     <string name="accessibility_shortcut_description" msgid="2050424178481510046">"Jika pintasan aktif, Anda dapat menekan tombol kembali dan panah bawah selama 3 detik untuk memulai fitur aksesibilitas."</string>
     <string name="accessibility_captions" msgid="3411554568812306549">"Teks"</string>
-    <string name="accessibility_captions_description" msgid="3827820027578548160">"Setelan hamparan teks di video"</string>
+    <string name="accessibility_captions_description" msgid="3827820027578548160">"Setelan overlay teks di video"</string>
     <string name="captions_display" msgid="2598662495450633375">"Tampilan"</string>
     <string name="captions_display_on" msgid="480438033345455728">"Mati"</string>
     <string name="captions_display_off" msgid="87881163874948539">"Menyala"</string>
@@ -739,11 +739,11 @@
     <string name="color_yellow" msgid="3519470952904560404">"Kuning"</string>
     <string name="color_magenta" msgid="2377854703399624607">"Merah keunguan"</string>
     <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"Deskripsi audio"</string>
-    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Dengarkan deskripsi tentang hal yang sedang terjadi di layar pada film dan acara TV yang didukung"</string>
+    <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Dengarkan deskripsi tentang hal yang sedang terjadi di layar pada film dan acara TV yang mendukung deskripsi audio"</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktifkan"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurasi"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> dapat mengumpulkan semua teks yang Anda ketik, kecuali sandi. Pengumpulan ini mencakup data pribadi seperti nomor kartu kredit."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> akan dapat membaca layar, menampilkan konten di atas aplikasi lain, melacak interaksi Anda dengan aplikasi atau sensor hardware, serta berinteraksi dengan aplikasi atas nama Anda."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Menyentuh Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -755,7 +755,7 @@
     <string name="system_install_voice_data" msgid="8016395777968958673">"Instal data suara"</string>
     <string name="system_general" msgid="687760148454147771">"Umum"</string>
     <string name="system_debugging" msgid="1576324426385458481">"Proses debug"</string>
-    <string name="system_input" msgid="4457152980514604873">"Masukan"</string>
+    <string name="system_input" msgid="4457152980514604873">"Input"</string>
     <string name="system_drawing" msgid="5802739024643871942">"Gambar"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Pemantauan"</string>
     <string name="system_apps" msgid="8481888654606868074">"Aplikasi"</string>
@@ -775,7 +775,7 @@
     <string name="system_select_debug_app" msgid="6200987902307533721">"Memilih aplikasi debug"</string>
     <string name="system_wait_for_debugger" msgid="5715878008542589060">"Tunggu debugger"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Memverifikasi aplikasi melalui USB"</string>
-    <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Memeriksa perilaku berbahaya pada aplikasi yang terinstal melalui ADB/ADT"</string>
+    <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Periksa keberadaan perilaku berbahaya di aplikasi yang diinstal melalui ADB/ADT"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Pencatatan log panjang Wi-Fi"</string>
     <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Mengaktifkan pencatatan log panjang Wi-Fi"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Menampilkan sentuhan"</string>
@@ -784,7 +784,7 @@
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"Menampilkan pembaruan tampilan GPU"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Menampilkan lapisan hardware"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Menampilkan kelebihan GPU"</string>
-    <string name="system_show_surface_updates" msgid="7680759813613585278">"Menampilkan pembaruan permukaan"</string>
+    <string name="system_show_surface_updates" msgid="7680759813613585278">"Tampilkan pembaruan permukaan"</string>
     <string name="system_window_animation_scale" msgid="685477540250939659">"Skala animasi jendela"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"Skala animasi transisi"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Skala durasi animator"</string>
@@ -792,7 +792,7 @@
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Rendering GPU profil"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"Mengaktifkan jejak"</string>
     <string name="system_dont_keep_activities" msgid="4641165963339846161">"Jangan simpan kegiatan"</string>
-    <string name="system_background_process_limit" msgid="1985373407150771045">"Batas proses latar belakang"</string>
+    <string name="system_background_process_limit" msgid="1985373407150771045">"Batas proses di belakang"</string>
     <string name="system_show_all_anrs" msgid="5353216640638263217">"Menampilkan semua ANR"</string>
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"Menonaktifkan mode tidur"</string>
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Digunakan untuk konten DRM saja"</string>
@@ -800,12 +800,12 @@
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Aktifkan pencatatan log pengintaian HCI Bluetooth"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Mode debug ketika USB terhubung"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Aplikasi yang di-debug menunggu debugger menempel sebelum berjalan"</string>
-    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Menampilkan batas klip, margin, dll."</string>
+    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Tampilkan batas klip, margin, dll."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Mengedipkan tampilan dalam jendela saat digambar dengan GPU"</string>
-    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Lapisan hardware berkedip hijau saat memperbarui"</string>
+    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Buat lapisan hardware berkedip hijau saat update"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"Terbaik-terburuk: biru, hijau, merah terang, merah"</string>
-    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Mengedipkan seluruh permukaan jendela saat memperbarui"</string>
-    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Layar berkedip saat apl berjalan lama di utas utama"</string>
+    <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Buat seluruh permukaan jendela berkedip saat diperbarui"</string>
+    <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Buat layar berkedip saat aplikasi berjalan lama di thread utama"</string>
     <string name="system_desc_profile_gpu_rendering" msgid="1594070211030991">"Mengukur waktu rendering di adb shell dumpsys gfxinfo"</string>
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"Sumber tidak dikenal"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"Izinkan penginstalan aplikasi dari sumber selain Google Play Store"</string>
@@ -924,7 +924,7 @@
     <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"Jika Anda menghentikan aplikasi secara paksa, mungkin fungsinya akan terganggu."</string>
     <string name="device_apps_app_management_uninstall" msgid="4171103696233332967">"Uninstal"</string>
     <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"Uninstal pembaruan"</string>
-    <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"Semua pembaruan untuk aplikasi sistem Android ini akan dicopot pemasangannya."</string>
+    <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"Semua update untuk aplikasi sistem Android ini akan di-uninstal."</string>
     <string name="device_apps_app_management_disable" msgid="819003297535493633">"Nonaktifkan"</string>
     <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"Ingin menonaktifkan aplikasi ini?"</string>
     <string name="device_apps_app_management_enable" msgid="9173340340253029114">"Aktifkan"</string>
@@ -1045,7 +1045,7 @@
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"Tidak ada aplikasi terinstal yang mendukung Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"Mengizinkan aplikasi membuat jendela picture-in-picture saat aplikasi terbuka atau setelah Anda membiarkannya terbuka (misalnya, untuk melanjutkan aktivitas menonton video). Jendela ini ditampilkan di atas aplikasi lain yang sedang digunakan."</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Izinkan aplikasi menyetel alarm dan menjadwalkan tindakan berjangka waktu. Hal ini memungkinkan aplikasi berjalan di latar belakang, yang dapat menggunakan lebih banyak daya.\n\nJika izin ini nonaktif, alarm dan acara berbasis waktu yang dijadwalkan oleh aplikasi tidak akan berfungsi."</string>
-    <string name="turn_screen_on_title" msgid="5293798529284629011">"Mengaktifkan layar"</string>
+    <string name="turn_screen_on_title" msgid="5293798529284629011">"Pengaktifan layar"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Izinkan pengaktifan layar"</string>
     <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Mengizinkan aplikasi mengaktifkan layar. Jika diizinkan, aplikasi dapat mengaktifkan layar kapan saja tanpa izin eksplisit dari Anda."</string>
     <string name="special_access" msgid="21806055758289916">"Akses aplikasi khusus"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Koneksi berhasil"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Tampilkan semua"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Menelusuri"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Gagal mengambil intent tambahkan akun dari pengautentikasi."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Gagal menambahkan akun atau jenis akun ini tidak tersedia."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Saluran &amp; Input"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Saluran, input eksternal"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Saluran"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Mengaktifkan:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Perhatikan bahwa mode ini dapat meningkatkan konsumsi energi perangkat."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktifkan \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 a9c2be1a1..6ae46e0b7 100644
--- a/Settings/res/values-is/energy-modes.xml
+++ b/Settings/res/values-is/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Nauðsynlegir neteiginleikar"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lítil orkunotkun"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Slökkva á nettengingu þegar sjónvarpið er ekki í notkun."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Áríðandi uppfærslur og eiginleikar"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Neteiginleikar sem mælt er með"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Fínstillt orkunotkun"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Kveikir á eiginleikum sem vekja sjónvarpið yfir netið (nettengd biðstaða)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Viðbótarneteiginleikar"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Aukin orkunotkun"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Auk eiginleika sem mælt er með kveikir þessi eiginleiki á viðbótareiginleikum þegar sjónvarpið er ekki í notkun sem gætu aukið orkunotkunina."</string>
+    <string 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-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 179a9cb0c..cde7d7602 100644
--- a/Settings/res/values-is/strings.xml
+++ b/Settings/res/values-is/strings.xml
@@ -65,6 +65,7 @@
     <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>
     <string name="add_account" msgid="7386223854837017129">"Bæta reikningi við"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Óþekktur reikningur"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Fjarlægja reikning"</string>
     <string name="account_sync" msgid="4315295293211313989">"Velja samstillt forrit"</string>
     <string name="sync_now" msgid="4335217984374620551">"Samstilla núna"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Textadæmi"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Galdrakarlinn í Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. kafli: Smaragðsborgin dásamlega í Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Jafnvel þótt grænu gleraugun hlífðu augum Dóróteu og vina hennar fengu þau fyrst ofbirtu í augun af ljóma borgarinnar undursamlegu. Meðfram götunum lágu falleg hús, öll úr grænum marmara og skreytt glitrandi smarögðum. Þau gengu eftir gangstétt úr sama græna marmaranum og þar sem steinhellurnar komu saman lágu smaragðar í röðum, þéttskipaðir og ljómandi í sólarljósinu. Rúðurnar voru úr grænu gleri, jafnvel himinninn yfir borginni var með grænum litblæ og sólargeislarnir voru grænir. \n\nMargt fólk var á gangi, karlar, konur og börn, og allt var það grænklætt og húðin grænleit. Fólkið horfði á Dóróteu og sundurleita félaga hennar með spurn í augum og börnin flúðu og földu sig á bak við mæður sínar þegar þau sáu ljónið en enginn yrti á þau. Við götuna stóðu margar verslanir og Dórótea sá að allt var grænt þar inni. Grænn brjóstsykur og grænt poppkorn var þar til sölu ásamt grænum skóm, grænum höttum og alls kyns grænum fötum. Á einum stað seldi maður grænt límonaði og þegar börnin keyptu það sá Dórótea að þau greiddu fyrir það með grænum peningum. \n\nEngir hestar eða önnur dýr voru sjáanleg heldur keyrðu karlarnir hluti um í litlum grænum kerrum sem þeir ýttu á undan sér. Allir virtust hamingjusamir, ánægðir og velmegandi."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Jafnvel þótt grænu gleraugun hlífðu augum Dóróteu og vina hennar fengu þau fyrst ofbirtu í augun af ljóma borgarinnar undursamlegu. Meðfram götunum lágu falleg hús, öll úr grænum marmara og skreytt glitrandi smarögðum. Þau gengu eftir gangstétt úr sama græna marmaranum og þar sem steinhellurnar komu saman lágu smaragðar í röðum, þéttskipaðir og ljómandi í sólarljósinu. Rúðurnar voru úr grænu gleri, jafnvel himinninn yfir borginni var með grænum litblæ og sólargeislarnir voru grænir. \n\nMargt fólk var á gangi, karlar, konur og börn, og allt var það grænklætt og húðin grænleit. Fólkið horfði á Dóróteu og sundurleita félaga hennar með spurn í augum og börnin flúðu og földu sig á bak við mæður sínar þegar þau sáu ljónið en enginn yrti á þau. Við götuna stóðu margar verslanir og Dórótea sá að allt var grænt þar inni. Grænn brjóstsykur og grænt poppkorn var þar til sölu ásamt grænum skóm, grænum höttum og alls kyns grænum fötum. Á einum stað seldi maður grænt límonaði og þegar börnin keyptu það sá Dórótea að þau greiddu fyrir það með grænum peningum. \n\nEngir hestar eða önnur dýr voru sjáanleg heldur keyrðu karlarnir hluti um í litlum grænum kerrum sem þeir ýttu á undan sér. Allir virtust hamingjusamir, ánægðir og velmegandi."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Val á sniði"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Sjálfvirkt"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Handvirkt"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Breyta upplausn í %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Veldu „Í lagi“ til að nota %1$s framvegis."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision er ekki stutt í %1$s og slökkt verður á því í „Ítarlegum skjástillingum“."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Þessi stilling styður %1$s. Í sumum sjónvörpum þarf hugsanlega að kveikja á HDMI-aukningu til að virkja fleiri HDR-snið. Skoðaðu stillingar sjónvarpsins til að sjá hvort þetta sé stutt."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Þessi stilling styður: %1$s\nÍ sumum sjónvörpum þarf hugsanlega að kveikja á HDMI-aukningu til að virkja fleiri HDR-snið. Skoðaðu stillingar sjónvarpsins til að sjá hvort þetta sé stutt."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Hætta við"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Í lagi"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Hreinsa gögn í skyndiminni?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Þetta eyðir gögnum allra forrita úr skyndiminni."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Tengt"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Aftengt"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Þú hefur ekki heimild til að breyta Bluetooth-stillingum."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Nota fyrir hljóðrás úr sjónvarpi"</string>
     <string name="send_feedback" msgid="936698637869795473">"Senda ábendingu"</string>
     <string name="launch_help" msgid="2607478763131952469">"Hjálparmiðstöð"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Þessu tæki er stýrt af fyrirtækinu þínu."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Þessu tæki er stýrt af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Frekari upplýsingar"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Myndavélarforrit}one{Myndavélarforrit}other{Myndavélarforrit}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Dagatalsforrit"</string>
@@ -665,8 +665,8 @@
     <string name="third_party_location_services_title" msgid="2826218400381676508">"Staðsetningarþjónusta þriðju aðila"</string>
     <string name="location_reporting" msgid="3552501333650895634">"Staðsetningartilkynningar"</string>
     <string name="location_history" msgid="4055660203090513120">"Staðsetningarferill"</string>
-    <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="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="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Skjálesarar"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Virkja"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Grunnstilling"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Nota <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> getur safnað öllum texta sem þú slærð inn nema aðgangsorðum. Þetta nær líka til persónulegra upplýsinga á borð við greiðslukortanúmer."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> mun geta lesið skjáinn hjá þér, birt efni yfir öðrum forritum, fylgst með notkun þinni á forritum eða vélbúnaðarskynjurum og átt í samskiptum við forrit fyrir þína hönd."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Stöðva <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ef valið er „Í lagi“ stöðvast <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Talgervill"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Tenging tókst"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Sýna öll"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Leitar"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Ekki tókst að sækja samskiptaleið frá staðfestningaraðila til að bæta við reikningi."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Ekki tókst að bæta reikningi við eða tegund reiknings er ekki tiltæk."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Rásir og inntak"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Rásir, ytra inntak"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Rásir"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Virkjar:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Athugaðu að þessi stilling kann að auka orkunotkun tækisins."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Kveikja á „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
+    <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_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 96c0e04f2..39b3648a0 100644
--- a/Settings/res/values-it/energy-modes.xml
+++ b/Settings/res/values-it/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funzionalità di rete essenziali"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Basso consumo di energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Disattiva la connessione di rete quando la TV non è in uso."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Aggiornamenti e funzionalità critiche"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funzionalità di rete consigliate"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo di energia ottimizzato"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Attiva le funzionalità che riattivano la TV attraverso la rete (standby in rete)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Inserisci funzionalità 1]"</item>
     <item msgid="8724721267222341891">"[Inserisci funzionalità 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Altre funzionalità di rete"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consumo di energia aumentato"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Oltre alle funzionalità consigliate, questa opzione attiva, quando la TV non è in uso, altre funzionalità che possono aumentare il consumo di energia."</string>
+    <string 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-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 65da6aeb8..2d8d04354 100644
--- a/Settings/res/values-it/strings.xml
+++ b/Settings/res/values-it/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Impostazioni app"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Posizione, Utilizzo e diagnostica, Annunci"</string>
     <string name="add_account" msgid="7386223854837017129">"Aggiungi account"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Account sconosciuto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Rimuovi account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Scegli app sincronizzate"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizza ora"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Impostazioni audio avanzate"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Consenti modalità di gioco"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Adatta a intervallo dinamico dei contenuti"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Quando attivi questa opzione, il sistema passerà da uno dei diversi formati di intervallo dinamico all\'altro affinché i contenuti corrispondano. Questa operazione potrebbe causare la visualizzazione di una schermata nera durante il passaggio dei formati.\n\nFai clic su Impostazioni display avanzate per altre opzioni di intervallo dinamico."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Attivando questa opzione, il sistema passerà da un formato di intervallo dinamico all\'altro in base ai contenuti. Questo potrebbe causare la visualizzazione di una schermata nera durante il cambio di formato.\n\nFai clic su Impostazioni display avanzate per altre opzioni di intervallo dinamico."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Intervallo dinamico preferito"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversione preferita dal sistema"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Consente al sistema di gestire la conversione del formato"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vuoi forzare l\'output HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Per impostazione predefinita, verrà effettuata la conversione a <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Per il tuo display verrà usata la risoluzione di 1080p a 60 Hz. Questa opzione non è compatibile se per il display viene usata la risoluzione 4K a 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Il formato Dolby Vision non è supportato alla risoluzione attuale. Se attivi il formato Dolby Vision manualmente, la risoluzione del display verrà modificata in 1080p 60Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vuoi passare alla risoluzione 1080p 60Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forza sempre la conversione in Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Se l\'opzione Dolby Vision è disattivata nella sezione Formati HDR delle Impostazioni display avanzate e viene forzata la conversione in Dolby Vision, l\'opzione viene riattivata."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forza sempre la conversione in HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Testo di esempio"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Il meraviglioso mago di Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capitolo 11: La splendida Città di smeraldo di Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Sebbene i loro occhi fossero protetti dalle lenti verdi, Dorothy e i suoi amici rimasero immediatamente abbagliati dal fulgore della splendida Città. Lungo le strade si affacciavano belle case tutte realizzate in marmo verde e tempestate ovunque di smeraldi scintillanti. Camminarono lungo un marciapiede fatto dello stesso marmo verde, i cui blocchi erano congiunti da file e file di smeraldi incastonati che rilucevano sotto il sole splendente. I vetri alle finestre erano verdi e persino il cielo sopra la Città e i raggi di sole avevano una sfumatura verde. \n\nC\'erano molte persone che passeggiavano, uomini, donne e bambini: erano tutti vestiti di verde e avevano la pelle verdognola. Guardavano Dorothy e la sua stravagante compagnia con occhi pieni di meraviglia e i bambini correvano tutti a nascondersi dietro le loro madri quando vedevano il Leone; ma nessuno rivolse loro la parola. C\'erano molti negozi lungo la strada e Dorothy vide che ogni cosa al loro interno era verde. Si vendevano caramelle verdi e popcorn verdi, come pure scarpe verdi, cappelli verdi e abiti verdi di ogni tipo. C\'era anche un posto in cui un uomo vendeva limonata verde e, quando i bambini la acquistavano, Dorothy vide che pagavano con monetine verdi. \n\nSembrava che non esistessero cavalli o altri animali; gli uomini portavano le merci spingendole davanti a sé su carretti verdi. Tutti sembravano felici, soddisfatti e prosperi."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Sebbene i loro occhi fossero protetti dalle lenti verdi, Dorothy e i suoi amici rimasero immediatamente abbagliati dal fulgore della splendida Città. Lungo le strade si affacciavano belle case tutte realizzate in marmo verde e tempestate ovunque di smeraldi scintillanti. Camminarono lungo un marciapiede fatto dello stesso marmo verde, i cui blocchi erano congiunti da file e file di smeraldi incastonati che rilucevano sotto il sole splendente. I vetri alle finestre erano verdi e persino il cielo sopra la Città e i raggi di sole avevano una sfumatura verde. \n\nC\'erano molte persone che passeggiavano, uomini, donne e bambini: erano tutti vestiti di verde e avevano la pelle verdognola. Guardavano Dorothy e la sua stravagante compagnia con occhi pieni di meraviglia e i bambini correvano tutti a nascondersi dietro le loro madri quando vedevano il Leone; ma nessuno rivolse loro la parola. C\'erano molti negozi lungo la strada e Dorothy vide che ogni cosa al loro interno era verde. Si vendevano caramelle verdi e popcorn verdi, come pure scarpe verdi, cappelli verdi e abiti verdi di ogni tipo. C\'era anche un posto in cui un uomo vendeva limonata verde e, quando i bambini la acquistavano, Dorothy vide che pagavano con monetine verdi. \n\nSembrava che non esistessero cavalli o altri animali; gli uomini portavano le merci spingendole davanti a sé su carretti verdi. Tutti sembravano felici, soddisfatti e prosperi."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Selezione del formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatica"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuale"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vuoi passare alla risoluzione %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Seleziona OK per usare %1$s d\'ora in poi."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Il formato Dolby Vision non è supportato nella modalità %1$s e verrà disattivato in \"Impostazioni display avanzate\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Questa modalità supporta il formato %1$s. Su alcune TV potrebbe essere necessario attivare l\'HDMI avanzato per abilitare più formati HDR. Controlla le impostazioni della TV per verificare se supporta questo standard."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Questa modalità supporta: %1$s\nSu alcune TV, potrebbe essere necessario attivare l\'HDMI avanzato per abilitare più formati HDR. Controlla le impostazioni della TV per verificare se supporta questo formato."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annulla"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Cancellare i dati memorizzati nella cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ciò cancella tutti i dati delle app nella cache."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Connesso"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Disconnesso"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Non sei autorizzato a modificare le impostazioni Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usa per audio TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Invia feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centro assistenza"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Questo dispositivo è gestito dalla tua organizzazione."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Ulteriori informazioni"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App fotocamera}other{App fotocamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App di calendario"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Attiva"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configurazione"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> è in grado di raccogliere tutto il testo digitato, tranne le password. Sono inclusi i dati personali come i numeri di carta di credito."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> potrà leggere il tuo schermo, mostrarne i contenuti su altre app, monitorare le tue interazioni con sensori hardware o app e interagire con le app per tuo conto."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Interrompere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Se selezioni OK, <xliff:g id="SERVICE">%1$s</xliff:g> verrà interrotto."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Sintesi vocale"</string>
@@ -998,7 +996,7 @@
     <string name="device_rename_title" msgid="9070021379000499270">"Cambia nome al dispositivo <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
     <string name="device_rename_description" msgid="1973894029492915135">"Il nome attuale di questo dispositivo <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">"Imposta nome del dispositivo"</string>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Utilizza questo nome quando trasmetti foto, video o altri contenuti dal tuo telefono"</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Utilizza questo nome quando trasmetti foto, video o altri contenuti dal tuo smartphone"</string>
     <string name="change_setting" msgid="7211706374208138343">"Cambia"</string>
     <string name="keep_settings" msgid="703474489210093961">"Non cambiare"</string>
     <string name="apps_permissions" msgid="7876407267050498394">"Autorizzazioni"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Connessione riuscita"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostra tutto"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Ricerca"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Impossibile recuperare l\'intent add account dall\'autenticatore."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Impossibile aggiungere l\'account oppure il tipo di account non è disponibile."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canali e ingressi"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canali, ingressi esterni"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canali"</string>
@@ -1123,8 +1123,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">"Migliorare l\'efficienza energetica quando la TV non è in uso"</string>
+    <string name="energy_modes_summary" msgid="7196407759836930799">"Migliora l\'efficienza energetica quando la TV non è in uso"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Attiva:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Nota: questa modalità può aumentare il consumo di energia del dispositivo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Attiva \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <string name="settings_find_my_remote_title" msgid="4586368268611622848">"Trova il mio 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_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 003e1fb29..807c403ad 100644
--- a/Settings/res/values-iw/energy-modes.xml
+++ b/Settings/res/values-iw/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"תכונות רשת חיוניות"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"צריכת אנרגיה נמוכה"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"השבתת החיבור לרשת כשהטלוויזיה לא בשימוש."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"עדכונים קריטיים ופונקציות"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"תכונות רשת מומלצות"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"צריכת אנרגיה אופטימלית"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"הפעלת תכונות שמוציאות את הטלוויזיה ממצב שינה באמצעות הרשת (המתנה ברשת)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"תכונות רשת נוספות"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"צריכת אנרגיה מוגברת"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"כשהטלוויזיה לא בשימוש שעשוי להגדיל את צריכת האנרגיה, האפשרות הזו מפעילה עוד תכונות בנוסף לתכונות המומלצות."</string>
+    <string 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-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 bf8dce1ca..8f999cf2c 100644
--- a/Settings/res/values-iw/strings.xml
+++ b/Settings/res/values-iw/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"הגדרות האפליקציה"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"מיקום, אופן השימוש בנתונים וניתוח הביצועים, מודעות"</string>
     <string name="add_account" msgid="7386223854837017129">"הוספת חשבון"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"חשבון לא ידוע"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"הסרת חשבון"</string>
     <string name="account_sync" msgid="4315295293211313989">"בחירת אפליקציות מסונכרנות"</string>
     <string name="sync_now" msgid="4335217984374620551">"סנכרון עכשיו"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"רוצה לאלץ את פלט ה-HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"כברירת מחדל ההמרה תיאלץ לפעול במצב <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"התצוגה תפעל ברזולוציית 1080p ‏ 60Hz. האפשרות הזו לא תואמת לתצוגה שלך כשהיא פועלת ברזולוציית 4k‏ 60Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision לא נתמך ברזולוציה הנוכחית. אם מפעילים את Dolby Vision באופן ידני, הרזולוציה של המסך משתנה ל-1080p 60Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"לשנות את הרזולוציה ל-1080p 60Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"תמיד לאלץ המרה לפורמט Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"אם התכונה Dolby Vision מושבתת בקטע \'פורמטים של איכות HDR\' בהגדרות התצוגה המתקדמות, אילוץ ההמרה לפורמט Dolby Vision יפעיל את התכונה מחדש."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"תמיד לאלץ המרה לפורמט HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"טקסט לדוגמה"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"הקוסם המופלא מארץ עוץ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"פרק 11: עיר הברקת המופלאה של ארץ עוץ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"אפילו עם המשקפיים הירוקים שהגנו על עיניהם, דורותי וחבריה הסתנוורו בתחילה מזוהרה של העיר הנפלאה. לאורך הרחובות ניצבו בתים יפהפיים, שכולם בנויים משיש ירוק ומשובצים אבני ברקת מבריקות. הם צעדו על פני מדרכה שהייתה עשויה מאותו שיש ירוק, ובמקום המפגש של שורות הבתים היו משובצות זו לצד זו שורות של אבני ברקת, מנצנצות באור השמש הבהיר. אדני החלונות היו עשויים מזכוכית ירוקה. אפילו לשמיים שמעל העיר היה גוון ירקרק, וקרני השמש היו ירוקות. \n\nאנשים רבים התהלכו ברחובות, גברים, נשים וילדים, וכולם היו לבושים בבגדים ירוקים ולעורם היה גון ירוק. הם הסתכלו בהשתוממות על דורותי ועל החבורה המוזרה שסבבה אותה, וכשראו את האריה, כל הילדים ברחו והתחבאו מאחורי אימותיהם. אבל איש לא פנה אליהם בדברים. חנויות רבות ניצבו ברחוב ודורותי ראתה שכל הפריטים שבתוכן היו ירוקים. ממתקים ירוקים ופופקורן ירוק הוצעו למכירה, וגם נעליים ירוקות, כובעים ירוקים ובגדים ירוקים מכל מיני סוגים. בחנות אחת מכר מישהו לימונדה ירוקה, וכשהילדים קנו אותה, דורותי הבחינה שהם שילמו במטבעות ירוקים. \n\nנראה היה שאין שם סוסים, או חיות מכל סוג שהוא. הגברים נשאו דברים בעגלות ירוקות קטנות, שאותן הם דחפו לפניהם. נראה היה שכולם מאושרים, שבעי רצון ומצליחים."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"אפילו עם המשקפיים הירוקים שהגנו על עיניהם, דורותי וחבריה הסתנוורו בתחילה מזוהרה של העיר הנפלאה. לאורך הרחובות ניצבו בתים יפהפיים, שכולם בנויים משיש ירוק ומשובצים אבני ברקת מבריקות. הם צעדו על פני מדרכה שהייתה עשויה מאותו שיש ירוק, ובמקום המפגש של שורות הבתים היו משובצות זו לצד זו שורות של אבני ברקת, מנצנצות באור השמש הבהיר. אדני החלונות היו עשויים מזכוכית ירוקה. אפילו לשמיים שמעל העיר היה גוון ירקרק, וקרני השמש היו ירוקות. \n\nאנשים רבים התהלכו ברחובות, גברים, נשים וילדים, וכולם היו לבושים בבגדים ירוקים ולעורם היה גון ירוק. הם הסתכלו בהשתוממות על דורותי ועל החבורה המוזרה שסבבה אותה, וכשראו את האריה, כל הילדים ברחו והתחבאו מאחורי אימותיהם. אבל איש לא פנה אליהם בדברים. חנויות רבות ניצבו ברחוב ודורותי ראתה שכל הפריטים שבתוכן היו ירוקים. ממתקים ירוקים ופופקורן ירוק הוצעו למכירה, וגם נעליים ירוקות, כובעים ירוקים ובגדים ירוקים מכל מיני סוגים. בחנות אחת מכר מישהו לימונדה ירוקה, וכשהילדים קנו אותה, דורותי הבחינה שהם שילמו במטבעות ירוקים. \n\nנראה היה שאין שם סוסים, או חיות מכל סוג שהוא. הגברים נשאו דברים בעגלות ירוקות קטנות, שאותן הם דחפו לפניהם. נראה היה שכולם מאושרים, שבעי רצון ומצליחים."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"בחירת הפורמט"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"אוטומטי"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ידני"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"לשנות את הרזולוציה ל-%1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"בוחרים באפשרות \'אישור\' כדי להשתמש ברזולוציה %1$s מעכשיו והלאה."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision לא נתמך ב-%1$s. ניתן להשבית אותו בהגדרות התצוגה המתקדמות"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"המצב הזה תומך ב-%1$s. בחלק מהטלוויזיות ניתן להפעיל HDMI משופר כדי לאפשר הפעלה של עוד פורמטים של איכות HDR. כדאי לבדוק אם התכונה הזו נתמכת בהגדרות של הטלוויזיה."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"המצב הזה תומך ב: %1$s‏\nבחלק מהטלוויזיות ניתן להפעיל HDMI משופר כדי לאפשר הפעלה של עוד פורמטים של איכות HDR. כדאי לבדוק אם התכונה הזו נתמכת בהגדרות של הטלוויזיה."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ביטול"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"אישור"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"הרץ (Hz)"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> ‏(<xliff:g id="REFRESH_RATE">%2$s</xliff:g> הרץ)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"האם לנקות נתונים בקובץ שמור?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"פעולה זו תנקה נתונים בקובץ שמור, לכל האפליקציות."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"מחובר"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"מנותק"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"אין לך הרשאה לשנות את הגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"שימוש באודיו של הטלוויזיה"</string>
     <string name="send_feedback" msgid="936698637869795473">"שליחת משוב"</string>
     <string name="launch_help" msgid="2607478763131952469">"מרכז עזרה"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"מכשיר זה מנוהל על ידי הארגון שלך."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"מכשיר זה מנוהל על ידי <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ."</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"מידע נוסף"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{אפליקציית מצלמה}one{אפליקציות מצלמה}two{אפליקציות מצלמה}other{אפליקציות מצלמה}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"אפליקציית יומן"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"הפעלה"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"תצורה"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> יכול לאסוף את כל הטקסט שאתה מקליד, מלבד סיסמאות. נכללים בכך נתונים אישיים כמו מספרי כרטיס אשראי."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"החיבור הצליח"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"הצגת הכול"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"בתהליך חיפוש…"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"נכשל אחזור ה-Intent \'הוספת חשבון\' מרכיב האימות (authenticator)."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"הוספת החשבון נכשלה או שסוג החשבון לא זמין."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ערוצים ושיטות קלט"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ערוצים, שיטות קלט חיצוניות"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ערוצים"</string>
@@ -1119,12 +1119,17 @@
     <string name="screen_settings_title" msgid="7806908869190824434">"מסך"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"צליל"</string>
     <string name="power_and_energy" msgid="4638182439670702556">"עוצמה ואנרגיה"</string>
-    <string name="power_on_behavior" msgid="927607372303160716">"התנהגות בהפעלה"</string>
+    <string name="power_on_behavior" msgid="927607372303160716">"התנהגות בזמן ההפעלה"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"איפוס"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"קוד התאמה לאתרנט"</string>
     <string name="energy_modes" msgid="1331693860386361744">"מצבי אנרגיה"</string>
     <string name="energy_modes_summary" msgid="7196407759836930799">"שיפור החיסכון באנרגיה כשהטלוויזיה לא בשימוש"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"תכונות מופעלות:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"יש לשים לב שהמצב הזה עשוי להגדיל את צריכת החשמל של המכשיר."</string>
+    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"חשוב לדעת: המצב הזה עשוי להגדיל את צריכת החשמל של המכשיר."</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_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/energy-modes.xml b/Settings/res/values-ja/energy-modes.xml
index e62636214..d16dad3d3 100644
--- a/Settings/res/values-ja/energy-modes.xml
+++ b/Settings/res/values-ja/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"必須のネットワーク機能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"少ないエネルギー使用量"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"テレビを使用していないときにネットワーク接続を無効にします。"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"重要なアップデートと機能"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"おすすめのネットワーク機能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"最適化されたエネルギー使用量"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ネットワーク経由でテレビを起動する機能を有効にします（ネットワーク スタンバイ）。"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[機能 1 を挿入]"</item>
     <item msgid="8724721267222341891">"[機能 2 を挿入]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"追加のネットワーク機能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"増加したエネルギー使用量"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"このオプションでは、テレビを使用していないときに、おすすめの機能に加えて追加機能も有効になります（エネルギー使用量が増える場合があります）。"</string>
+    <string 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-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 e47460eec..7e70626fd 100644
--- a/Settings/res/values-ja/strings.xml
+++ b/Settings/res/values-ja/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"アプリの設定"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"位置情報、使用状況と診断、広告"</string>
     <string name="add_account" msgid="7386223854837017129">"アカウントを追加"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"不明なアカウント"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"アカウントの削除"</string>
     <string name="account_sync" msgid="4315295293211313989">"同期されたアプリを選択"</string>
     <string name="sync_now" msgid="4335217984374620551">"今すぐ同期"</string>
@@ -151,13 +152,13 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"音の詳細設定"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ゲームモードを有効にする"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"コンテンツのダイナミック レンジと一致"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"コンテンツのダイナミック レンジに合わせる"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"このオプションを有効にすると、コンテンツに合わせてダイナミック レンジの形式が切り替わります。切り替え中に画面が黒くなることがあります。\n\nその他のダイナミック レンジ オプションを設定するには、[ディスプレイの詳細設定] をクリックしてください。"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"優先されるダイナミック レンジ"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"システム設定の変換"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"形式の変換を自動で管理できます"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"このオプションを選択すると、ディスプレイに送信する適切なダイナミック レンジが自動的に判断され、必要に応じてそのダイナミック レンジにコンテンツが変換されます。"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"コンテンツの形式と常に一致します"</string>
+    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"コンテンツの形式に常に合わせます"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"強制変換"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"ご希望の形式に強制変換されます"</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"ご希望の形式に強制変換されます。強制変換は、表示モードや HDR 形式のその他の設定に影響することがあります。"</string>
@@ -178,7 +179,7 @@
     <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"[ディスプレイの詳細設定] で HDR 形式の HDR10+ が無効になっている場合、HDR10+ に強制変換すると、HDR10+ が有効になります。"</string>
     <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"常に SDR に強制変換する"</string>
     <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"SDR に強制変換すると、[ディスプレイの詳細設定] で HDR 形式のすべての形式が無効になります。"</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"コンテンツのフレームレートを合わせる"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"コンテンツのフレームレートに合わせる"</string>
     <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"シームレスのみ"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"視聴中のテレビでシームレスな移行が可能である場合に限り、アプリからリクエストがあった場合、デバイスは、再生しているコンテンツのオリジナルのフレームレートに出力を合わせます。"</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"接続済みのディスプレイがリフレッシュ レートのシームレスな移行をサポートしていません。対応のディスプレイに変更しない限り、このオプションは機能しません。"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"サンプル テキスト"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"オズの魔法使い"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"第 11 章: オズの不思議なエメラルド シティ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"緑のメガネで目を守っていても、ドロシーとその仲間たちは不思議なシティの輝きに最初はくらくらしました。通りには緑色の大理石造りの美しい家々が建ち並び、どの家にもキラキラしたエメラルドがいたるところにはめ込んでありました。足元の敷石も同じ緑色の大理石で、ブロックの継ぎ目にはエメラルドがすきまなく並び、太陽を反射してギラギラしていました。窓のガラスも緑色、空の色も緑色、太陽の光も緑色でした。\n\n男の人、女の人、子どもなど、たくさんの人が歩いていて、だれもかれもが緑色の服を着て、肌の色も緑がかっていました。みんなドロシーとその奇妙な寄せ集めの仲間たちに不思議そうな目を向け、子どもたちはライオンを見るなり、逃げ出してお母さんの後ろに隠れてしまいましたが、誰一人として話しかけてくる人はいませんでした。通りにはお店がたくさんあって、ドロシーはそこで売られている品物も緑色をしていることに気づきました。キャンディーも、ポップコーンも、靴も、帽子も、服もみんな緑色でした。男の人が売っている緑色のレモネードを子どもたちが買うときに出したお金も緑色だったことにドロシーは気づきました。\n\n馬などの動物はいないようでした。荷物は小さな緑色の手押し車で自分たちで運んでいました。みんな幸せで、満たされ、裕福そうな様子でした。"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"緑のメガネで目を守っていても、ドロシーとその仲間たちは不思議なシティの輝きに最初はくらくらしました。通りには緑色の大理石造りの美しい家々が建ち並び、どの家にもキラキラしたエメラルドがいたるところにはめ込んでありました。足元の敷石も同じ緑色の大理石で、ブロックの継ぎ目にはエメラルドがすきまなく並び、太陽を反射してギラギラしていました。窓のガラスも緑色、空の色も緑色、太陽の光も緑色でした。\n\n男の人、女の人、子どもなど、たくさんの人が歩いていて、だれもかれもが緑色の服を着て、肌の色も緑がかっていました。みんなドロシーとその奇妙な寄せ集めの仲間たちに不思議そうな目を向け、子どもたちはライオンを見るなり、逃げ出してお母さんの後ろに隠れてしまいましたが、誰一人として話しかけてくる人はいませんでした。通りにはお店がたくさんあって、ドロシーはそこで売られている品物も緑色をしていることに気づきました。キャンディーも、ポップコーンも、靴も、帽子も、服もみんな緑色でした。男の人が売っている緑色のレモネードを子どもたちが買うときに出したお金も緑色だったことにドロシーは気づきました。\n\n馬などの動物はいないようでした。荷物は小さな緑色の手押し車で自分たちで運んでいました。みんな幸せで、満たされ、裕福そうな様子でした。"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"形式の選択"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"自動"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"手動"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"解像度を %1$s に変更しますか？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"これから %1$s を使用するには、[OK] を選択してください。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"ドルビー ビジョンは %1$s ではサポートされていないため、[ディスプレイの詳細設定] で無効になります"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"このモードは %1$s をサポートしています。テレビによっては、拡張 HDMI を ON にして他の HDR 形式を有効にする必要があります。テレビの設定で、この機能に対応しているかどうかをご確認ください。"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"このモードは以下をサポートしています: %1$s\nテレビによっては、拡張 HDMI を ON にして他の HDR 形式を有効にする必要があります。テレビの設定で、この機能に対応しているかどうかをご確認ください。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"キャンセル"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g>（<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz）"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"キャッシュデータを削除しますか？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"すべてのアプリのキャッシュデータが削除されます。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"接続完了"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"接続を解除しました"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Bluetooth設定を変更する権限がありません。"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"テレビの音声に使用"</string>
     <string name="send_feedback" msgid="936698637869795473">"フィードバックを送信"</string>
     <string name="launch_help" msgid="2607478763131952469">"ヘルプセンター"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"このデバイスは組織によって管理されています。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"このデバイスは <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> により管理されています。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"、"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"詳細"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{カメラアプリ}other{カメラアプリ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"カレンダー アプリ"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"有効にする"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"設定"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> を有効にすると、入力したすべてのテキスト（パスワードを除く）が収集される可能性があります。これにはクレジットカード番号などの個人データも含まれます。"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"[OK] を選択すると<xliff:g id="SERVICE">%1$s</xliff:g>が停止します。"</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"テキスト読み上げ"</string>
@@ -896,7 +896,7 @@
     <string name="restricted_profile_delete_title" msgid="7153982195273379506">"制限付きプロファイルを削除"</string>
     <string name="restricted_profile_create_title" msgid="700322590579894058">"制限付きプロファイルの作成"</string>
     <string name="restricted_profile_configure_title" msgid="3327502517511010296">"設定"</string>
-    <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"許可されたアプリ"</string>
+    <string name="restricted_profile_configure_apps_title" msgid="2244201859522056827">"許可されているアプリ"</string>
     <string name="restricted_profile_allowed" msgid="970921490464867884">"許可済み"</string>
     <string name="restricted_profile_not_allowed" msgid="8184983064118036268">"許可しない"</string>
     <string name="restricted_profile_customize_restrictions" msgid="4723577877385636704">"制限をカスタマイズ"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"接続しました"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"すべて表示"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"検索中"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"認証システムからアカウント追加インテントを取得できませんでした。"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"アカウントを追加できませんでした。または、利用できないアカウントの種類です。"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"チャンネルと入力"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"チャンネルと外部入力"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"チャンネル"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"有効になる機能:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"このモードにより、デバイスの電力消費量が増える場合があります。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」の有効化"</string>
+    <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_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 3ea534a97..0c6364f3b 100644
--- a/Settings/res/values-ka/energy-modes.xml
+++ b/Settings/res/values-ka/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ქსელის ძირითადი ფუნქციები"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ენერგიის მცირე მოხმარება"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"გამორთეთ ქსელთან კავშირი, როცა ტელევიზორი არ გამოიყენება."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"კრიტიკული განახლებები და ფუნქციები"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ქსელის რეკომენდებული ფუნქციები"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ენერგიის ოპტიმალური გამოყენება"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ჩართავს ფუნქციებს, რაც გამოაღვიძებს ტელევიზორს სხვა ქსელზე (ქსელი მოლოდინის რეჟიმში)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[ფუნქცია 1-ის ჩასმა]"</item>
     <item msgid="8724721267222341891">"[ფუნქცია 2-ის ჩასმა]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ქსელის დამატებითი ფუნქციები"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ენერგიის გაზრდილი მოხმარება"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"რეკომენდებული ფუნქციების გარდა ეს ვარიანტი ჩართავს დამატებით ფუნქციებს, როცა ტელევიზორი არ გამოიყენება, რამაც შესაძლოა გაზარდოს ენერგიის მოხმარება."</string>
+    <string 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-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 5f1e99292..8d3c196ef 100644
--- a/Settings/res/values-ka/strings.xml
+++ b/Settings/res/values-ka/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"აპის პარამეტრები"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"მდებარეობა, გამოყენება და დიაგნოსტიკა, რეკლამები"</string>
     <string name="add_account" msgid="7386223854837017129">"ანგარიშის დამატება"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"უცნობი ანგარიში"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ანგარიშის წაშლა"</string>
     <string name="account_sync" msgid="4315295293211313989">"აირჩიეთ დასინქრონებული აპები"</string>
     <string name="sync_now" msgid="4335217984374620551">"სინქრონიზაცია ახლა"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ხმის გაფართოებული პარამეტრები"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"თამაშის რეჟიმის დაშვება"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"კონტენტის დინამიკური დიაპაზონის დამთხვევა"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ამ პარამეტრის ჩართვისას, სისტემა გადაერთვება სხვადასხვა დინამიკური დიაპაზონის ფორმატებს შორის, რათა შეესაბამებოდეს შინაარსს. ეს შეიძლება გამოწვეული იყოს შავი ეკრანი ფორმატის გადართვის დროს.\n\nმეტი დინამიკური დიაპაზონის ვარიანტებისთვის, დააწკაპუნეთ ეკრანის გაფართოებულ პარამეტრებზე."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ამ პარამეტრის ჩართვისას, სისტემა გადაერთვება სხვადასხვა დინამიკური დიაპაზონის ფორმატებს შორის, რათა შეესაბამებოდეს შინაარსს. ამან შესაძლოა გამოიწვიოს შავი ეკრანი ფორმატის გადართვის დროს.\n\nმეტი დინამიკური დიაპაზონის ვარიანტებისთვის, დააწკაპუნეთ ეკრანის გაფართოებულ პარამეტრებზე."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"სასურველი დინამიკური დიაპაზონი"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"სისტემის უპირატესი გარდაქმნა"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"სისტემამ მართოს ფორმატის გარდაქმნა"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ტექსტის ნიმუში"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ოზის საოცარი ჯადოქარი"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"თავი 11: ოზის ზურმუხტის ქალაქი"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"მართალია, მწვანე სათვალეები ეკეთათ, მაგრამ დოროთი და მისი მეგობრები ამ საკვირველი ქალაქის ბრწყინვალებამ მაინც გააოცა. ქუჩებში რიგებად იდგა მწვანე მარმარილოს უმშვენიერესი სახლები, რომლებიც ბრჭყვიალა ზურმუხტებით იყო მორთული. გამვლელები დადიოდნენ ტროტუარზე, რომელიც იმავე მწვანე მარმარილოსი იყო, ხოლო ფილებს შორის ნაპრალები ამოევსოთ ზურმუხტებით, რომლებიც მზის სინათლეზე ბზინავდა. სახლების ფანჯრებს მწვანე მინები ჰქონდა. ზურმუხტის ქალაქის თავზე ცასაც მწვანე ელფერი დაჰკრავდა. მწვანე მზიდან კი ქვემოთ მწვანე სხივები ეცემოდა. \n\nგარშემო ბევრი ადამიანი ირეოდა — კაცები, ქალები, ბავშვები — ყველას მწვანე ტანსაცმელი ეცვა და კანიც მწვანე შეფერილობის ჰქონდათ. ისინი გაკვირვებით შეჰყურებდნენ დოროთისა და მის უცნაურ თანამგზავრებს. ლომის დანახვისთანავე ბავშვები მშობლების ზურგსუკან იმალებოდნენ და ვერავინ ბედავდა სტუმრებთან საუბარს. ქუჩის გაყოლებაზე ბევრი მაღაზია ჩამწკრივებულიყო და დოროთიმ დაინახა, რომ ყველაფერი, რაც გასაყიდად გამოეტანათ, მწვანე ფერისა იყო — მწვანე ტკბილეული თუ მწვანე ბატი-ბუტი, მწვანე ფეხსაცმელი თუ თავსაბურავი და სხვადასხვა ზომის და ფორმის ტანსაცმელიც კი მწვანე იყო. ერთ-ერთ დახლზე კაცი მწვანე ლიმონათს ყიდდა, გარსშემოხვეული ბავშვები კი მწვანე მონეტებით უხდიდნენ. \n\nზურმუხტის ქალაქის ქუჩებში არც ცხენები ჩანდა, არც სხვა ცხოველები. კაცებს ტვირთი პატარა მწვანე ხელის ურიკებით გადაჰქონდათ. ქალაქის მაცხოვრებლებს სახეზე ბედნიერება და კმაყოფილება ეტყობოდათ."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"მართალია, მწვანე სათვალეები ეკეთათ, მაგრამ დოროთი და მისი მეგობრები ამ საკვირველი ქალაქის ბრწყინვალებამ მაინც გააოცა. ქუჩებში რიგებად იდგა მწვანე მარმარილოს უმშვენიერესი სახლები, რომლებიც ბრჭყვიალა ზურმუხტებით იყო მორთული. გამვლელები დადიოდნენ ტროტუარზე, რომელიც იმავე მწვანე მარმარილოსი იყო, ხოლო ფილებს შორის ნაპრალები ამოევსოთ ზურმუხტებით, რომლებიც მზის სინათლეზე ბზინავდა. სახლების ფანჯრებს მწვანე მინები ჰქონდა. ზურმუხტის ქალაქის თავზე ცასაც მწვანე ელფერი დაჰკრავდა. მწვანე მზიდან კი ქვემოთ მწვანე სხივები ეცემოდა. \n\nგარშემო ბევრი ადამიანი ირეოდა — კაცები, ქალები, ბავშვები — ყველას მწვანე ტანსაცმელი ეცვა და კანიც მწვანე შეფერილობის ჰქონდათ. ისინი გაკვირვებით შეჰყურებდნენ დოროთისა და მის უცნაურ თანამგზავრებს. ლომის დანახვისთანავე ბავშვები მშობლების ზურგს უკან იმალებოდნენ და ვერავინ ბედავდა სტუმრებთან საუბარს. ქუჩის გაყოლებაზე ბევრი მაღაზია ჩამწკრივებულიყო და დოროთიმ დაინახა, რომ ყველაფერი, რაც გასაყიდად გამოეტანათ, მწვანე ფერისა იყო — მწვანე ტკბილეული თუ მწვანე ბატი-ბუტი, მწვანე ფეხსაცმელი თუ თავსაბურავი და სხვადასხვა ზომისა და ფორმის ტანსაცმელიც კი მწვანე იყო. ერთ-ერთ დახლზე კაცი მწვანე ლიმონათს ყიდდა, გარსშემოხვეული ბავშვები კი მწვანე მონეტებით უხდიდნენ. \n\nზურმუხტის ქალაქის ქუჩებში არც ცხენები ჩანდა, არც სხვა ცხოველები. კაცებს ტვირთი პატარა მწვანე ხელის ურიკებით გადაჰქონდათ. ქალაქის მაცხოვრებლებს სახეზე ბედნიერება და კმაყოფილება ეტყობოდათ."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ფორმატის შერჩევა"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ავტომატური"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ხელით"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"გსურთ, შეიცვალოს გარჩევადობა და გახდეს %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"თუ გსურთ, ამიერიდან გამოიყენოთ %1$s, აირჩიეთ „კარგი“."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision-ს არ აქვს მხარდაჭერა %1$s გარჩევადობაში და გაითიშება „ეკრანის დამატებითი პარამეტრებიდან“"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ეს რეჟიმი მხარს უჭერს %1$s-ს. სხვა HDR ფორმატების ჩასართავად, ზოგ ტელევიზორზე შეიძლება დაგჭირდეთ გაძლიერებული HDMI-ს გააქტიურება. ამისთვის შეამოწმეთ თქვენი ტელევიზორის პარამეტრები."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ამ რეჟიმით მხარდაჭერილია: %1$s\nზოგიერთ ტელევიზორზე შესაძლოა დაგჭირდეთ გაძლიერებული HDMI-ის ჩართვა, მეტი HDR ფორმატის ჩასართავად. ამისთვის შეამოწმეთ თქვენი ტელევიზორის პარამეტრები."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"გაუქმება"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"კარგი"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"ჰც"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> ჰც)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"წაიშალოს ქეშირებული მონაცემები?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"წაიშლება ქეშირებული მონაცემები ყველა აპისთვის."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"დაკავშირებულია"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"კავშირი გაწყვეტილია"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"თქვენ არ გაქვთ Bluetooth-ის პარამეტრების შეცვლის ნებართვა."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"გამოიყენება სატელევიზიო აუდიოსთვის"</string>
     <string name="send_feedback" msgid="936698637869795473">"გამოხმაურება"</string>
     <string name="launch_help" msgid="2607478763131952469">"დახმარების ცენტრი"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ამ მოწყობილობას მართავს თქვენი ორგანიზაცია."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ამ მოწყობილობას მართავს <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"შეიტყვეთ მეტი"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{კამერის აპი}other{კამერის აპები}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"კალენდრის აპი"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ჩართვა"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"კონფიგურაცია"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს შეუძლია შეაგროვოს მთელი ტექსტი, რომელსაც კრეფთ, პაროლების გარდა, მათ შორის, პირადი მონაცემები, მაგალითად, საკრედიტო ბარათის ნომერი."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"წარმატებით დაკავშირდა"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"ყველას ჩვენება"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"მიმდინარეობს ძიება"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ავტორიზაციის მიმცემისგან ანგარიშის დამატების განზრახვის მიღება ვერ მოხერხდა."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ანგარიშის დამატება ვერ მოხერხდა ან ანგარიშის ტიპი არ არის ხელმისაწვდომი."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"არხები და შემავალი სიგნალები"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"არხები, გარე შემავალი სიგნალები"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"არხები"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ჩაირთვება:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"გახსოვდეთ, რომ ამ რეჟიმმა შესაძლოა გაზარდოს ელექტროენერგიის მოხმარება."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"ჩაირთოს „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“?"</string>
+    <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_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 fa2a4cc76..c3c66af94 100644
--- a/Settings/res/values-kk/energy-modes.xml
+++ b/Settings/res/values-kk/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Негізгі желі функциялары"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Аз энергия тұтыну режимі"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Теледидар пайдаланылмаған кезде, желі байланысын ажыратыңыз."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Аса маңызды жаңартулар мен функциялар"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ұсынылатын желі функциялары"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Энергияны оңтайлы пайдалану режимі"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Теледидарды желі арқылы оятатын функцияларды қосады (желілік күту режимі)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Қосымша желі функциялары"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Жоғары энергия тұтыну режимі"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ұсынылған функциялардан басқа, бұл опция теледидар пайдаланылмаған кезде қосымша функцияларды қосады және бұл энергия тұтыну деңгейін арттыруы мүмкін."</string>
+    <string 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-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 5cb775557..1d3cc5b9a 100644
--- a/Settings/res/values-kk/strings.xml
+++ b/Settings/res/values-kk/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Қолданба параметрлері"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Локация, пайдалану дерегі және диагностика, жарнамалар"</string>
     <string name="add_account" msgid="7386223854837017129">"Аккаунт қосу"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Белгісіз аккаунт"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Аккаунтты жою"</string>
     <string name="account_sync" msgid="4315295293211313989">"Синхрондалған қолданбаларды таңдау"</string>
     <string name="sync_now" msgid="4335217984374620551">"Қазір синхрондау"</string>
@@ -152,14 +153,14 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Қосымша дыбыс параметрлері"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Ойын режиміне рұқсат ету"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Контенттің динамикалық ауқымын сәйкестендіру"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Бұл опция таңдалғанда, жүйе контентпен сәйкестену үшін әр түрлі динамикалық ауқым форматтары арасында ауысады. Формат ауысқанда, қара экран қосылуы мүмкін.\n\nДинамикалық ауқымның толық опцияларын қарау үшін дисплейдің қосымша параметрлеріне өтіңіз."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Бұл опция таңдалғанда, жүйе контентпен сәйкестену үшін әртүрлі динамикалық ауқым форматтары арасында ауысады. Формат ауысқанда, экран қараюы мүмкін.\n\nДинамикалық ауқымның басқа опцияларын көру үшін \"Қосымша дисплей параметрлері\" тармағын таңдаңыз."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Қажетті динамикалық ауқым"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Жүйеге қолайлы конверсия"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Жүйенің формат конверсиясын басқаруына жол беру"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Осы опция таңдалған кезде жүйе дисплейге жіберілетін аралықты анықтайды және керек жағдайда мазмұнды осы динамикалық аралықта түрлендіреді"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Әрқашан мазмұнның форматына сәйкес келеді"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Жүйеге формат конверсиясын басқаруға рұқсат береді."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Осы опция таңдалған кезде, жүйе дисплейге жіберілетін аралықты анықтайды және керегінше контентті осы динамикалық аралыққа түрлендіреді."</string>
+    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Әрқашан контенттің форматына сәйкес келеді."</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Мәжбүрлі конверсия"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Қолайлы форматты мәжбүрлі конверсиялау"</string>
+    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Конверсияны мәжбүрлі түрле қолайлы форматқа орнатады."</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Қолайлы форматты мәжбүрлі конверсиялау Конверсяны мәжбүрлеу Display Mode немесе HDR фарматындағы басқа параметрлерге әсер етуі мүмкін"</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Әрқашан SDR-да"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Әрқашан <xliff:g id="HDR_TYPE">%s</xliff:g>-те"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Мәтін үлгісі"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Оз елінің ғажап сиқыршысы"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11-тарау. Оз елінің Зүбаржат қаласы"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Жасыл көзілдірік таққан Дороти мен оның достары қалаға алғаш келгенде, оның ғажайып көркіне таңғалды. Әдемі жасыл мәрмәр үйлер көшені жағалай тізіліп тұр. Жер-көкте жарқыраған зүбаржат тастар шашылып жатқандай. Мәрмәр жол да дәл сондай жап-жасыл. Зүбаржат кірпіштен қаланған тұрғын үйлер күннен жарқырайды. Терезелердің әйнектері де жасыл шыныдан. Қала үстіндегі жасыл аспаннан жасыл түсті күн сәулесі түседі. \n\nКөшедегі ерлер де, әйелдер де, балалар да жасыл киім киіп алған. Олардың терілері де жасыл реңді екен. Адамдар Дороти мен оның әпенді достарына таңдана қарайды. Балалар Арыстанды көре сала қашып, аналарының артына тығылып жатыр. Сөйлесуге де ешкім батпайды ғой. Дороти көше бойында қаз-қатар тұрған дүкендердегі нәрселердің барлығы жасыл түсті екеніне тамсана қарайды. Кәмпит те, поп-корн да, аяқ киім де, қалпақтар да – барлығы жасыл еді. Бір кісі жасыл лимонад сатып тұр, балалар оны жасыл ақшаға сатып алып жатыр. \n\nМұнда жануарлар жоқ сияқты. Жүкті ер адамдар кішкене жасыл арбаға салып сүйреп барады. Бәрі бақытты, өмірлеріне дән риза."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Жасыл көзілдірік таққан Дороти мен оның достары қалаға алғаш келгенде, оның ғажайып көркіне таңғалды. Әдемі жасыл мәрмәр үйлер көшені жағалай тізіліп тұр. Жер-көкте жарқыраған зүбаржаттар шашылып жатқандай. Мәрмәр жол да дәл сондай жап-жасыл. Зүбаржат кірпіштен қаланған тұрғын үйлер күннен жарқырайды. Терезелердің әйнектері де жасыл шыныдан. Қала үстіндегі жасыл аспаннан жасыл түсті күн сәулесі түседі. \n\nКөшедегі ерлер де, әйелдер де, балалар да жасыл киім киіп алған. Олардың терілері де жасыл реңді екен. Адамдар Дороти мен оның әпенді достарына таңдана қарайды. Балалар Арыстанды көре сала қашып, аналарының артына тығылып жатыр. Сөйлесуге де ешкім батпайды ғой. Дороти көше бойында қаз-қатар тұрған дүкендердегі нәрселердің барлығы жасыл түсті екеніне тамсана қарайды. Кәмпит те, поп-корн да, аяқ киім де, қалпақтар да барлығы жасыл еді. Бір кісі жасыл лимонад сатып тұр, балалар оны жасыл ақшаға сатып алып жатыр. \n\nМұнда жануарлар жоқ сияқты. Ер адамдар жүкті кішкене жасыл арбаға салып сүйреп барады. Бәрі бақытты, өмірлеріне дән риза."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Форматты таңдау"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автоматты"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Қолмен"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ажыратымдылықты %1$s дейін өзгерту қажет пе?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Қазірден бастап %1$s рұқсатын пайдалану үшін \"Жарайды\" түймесін басыңыз."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s кезінде қолжетімді емес. Ол \"Дисплейдің қосымша параметрлерінде\" өшіріледі."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Бұл режим %1$s қолдайды. Көбірек HDR форматтарын пайдалану үшін кейбір теледидарларда күшейтілген HDMI қажет болуы мүмкін. Бұл опцияның қолжетімділігін тексеру үшін теледидарыңыздың параметрлерін қараңыз."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Бұл режимнің ажыратымдылығы - %1$s.\nHDR форматының басқа да түрлерін қосу үшін кейбір теледидар параметрлерінен жақсартылған HDMI қосу қажет болуы мүмкін. Бұл опцияның қолжетімділігін тексеру үшін теледидарыңыздың параметрлерін қараңыз."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Бас тарту"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Жарайды"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Кэштелген деректер өшірілсін бе?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Бұл барлық қолданбалардың кэштелген деректерін тазартады."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Қосулы"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Ажыратулы"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Сізде Bluetooth параметрлерін өзгерту рұқсаты жоқ."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Теледидар аудио шығысы ретінде пайдалану"</string>
     <string name="send_feedback" msgid="936698637869795473">"Пікір жіберу"</string>
     <string name="launch_help" msgid="2607478763131952469">"Анықтама орталығы"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Бұл құрылғыны ұйым басқарады."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> басқарады."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Толығырақ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Камера қолданбасы}other{Камера қолданбалары}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Күнтізбе қолданбасы"</string>
@@ -738,12 +738,12 @@
     <string name="color_cyan" msgid="3172130225116530998">"Көкшіл"</string>
     <string name="color_yellow" msgid="3519470952904560404">"Сары"</string>
     <string name="color_magenta" msgid="2377854703399624607">"Қызылкүрең"</string>
-    <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"Аудио сипаттама"</string>
+    <string name="accessibility_toggle_audio_description_preference_title" msgid="933923296129403548">"Аудиосипаттама"</string>
     <string name="accessibility_audio_description_summary" msgid="2027813223650517036">"Қолдау көрсетілетін фильмдер мен сериалдарда экрандағы әрекеттің аудио сипаттамасын есту"</string>
     <string name="system_accessibility_status" msgid="8504842254080682515">"Қосу"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурация"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметін пайдалану керек пе?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> құпия сөздерден басқа бүкіл терген мәтініңізді жинай алады. Бұл несие карталарының нөмірлері сияқты жеке деректерді қамтиды."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Байланыс орнатылды."</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Барлығын көрсету"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Іздеу"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Authenticator-дан аккаунт қосудың intent нысаны алынбады."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Аккаунт қосылмады немесе мұндай аккаунт түрі қолжетімді емес."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Арналар және кірістер"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Арналар, сыртқы кірістер"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Арналар"</string>
@@ -1123,6 +1125,11 @@
     <string name="energy_modes" msgid="1331693860386361744">"Энергия режимдері"</string>
     <string name="energy_modes_summary" msgid="7196407759836930799">"Теледидар пайдаланылмаған кезде энергияның тиімдірек қолданылуын қамтамасыз етіңіз"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Келесілер қосылады:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Бұл режим құрылғының қуат тұтынуын арттыруы мүмкін екенін ескеріңіз."</string>
+    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Бұл режим құрылғы тұтынатын қуат мөлшерін арттыруы мүмкін екенін ескеріңіз."</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_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 999b4af53..ff0d67702 100644
--- a/Settings/res/values-km/energy-modes.xml
+++ b/Settings/res/values-km/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"មុខងារបណ្ដាញចាំបាច់"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ការប្រើប្រាស់ថាមពលទាប"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"បិទការតភ្ជាប់បណ្ដាញ នៅពេលមិនប្រើទូរទស្សន៍។"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"ការដំឡើងកំណែ និងមុខងារសំខាន់ខ្លាំង"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"មុខងារបណ្ដាញដែលបានណែនាំ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ការប្រើប្រាស់ថាមពលដែលបានបង្កើនប្រសិទ្ធភាព"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"បើកមុខងារដែលដាស់ទូរទស្សន៍តាមបណ្ដាញ (សម្ងំលើបណ្ដាញ)។"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[បញ្ចូលមុខងារទី 1]"</item>
     <item msgid="8724721267222341891">"[បញ្ចូលមុខងារទី 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"មុខងារបណ្ដាញបន្ថែម"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ការប្រើប្រាស់ថាមពលកើនឡើង"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"បន្ថែមលើមុខងារដែលបានណែនាំ ជម្រើសនេះបើកមុខងារបន្ថែមនៅពេលមិនប្រើទូរទស្សន៍ ដែលអាចបង្កើនការប្រើប្រាស់ថាមពល។"</string>
+    <string 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-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 08d59f2a9..728346da6 100644
--- a/Settings/res/values-km/strings.xml
+++ b/Settings/res/values-km/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ការ​កំណត់​កម្មវិធី​"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ទីតាំង ការប្រើប្រាស់ និង​ការវិភាគ ការផ្សាយ​ពាណិជ្ជកម្ម"</string>
     <string name="add_account" msgid="7386223854837017129">"បន្ថែម​គណនី"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"មិនស្គាល់​គណនី"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"លុប​គណនី​​​ចេញ"</string>
     <string name="account_sync" msgid="4315295293211313989">"ជ្រើស​រើស​កម្មវិធី​​​ដែល​បាន​ធ្វើ​សម​កាល​កម្ម"</string>
     <string name="sync_now" msgid="4335217984374620551">"ធ្វើ​សម្មកាលកម្ម​ឥឡូវ"</string>
@@ -154,7 +155,7 @@
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"ផ្គូផ្គងកម្រិតឌីណាមិកខ្លឹមសារ"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"នៅពេលបើក​ជម្រើសនេះ ប្រព័ន្ធនឹងប្ដូររវាង​ទម្រង់កម្រិត​ឌីណាមិកផ្សេងៗ ដើម្បីឱ្យត្រូវគ្នានឹង​ខ្លឹមសារ។ ការធ្វើបែបនេះ​អាចបណ្ដាលឱ្យ​អេក្រង់ពណ៌ខ្មៅ ក្នុងអំឡុងពេល​ប្ដូរទម្រង់។\n\nចុច​ការកំណត់​ផ្ទាំងអេក្រង់កម្រិតខ្ពស់ ដើម្បីទទួលបាន​ជម្រើសកម្រិតឌីណាមិក​ច្រើនទៀត។"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"កម្រិតឌីណាមិក​ដែលចង់បាន"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ការបំប្លែងជាអាទិភាពនៃប្រព័ន្ធ"</string>
+    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ការបំប្លែងតាមការចង់បានរបស់ប្រព័ន្ធ"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"សូមឱ្យប្រព័ន្ធគ្រប់គ្រងការបំប្លែងទម្រង់"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"នៅពេលជម្រើសនេះត្រូវបានជ្រើសរើស ប្រព័ន្ធនឹងកំណត់ចន្លោះឌីណាមិកសមរម្យមួយដែលត្រូវបានផ្ញើទៅកាន់ផ្ទាំងអេក្រង់របស់អ្នក ហើយបំប្លែងខ្លឹមសារទៅជា​ចន្លោះឌីណាមិកនេះតាមតម្រូវការ។"</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ត្រូវគ្នានឹងទម្រង់ខ្លឹមសារជានិច្ច"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"អត្ថបទគំរូ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"មេធ្មប់ដ៏អស្ចារ្យនៃទឹកដីពិសិដ្ឋ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ជំពូកទី 11៖ ទីក្រុងមរកតដ៏អស្ចារ្យនៃទឹកដីពិសិដ្ឋ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"មុនដំបូង ដូរ៉ូធី និង​មិត្តភ័ក្តិ​របស់នាង​មាន​ភាពភ្ញាក់​ផ្អើលយ៉ាងខ្លាំង​ចំពោះភាព​ស្រស់ស្អាត​នៃទីក្រុង​ដ៏អស្ចារ្យនេះ បើទោះ​បីជាពួកគេ​ពាក់វ៉ែនតា​ការពារ​ភ្នែក​ដែលមាន​ពណ៌បៃតង​ក៏ដោយ។ នៅតាមដងផ្លូវ មានផ្ទះដ៏​ស្រស់ស្អាត ដែលធ្វើ​ឡើងពីថ្មម៉ាប​ពណ៌បៃតង និងលម្អដោយ​ត្បូងមរកត​ដ៏ចែងចាំង​នៅគ្រប់​ទីកន្លែង​តម្រៀប​ជួរគ្នា។ ពួកគេ​ដើរនៅលើ​ដងផ្លូវដែល​ធ្វើពីថ្មម៉ាប​ពណ៌បៃតងដូចគ្នា ហើយនៅ​ត្រង់កន្លែង​ដែលប្លុកអគារ​តភ្ជាប់​គ្នាមានត្បូង​មរកតតម្រៀបជាជួរក្បែរៗគ្នា និង​មានពន្លឺចែងចាំង​នៅក្រោមពន្លឺ​ព្រះអាទិត្យ។ ផ្ទាំងបង្អួច​ធ្វើឡើង​ពីកញ្ចក់​ពណ៌បៃតង ហើយសូម្បីតែ​ផ្ទៃមេឃគ្របដណ្ដប់ដោយ​ស្រមោលពណ៌បៃតង ហើយកាំរស្មីនៃពន្លឺ​ព្រះអាទិត្យ​ក៏មានពណ៌​បៃតង​ដែរ។ \n\nមាន​មនុស្សម្នា​កុះករទាំងប្រុស ទាំងស្រី ទាំងកុមារា ទាំងកុមារី​ដើរទៅ​មកក្នុងសម្លៀក​បំពាក់ពណ៌បៃតង ហើយ​ពួកគេ​ទាំងអស់​សុទ្ធតែមាន​ស្បែករាងបៃតង។ ពួកគេ​មើលទៅ​កាន់ដូរ៉ូធី និង​អ្នករួមដំណើរ​ជាមួយ​នាងដ៏ចម្លែក​ដោយ​បង្ហាញកែវភ្នែកដែលពោរពេញដោយ​ក្តីងឿងឆ្ងល់ ហើយ​ក្មេងៗទាំងអស់​រត់ទៅ​ពួន​នៅ​ខាងក្រោយ​ម្តាយរបស់​ពួកគេ នៅ​ពេល​ដែល​គេឃើញ​សត្វតោ ប៉ុន្តែ​គ្មាន​នរណាម្នាក់​និយាយ​ទៅកាន់​ពួកគេ​នោះទេ។ មាន​ហាង​ជាច្រើន​នៅតាមផ្លូវ ហើយ​ដូរ៉ូធីបាន​សង្កេតឃើញ​ថា អ្វីៗទាំងអស់​នៅក្នុងហាងទាំងនោះ​សុទ្ធតែមាន​ពណ៌បៃតង។ ស្ករគ្រាប់ពណ៌បៃតង និង​ពោតលីង​ពណ៌បៃតង ក៏​ដូចជា​ស្បែកជើងពណ៌បៃតង មួកពណ៌បៃតង និង​សម្លៀកបំពាក់ពណ៌បៃតង​គ្រប់ប្រភេទ​សុទ្ធតែមានលក់នៅក្នុងហាង។ នៅកន្លែងមួយ មានបុរសម្នាក់​លក់ទឹកក្រូចឆ្មារពណ៌បៃតង ហើយនៅ​ពេលក្មេងៗទិញ​ទឹកក្រូចឆ្មារ​នោះ ដូរ៉ូធីបាន​សង្កេតឃើញថា ពួកគេ​បានប្រើកាក់ពណ៌បៃតងទៅទិញ។ \n\nនៅ​ទីនោះ​ហាក់ដូចជា​គ្មានសត្វសេះ ឬសត្វផ្សេង​ទៀតសោះ។ ពួកគេ​ដឹកជញ្ជូន​សម្ភារទាំងអស់​តាមរយៈរទេះរុញ​ពណ៌បៃតង។ ពួកគេ​គ្រប់គ្នា​ហាក់បីដូចជា​រស់នៅប្រកប​ដោយក្ដីរីករាយ និង​ភាពសម្បូរ​សប្បាយ​ណាស់។"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"មុនដំបូង ដូរ៉ូធី និង​មិត្តភ័ក្តិ​របស់​នាង​មាន​ភាព​ភ្ញាក់​ផ្អើលយ៉ាងខ្លាំង​​ចំពោះ​ភាព​ស្រស់ស្អាត​នៃ​ទីក្រុង​ដ៏អស្ចារ្យ​នេះ​ បើ​ទោះ​បី​ជា​ពួកគេ​ពាក់វ៉ែនតា​ការពារ​ភ្នែក​ដែល​មាន​ពណ៌បៃតង​ក៏ដោយ។ នៅ​តាមដង​ផ្លូវ មាន​ផ្ទះ​ដ៏​ស្រស់​ស្អាតដែលសង់ឡើង​ពី​ថ្ម​ម៉ាប​ពណ៌បៃតង និង​លម្អ​ដោយ​ត្បូង​មរកត​ដ៏​ចែងចាំង​នៅគ្រប់​ទីកន្លែង​តម្រៀប​ជួរគ្នា។ ពួកគេ​ដើរ​នៅ​លើ​ចិញ្ចើម​ផ្លូវ​ដែល​ធ្វើ​ពី​ថ្ម​ម៉ាប​ពណ៌បៃតងដូចគ្នា ហើយ​នៅ​ត្រង់កន្លែង​ដែល​ប្លុក​​អគារ​​តភ្ជាប់​គ្នាមាន​​ត្បូង​មរកតតម្រៀបជាជួរក្បែរៗគ្នា និង​មាន​ពន្លឺចែង​ចាំង​នៅក្រោម​ពន្លឺ​ព្រះអាទិត្យ។ ផ្ទាំង​បង្អួច​ធ្វើ​ឡើង​ពីកញ្ចក់​ពណ៌បៃតង ហើយ​សូម្បី​​តែ​ផ្ទៃមេឃគ្របដណ្ដប់ដោយ​ស្រមោលពណ៌បៃតង ហើយកាំរស្មីនៃ​​ពន្លឺ​ព្រះអាទិត្យ​ក៏មាន​​ពណ៌​បៃតង​ដែរ។\n\nមាន​មនុស្ស​ម្នាកុះករទាំងប្រុស ទាំងស្រី ទាំងកុមារា ទាំងកុមារី​ដើរ​ទៅ​មក​ក្នុង​សម្លៀកបំពាក់​ពណ៌បៃតង ហើយ​ពួកគេ​ទាំងអស់​សុទ្ធ​តែមាន​ស្បែករាងបៃតង។ ពួកគេ​មើលទៅ​កាន់ដូរ៉ូធី និង​អ្នក​រួមដំណើរ​ជាមួយ​នាង​ដ៏ចម្លែក​ដោយ​បង្ហាញកែវភ្នែកដែលពោរពេញដោយ​ក្តី​ងឿងឆ្ងល់ ហើយ​ក្មេងៗទាំងអស់​រត់​ទៅ​ពួន​នៅ​ខាងក្រោយ​ម្តាយ​របស់​ពួកគេ នៅ​ពេល​ដែល​គេឃើញ​សត្វតោ ប៉ុន្តែ​គ្មាន​នរណាម្នាក់​និយាយ​ទៅកាន់​ពួកគេ​នោះទេ។ មាន​ហាង​ជា​ច្រើន​នៅ​តាម​ផ្លូវ ហើយ​ដូរ៉ូធីបាន​សង្កេត​ឃើញ​ថា ​អ្វីៗទាំងអស់​នៅ​ក្នុង​ហាងទាំងនោះ​សុទ្ធតែ​មាន​ពណ៌បៃតង។ ស្ករគ្រាប់ពណ៌បៃតង និង​ពោតលីង​ពណ៌បៃតង ក៏​ដូចជា​ស្បែកជើងពណ៌បៃតង មួកពណ៌បៃតង និង​សម្លៀកបំពាក់ពណ៌បៃតង​គ្រប់ប្រភេទ​សុទ្ធតែមានលក់នៅក្នុងហាង។ នៅកន្លែងមួយ មានបុរសម្នាក់​លក់​ទឹកក្រូចឆ្មារពណ៌បៃតង ហើយនៅ​​ពេលក្មេង​ៗ​ទិញ​ទឹកក្រូចឆ្មា​រនោះ ដូរ៉ូធី​បាន​សង្កេត​ឃើញថា ពួកគេ​បានប្រើកាក់ពណ៌បៃតងទៅទិញ។\n\nនៅ​ទីនោះ​ហាក់ដូចជា​គ្មាន​សត្វសេះ ឬ​សត្វផ្សេង​ទៀតសោះ។ ពួកគេ​ដឹក​ជញ្ជូន​សម្ភារទាំងអស់​តាម​រទេះ​​រុញ​ពណ៌បៃតងតូចៗ។ ពួកគេ​គ្រប់គ្នា​ហាក់បី​ដូចជា​មានសុភមង្គល ប្រកប​ដោយក្ដី​រីករាយ និង​ភាពសម្បូរ​សប្បាយ​ណាស់។"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ការ​ជ្រើសរើសទម្រង់"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ស្វ័យប្រវត្តិ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ដោយផ្ទាល់ដៃ"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ប្ដូរកម្រិតគុណភាពទៅ %1$s ឬ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ជ្រើសរើស \"យល់ព្រម\" ដើម្បីប្រើ %1$s ចាប់ពីពេល​នេះតទៅ។"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision មិនអាចប្រើបាននៅ %1$s ទេ ហើយនឹងត្រូវបានបិទនៅក្នុង \"ការកំណត់ការបង្ហាញកម្រិតខ្ពស់\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"មុខងារនេះអាចប្រើ %1$s បាន។ នៅលើទូរទស្សន៍មួយចំនួន អ្នកប្រហែលជាត្រូវបើក HDMI ដែលបានធ្វើឱ្យប្រសើរឡើង ដើម្បីបើកទម្រង់ HDR ច្រើនទៀត។ ពិនិត្យមើលការកំណត់ទូរទស្សន៍របស់អ្នក ដើម្បីមើលថាតើមុខងារនេះអាចប្រើបានដែរឬអត់។"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"មុខងារនេះស្គាល់៖ %1$s\nនៅលើទូរទស្សន៍មួយចំនួន អ្នកប្រហែលជាត្រូវបើក HDMI ដែលបានធ្វើឱ្យប្រសើរឡើង ដើម្បីបើកទម្រង់ HDR ច្រើនទៀត។ សូមពិនិត្យមើលការកំណត់ទូរទស្សន៍របស់អ្នក ដើម្បីមើលថាតើស្គាល់ HDMI នេះឬអត់។"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"បោះបង់"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"យល់ព្រម"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ជម្រះទិន្នន័យក្នុងឃ្លាំងសម្ងាត់?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"វានឹងជម្រះទិន្នន័យឃ្លាំងសម្រាប់កម្មវិធីទាំងអស់។"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"បានភ្ជាប់"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"បាន​ដាច់"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"អ្នក​មិន​មាន​សិទ្ធិ​ ដើម្បី​​ប្ដូរ​ការ​កំណត់​ប៊្លូធូស​ទេ។"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ប្រើ​សម្រាប់​សំឡេង​ទូរទស្សន៍"</string>
     <string name="send_feedback" msgid="936698637869795473">"ផ្ញើមតិកែលម្អ"</string>
     <string name="launch_help" msgid="2607478763131952469">"មជ្ឈមណ្ឌលជំនួយ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ឧបករណ៍​នេះ​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង​របស់ស្ថាប័ន​​អ្នក។"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ឧបករណ៍​នេះ​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង​របស់ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ។"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ស្វែងយល់បន្ថែម"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{កម្មវិធី​កាមេរ៉ា}other{កម្មវិធី​កាមេរ៉ា}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"កម្មវិធីប្រតិទិន"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"បើកដំណើរការ"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"ការ​កំណត់​រចនា​សម្ព័ន្ធ"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> អាច​ប្រមូល​អត្ថបទ​ទាំងអស់​ដែល​អ្នក​វាយ លើកលែង​ពាក្យ​សម្ងាត់។ នេះ​​រួមមាន​ទិន្នន័យ​ផ្ទាល់ខ្លួន ដូចជា​លេខ​កាត​ឥណទាន។"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ការតភ្ជាប់​ទទួលបាន​ជោគជ័យ​ហើយ"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"បង្ហាញ​ទាំងអស់"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"កំពុង​ស្វែងរក"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"មិនអាចទាញយក​ចេតនានៃការបញ្ចូលគណនី​ពីកម្មវិធីផ្ទៀងផ្ទាត់បានទេ។"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"មិនអាចបញ្ចូលគណនី ឬមិនមានប្រភេទគណនីនេះទេ។"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ប៉ុស្តិ៍ និងប្រភពបញ្ចូល"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ប៉ុស្ដិ៍ ប្រភពបញ្ចូលខាងក្រៅ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ប៉ុស្តិ៍"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"បើក៖"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"សូមកត់ចំណាំថា មុខងារនេះអាចបង្កើនការប្រើប្រាស់ថាមពលរបស់ឧបករណ៍។"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"បើក \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 873956771..0a80f29ce 100644
--- a/Settings/res/values-kn/energy-modes.xml
+++ b/Settings/res/values-kn/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ಅಗತ್ಯ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳು"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ಕಡಿಮೆ ವಿದ್ಯುತ್ ಬಳಕೆ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ಟಿವಿ ಬಳಕೆಯಲ್ಲಿ ಇಲ್ಲದಿದ್ದಾಗ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"ಮಹತ್ವದ ಅಪ್‌ಡೇಟ್‌ಗಳು ಹಾಗೂ ಫಂಕ್ಷನ್‌ಗಳು"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ಶಿಫಾರಸು ಮಾಡಲಾದ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳು"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾದ ವಿದ್ಯುತ್ ಬಳಕೆ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ನೆಟ್‌ವರ್ಕ್ ಮೂಲಕ ಟಿವಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಫೀಚರ್‌ಗಳನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ (ಸ್ಟ್ಯಾಂಡ್‌ಬೈ ಮೋಡ್)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[ಫೀಚರ್ 1 ಸೇರಿಸಿ]"</item>
     <item msgid="8724721267222341891">"[ಫೀಚರ್ 2 ಸೇರಿಸಿ]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ಹೆಚ್ಚುವರಿ ನೆಟ್‌ವರ್ಕ್ ಫೀಚರ್‌ಗಳು"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ಹೆಚ್ಚಿನ ವಿದ್ಯುತ್ ಬಳಕೆ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ಶಿಫಾರಸು ಮಾಡಲಾದ ಫೀಚರ್‌ಗಳ ಜೊತೆಗೆ, ಟಿವಿ ಬಳಕೆಯಲ್ಲಿ ಇಲ್ಲದಿದ್ದಾಗ ಈ ಆಯ್ಕೆಯು ಹೆಚ್ಚುವರಿ ಫೀಚರ್‌ಗಳನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ, ಅದು ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸಬಹುದು."</string>
+    <string 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-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 777878c99..9bd160017 100644
--- a/Settings/res/values-kn/strings.xml
+++ b/Settings/res/values-kn/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ಸ್ಥಳ, ಬಳಕೆ ಮತ್ತು ಡಯಾಗ್ನಾಸ್ಟಿಕ್ಸ್‌, ಜಾಹೀರಾತುಗಳು"</string>
     <string name="add_account" msgid="7386223854837017129">"ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"ಅಪರಿಚಿತ ಖಾತೆ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="account_sync" msgid="4315295293211313989">"ಸಿಂಕ್ ಆಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="sync_now" msgid="4335217984374620551">"ಈಗ ಸಿಂಕ್ ಮಾಡಿ"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ನೀವು HDR ಔಟ್‌ಪುಟ್ ಅನ್ನು ಒತ್ತಾಯಿಸಲು ಬಯಸುತ್ತೀರಾ?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ಡಿಫಾಲ್ಟ್ ಆಗಿ <xliff:g id="HDR_TYPE">%s</xliff:g> ಗೆ ಪರಿವರ್ತಿಸಲು ಒತ್ತಾಯಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ನಿಮ್ಮ ಡಿಸ್‌ಪ್ಲೇ 1080p 60 Hz ರೆಸಲ್ಯೂಶನ್‌ನಲ್ಲಿ ರನ್ ಆಗುತ್ತದೆ. 4k 60Hz ರೆಸಲ್ಯೂಶನ್‌ನಲ್ಲಿ ರನ್ ಆಗುವಾಗ ಈ ಆಯ್ಕೆಯು ನಿಮ್ಮ ಡಿಸ್‌ಪ್ಲೇ ಜೊತೆಗೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ಪ್ರಸ್ತುತ ರೆಸಲ್ಯೂಷನ್‌ನಲ್ಲಿ Dolby Vision ಬೆಂಬಲಿತವಾಗಿಲ್ಲ. ನೀವು Dolby Vision ಅನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ, ನಿಮ್ಮ ಡಿಸ್‌ಪ್ಲೇನ ರೆಸಲ್ಯೂಷನ್ ಅನ್ನು 1080p 60Hz ಗೆ ಬದಲಾಯಿಸಲಾಗುತ್ತದೆ"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ರೆಸಲ್ಯೂಷನ್ ಅನ್ನು 1080p 60Hz ಗೆ ಬದಲಾಯಿಸಬೇಕೇ?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ಯಾವಾಗಲೂ Dolby Vision ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿರುವ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳಲ್ಲಿ Dolby Vision ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, Dolby ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸುವುದರಿಂದ ಅದು ಮರು-ಸಕ್ರಿಯಗೊಳ್ಳುತ್ತದೆ."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ಯಾವಾಗಲೂ HDR10 ಗೆ ಬಲವಂತವಾಗಿ ಪರಿವರ್ತಿಸಿ"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ಮಾದರಿ ಪಠ್ಯ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ಓಜ್‌ನ ಅದ್ಭುತ ಮಾಂತ್ರಿಕ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ಅಧ್ಯಾಯ 11: ಓಜ್‌ನ ಅದ್ಭುತ ಪಚ್ಚೆ ನಗರ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ಡೋರೊಥಿ ಮತ್ತು ಅವಳ ಸ್ನೇಹಿತರು ತಮ್ಮ ಕಣ್ಣುಗಳ ರಕ್ಷಣೆಗಾಗಿ ಹಸಿರು ಕನ್ನಡಕಗಳನ್ನು ತೊಟ್ಟಿದ್ದರೂ ಸಹ ಆ ಅದ್ಭುತ ನಗರದ ವೈಭವ ಮೊದಲ ನೋಟದಲ್ಲೇ ಅವರ ಕಣ್ಣುಗಳನ್ನು ಕೋರೈಸಿತು. ಬೀದಿಗಳ ಇಕ್ಕೆಲಗಳಲ್ಲಿ ಹಸಿರು ಅಮೃತಶಿಲೆಗಳಿಂದ ಕಟ್ಟಲಾಗಿದ್ದ, ಮತ್ತು ಹೊಳೆಯುವ ಪಚ್ಚೆಗಳಿಂದ ಅಲಂಕರಿಸಲಾಗಿದ್ದ ಸುಂದರ ಮನೆಗಳಿದ್ದವು. ಅವರು ಅದೇ ಹಸಿರು ಅಮೃತಶಿಲೆಯ ಕಾಲುದಾರಿಯ ಮೇಲೆ ನಡೆದು ಸಾಗಿದರು, ಅಲ್ಲಿ ರಸ್ತೆಗಳು ಕೂಡುವ ಜಾಗದಲ್ಲಿ ಒತ್ತೊತ್ತಾಗಿ ಜೋಡಿಸಿದ್ದ ಪಚ್ಚೆಗಳ ಸಾಲುಗಳಿದ್ದವು ಮತ್ತು ಅವು ಸೂರ್ಯನ ಬೆಳಕಿಗೆ ಫಳಫಳ ಹೊಳೆಯುತ್ತಿದ್ದವು. ಕಿಟಕಿಯ ಫಲಕಗಳನ್ನು ಹಸಿರು ಗಾಜಿನಿಂದ ನಿರ್ಮಿಸಲಾಗಿತ್ತು; ನಗರದ ಮೇಲಿನ ಆಕಾಶದಲ್ಲಿಯೂ ಹಸಿರು ಬಣ್ಣದ ಛಾಯೆಯಿತ್ತು, ಮತ್ತು ಸೂರ್ಯನ ಕಿರಣಗಳೂ ಹಸಿರಾಗಿದ್ದವು. \n\nಅಲ್ಲಿ ಹಲವಾರು ಜನ ಗಂಡಸರು, ಹೆಂಗಸರು ಮತ್ತು ಮಕ್ಕಳು ಓಡಾಡುತ್ತಿದ್ದರು ಮತ್ತು ಅವರೆಲ್ಲರೂ ಹಸಿರು ಬಟ್ಟೆಗಳನ್ನು ತೊಟ್ಟಿದ್ದರು ಹಾಗೂ ಅವರ ಚರ್ಮವೂ ಹಸಿರಾಗಿತ್ತು. ಅವರು ಡೋರೊಥಿ ಹಾಗೂ ಅವಳ ಚಿತ್ರವಿಚಿತ್ರ ಜೊತೆಗಾರರನ್ನು ಆಶ್ಚರ್ಯಚಕಿತರಾಗಿ ನೋಡಿದರು ಮತ್ತು ಸಿಂಹವನ್ನು ಕಂಡ ಮಕ್ಕಳೆಲ್ಲ ಓಡಿಹೋಗಿ ತಮ್ಮ ತಮ್ಮ ತಾಯಂದಿರ ಹಿಂದೆ ಅಡಗಿಕೊಂಡರು; ಆದರೆ ಯಾರೂ ಇವರ ಜೊತೆ ಮಾತನಾಡಲಿಲ್ಲ. ಬೀದಿ ಬದಿಯಲ್ಲಿ ಅನೇಕ ಅಂಗಡಿಗಳಿದ್ದವು ಮತ್ತು ಅವುಗಳಲ್ಲಿದ್ದ ಎಲ್ಲಾ ವಸ್ತುಗಳು ಹಸಿರು ಬಣ್ಣದಲ್ಲಿದ್ದದ್ದು ಡೋರೊಥಿಗೆ ಕಾಣಿಸಿತು. ಹಸಿರು ಕ್ಯಾಂಡಿ ಮತ್ತು ಹಸಿರು ಪಾಪ್‌ ಕಾರ್ನ್ ಮಾರಾಟಕ್ಕಿದ್ದವು, ಜೊತೆಗೆ ಹಸಿರು ಶೂಗಳು, ಹಸಿರು ಟೋಪಿಗಳು ಮತ್ತು ವಿವಿಧ ಬಗೆಯ ಹಸಿರು ಬಟ್ಟೆಗಳಿದ್ದವು. ಒಂದು ಕಡೆ ವ್ಯಕ್ತಿಯೊಬ್ಬ ಹಸಿರು ಬಣ್ಣದ ನಿಂಬೆ ಪಾನಕ ಮಾರುತ್ತಿದ್ದ ಮತ್ತು ಅದನ್ನು ಖರೀದಿಸಿದ ಮಕ್ಕಳು ಅವನಿಗೆ ಹಸಿರು ಪೆನ್ನೀಗಳನ್ನು ಪಾವತಿಸಿದ್ದನ್ನು ಡೋರೊಥಿ ನೋಡಿದಳು. \n\n ಅಲ್ಲಿ ಕುದುರೆಗಳು ಅಥವಾ ಯಾವುದೇ ರೀತಿಯ ಪ್ರಾಣಿಗಳು ಇದ್ದಂತೆ ಕಾಣಲಿಲ್ಲ; ಅಲ್ಲಿನ ಗಂಡಸರು ಹಸಿರು ಬಣ್ಣದ ಸಣ್ಣ ಬಂಡಿಗಳಲ್ಲಿ ಸರಕುಗಳನ್ನು ಅತ್ತಿಂದಿತ್ತ ಕೊಂಡೊಯ್ಯುತ್ತಿದ್ದರು, ಅವರು ಆ ಬಂಡಿಗಳನ್ನು ತಳ್ಳಿಕೊಂಡೇ ಸಾಗಿಸುತ್ತಿದ್ದರು. ಪ್ರತಿಯೊಬ್ಬರೂ ಸಂತೋಷವಾಗಿರುವಂತೆ, ತೃಪ್ತರಾಗಿರುವಂತೆ ಹಾಗೂ ಸಮೃದ್ಧರಾಗಿರುವಂತೆ ತೋರುತ್ತಿತ್ತು."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ಡೋರೊಥಿ ಮತ್ತು ಅವಳ ಸ್ನೇಹಿತರು ತಮ್ಮ ಕಣ್ಣುಗಳ ರಕ್ಷಣೆಗಾಗಿ ಹಸಿರು ಕನ್ನಡಕಗಳನ್ನು ತೊಟ್ಟಿದ್ದರೂ ಸಹ ಆ ಅದ್ಭುತ ನಗರದ ವೈಭವ ಮೊದಲ ನೋಟದಲ್ಲೇ ಅವರ ಕಣ್ಣುಗಳನ್ನು ಕೋರೈಸಿತು. ಬೀದಿಗಳ ಇಕ್ಕೆಲಗಳಲ್ಲಿ ಹಸಿರು ಅಮೃತಶಿಲೆಗಳಿಂದ ಕಟ್ಟಲಾಗಿದ್ದ ಮತ್ತು ಹೊಳೆಯುವ ಪಚ್ಚೆಗಳಿಂದ ಅಲಂಕರಿಸಲಾಗಿದ್ದ ಸುಂದರ ಮನೆಗಳಿದ್ದವು. ಅವರು ಅದೇ ಹಸಿರು ಅಮೃತಶಿಲೆಯ ಕಾಲುದಾರಿಯ ಮೇಲೆ ನಡೆದು ಸಾಗಿದರು, ಅಲ್ಲಿ ರಸ್ತೆಗಳು ಕೂಡುವ ಜಾಗದಲ್ಲಿ ಒತ್ತೊತ್ತಾಗಿ ಜೋಡಿಸಿದ್ದ ಪಚ್ಚೆಗಳ ಸಾಲುಗಳಿದ್ದವು ಮತ್ತು ಅವು ಸೂರ್ಯನ ಬೆಳಕಿಗೆ ಫಳಫಳ ಹೊಳೆಯುತ್ತಿದ್ದವು. ಕಿಟಕಿಯ ಫಲಕಗಳನ್ನು ಹಸಿರು ಗಾಜಿನಿಂದ ನಿರ್ಮಿಸಲಾಗಿತ್ತು; ನಗರದ ಮೇಲಿನ ಆಕಾಶದಲ್ಲಿಯೂ ಹಸಿರು ಬಣ್ಣದ ಛಾಯೆಯಿತ್ತು, ಮತ್ತು ಸೂರ್ಯನ ಕಿರಣಗಳೂ ಹಸಿರಾಗಿದ್ದವು. \n\nಅಲ್ಲಿ ಹಲವಾರು ಜನ, ಗಂಡಸರು, ಹೆಂಗಸರು ಮತ್ತು ಮಕ್ಕಳು ಓಡಾಡುತ್ತಿದ್ದರು ಹಾಗೂ ಅವರೆಲ್ಲರೂ ಹಸಿರು ಬಟ್ಟೆಗಳನ್ನು ತೊಟ್ಟಿದ್ದರು ಮತ್ತು ಅವರ ಚರ್ಮವೂ ಹಸಿರಾಗಿತ್ತು. ಅವರು ಡೋರೊಥಿ ಹಾಗೂ ಅವಳ ಚಿತ್ರವಿಚಿತ್ರ ಜೊತೆಗಾರರನ್ನು ಆಶ್ಚರ್ಯಚಕಿತರಾಗಿ ನೋಡಿದರು ಮತ್ತು ಸಿಂಹವನ್ನು ಕಂಡ ಮಕ್ಕಳೆಲ್ಲ ಓಡಿಹೋಗಿ ತಮ್ಮ ತಾಯಂದಿರ ಹಿಂದೆ ಅಡಗಿಕೊಂಡರು; ಆದರೆ ಯಾರೂ ಇವರ ಜೊತೆ ಮಾತನಾಡಲಿಲ್ಲ. ಬೀದಿ ಬದಿಯಲ್ಲಿ ಅನೇಕ ಅಂಗಡಿಗಳಿದ್ದವು ಮತ್ತು ಅವುಗಳಲ್ಲಿದ್ದ ಎಲ್ಲಾ ವಸ್ತುಗಳು ಹಸಿರು ಬಣ್ಣದಲ್ಲಿದ್ದದ್ದನ್ನು ಡೋರೊಥಿ ಗಮನಿಸಿದಳು. ಹಸಿರು ಕ್ಯಾಂಡಿ ಮತ್ತು ಹಸಿರು ಪಾಪ್ ಕಾರ್ನ್ ಮಾರಾಟಕ್ಕಿದ್ದವು, ಜೊತೆಗೆ ಹಸಿರು ಶೂಗಳು, ಹಸಿರು ಟೋಪಿಗಳು ಮತ್ತು ವಿವಿಧ ಬಗೆಯ ಹಸಿರು ಬಟ್ಟೆಗಳಿದ್ದವು. ಒಂದು ಕಡೆ ವ್ಯಕ್ತಿಯೊಬ್ಬ ಹಸಿರು ಬಣ್ಣದ ನಿಂಬೆ ಪಾನಕ ಮಾರುತ್ತಿದ್ದ ಮತ್ತು ಅದನ್ನು ಖರೀದಿಸಿದ ಮಕ್ಕಳು ಅವನಿಗೆ ಹಸಿರು ಪೆನ್ನೀಗಳನ್ನು ಪಾವತಿಸಿದ್ದನ್ನು ಡೋರೊಥಿ ನೋಡಿದಳು. \n\nಅಲ್ಲಿ ಕುದುರೆಗಳಾಗಲೀ, ಬೇರೆ ಯಾವುದೇ ರೀತಿಯ ಪ್ರಾಣಿಗಳಾಗಲೀ ಇದ್ದಂತೆ ಕಾಣಲಿಲ್ಲ; ಅಲ್ಲಿನ ಗಂಡಸರು ಹಸಿರು ಬಣ್ಣದ ಸಣ್ಣ ಬಂಡಿಗಳಲ್ಲಿ ಸರಕುಗಳನ್ನು ಅತ್ತಿಂದಿತ್ತ ಕೊಂಡೊಯ್ಯುತ್ತಿದ್ದರು, ಅವರು ಆ ಬಂಡಿಗಳನ್ನು ತಳ್ಳಿಕೊಂಡೇ ಸಾಗಿಸುತ್ತಿದ್ದರು. ಪ್ರತಿಯೊಬ್ಬರೂ ಸಂತೋಷವಾಗಿರುವಂತೆ, ತೃಪ್ತರಾಗಿರುವಂತೆ ಹಾಗೂ ಸಮೃದ್ಧರಾಗಿರುವಂತೆ ತೋರುತ್ತಿತ್ತು."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ಫಾರ್ಮ್ಯಾಟ್ ಆಯ್ಕೆ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ಸ್ವಯಂಚಾಲಿತ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ಹಸ್ತಚಾಲಿತ"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ರೆಸಲ್ಯೂಷನ್‌‌ ಅನ್ನು %1$s ಗೆ ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ಈಗಿನಿಂದ %1$s ಬಳಸಲು ಸರಿ ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s ನಲ್ಲಿ ಡಾಲ್ಬಿ ವಿಷನ್ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ ಮತ್ತು ಅದನ್ನು \"ಸುಧಾರಿತ ಡಿಸ್‌ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ\" ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ಈ ಮೋಡ್ %1$s ಅನ್ನು ಬೆಂಬಲಿಸುತ್ತದೆ. ಕೆಲವು ಟಿವಿಗಳಲ್ಲಿ, ಹೆಚ್ಚಿನ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ನೀವು ವರ್ಧಿತ HDMI ಅನ್ನು ಆನ್ ಮಾಡಬೇಕಾಗಬಹುದು. ಇದು ಬೆಂಬಲಿತವಾಗಿದೆಯೇ ಎಂದು ನೋಡಲು ನಿಮ್ಮ ಟಿವಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ಈ ಮೋಡ್ ಇವುಗಳನ್ನು ಬೆಂಬಲಿಸುತ್ತದೆ: %1$s\nಕೆಲವು ಟಿವಿಗಳಲ್ಲಿ, ಹೆಚ್ಚಿನ HDR ಫಾರ್ಮ್ಯಾಟ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ನೀವು ವರ್ಧಿತ HDMI ಅನ್ನು ಆನ್ ಮಾಡಬೇಕಾಗಬಹುದು. ಇದು ಬೆಂಬಲಿತವಾಗಿದೆಯೇ ಎಂದು ನೋಡಲು ನಿಮ್ಮ ಟಿವಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ರದ್ದುಗೊಳಿಸಿ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ಸರಿ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ಸಂಗ್ರಹ ಡೇಟಾವನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸಂಗ್ರಹ ಡೇಟಾವನ್ನು ಇದು ತೆರುವುಗೊಳಿಸುತ್ತದೆ."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -249,7 +247,7 @@
     <string name="error_action_not_supported" msgid="5377532621386080296">"ಈ ಕ್ರಮ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
     <string name="bluetooth_pairing_request" msgid="6120176967230348092">"ಬ್ಲೂಟೂತ್ ಜೋಡಣೆ ವಿನಂತಿ"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="7397401633869153520">"ಇದರೊಂದಿಗೆ ಜೋಡಿಸಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, ಈ ಪಾಸ್‌ಕೀಯನ್ನು ಅದು ತೋರಿಸುತ್ತಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"ಇಂದ: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡುವುದೇ?"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="8587851808387685613">"ಇಂದ: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಬೇಕೆ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="6934651048757228432">"ಇದರ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;ಇದರಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ: &lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;, ನಂತರ ಹಿಂತಿರುಗು ಅಥವಾ ನಮೂದಿಸು ಒತ್ತಿರಿ."</string>
     <string name="bluetooth_enter_pin_msg" msgid="8905524093007140634">"ಇದರ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;ಸಾಧನಕ್ಕೆ ಅಗತ್ಯವಿರುವ PIN ಟೈಪ್ ಮಾಡಿ:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="889584097447402492">"ಇದರೊಂದಿಗೆ ಜೋಡಿ ಮಾಡಲು: &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;ಸಾಧನದ ಅಗತ್ಯವಿರುವ ಪಾಸ್‌ಕೀಲಿ ಟೈಪ್ ಮಾಡಿ:"</string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ಡಿಸ್‌ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಅನುಮತಿ ಹೊಂದಿಲ್ಲ."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ಟಿವಿ ಆಡಿಯೋಗಾಗಿ ಬಳಸಿ"</string>
     <string name="send_feedback" msgid="936698637869795473">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
     <string name="launch_help" msgid="2607478763131952469">"ಸಹಾಯ ಕೇಂದ್ರ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -289,7 +288,7 @@
     <string name="system_keyboard" msgid="1514460705385401872">"ಕೀಬೋರ್ಡ್"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"ಕೀಬೋರ್ಡ್‌ ಮತ್ತು ಸ್ವಯಂ ಭರ್ತಿ"</string>
     <string name="system_autofill" msgid="6983989261108020046">"ಸ್ವಯಂ ಭರ್ತಿ"</string>
-    <string name="system_home" msgid="2149349845791104094">"ಮುಖಪುಟ ಪರದೆ"</string>
+    <string name="system_home" msgid="2149349845791104094">"ಹೋಮ್ ಸ್ಕ್ರೀನ್"</string>
     <string name="system_search" msgid="3170169128257586925">"Search"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
     <string name="system_security" msgid="1012999639810957132">"ಭದ್ರತೆ &amp; ನಿರ್ಬಂಧಗಳು"</string>
@@ -309,10 +308,10 @@
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"ನಿರ್ವಹಿಸುವ ಸಾಧನದ ಮಾಹಿತಿ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿರ್ವಹಿಸುವ ಬದಲಾವಣೆಗಳು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="2866704039759872293">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುವ ಬದಲಾವಣೆಗಳು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="enterprise_privacy_header" msgid="9221881402582661521">"ನಿಮ್ಮ ಕೆಲಸದ ಡೇಟಾಗೆ ಪ್ರವೇಶ ಒದಗಿಸಲು, ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಬಹುದು ಮತ್ತು ಸಾಫ್ಟ್‌ವೇರ್ ಸ್ಥಾಪಿಸಬಹುದು.\n\nಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
+    <string name="enterprise_privacy_header" msgid="9221881402582661521">"ನಿಮ್ಮ ಕೆಲಸದ ಡೇಟಾಗೆ ಆ್ಯಕ್ಸೆಸ್ ಒದಗಿಸಲು, ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಬಹುದು ಮತ್ತು ಸಾಫ್ಟ್‌ವೇರ್ ಸ್ಥಾಪಿಸಬಹುದು.\n\nಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನೋಡಬಹುದಾದ ಮಾಹಿತಿಯ ವಿಧಗಳು"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರು ಮಾಡಿರುವ ಬದಲಾವಣೆಗಳು"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"ಈ ಸಾಧನಕ್ಕೆ ನಿಮ್ಮ ಪ್ರವೇಶ"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"ಈ ಸಾಧನಕ್ಕೆ ನಿಮ್ಮ ಆ್ಯಕ್ಸೆಸ್"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"ಇಮೇಲ್‌ ಮತ್ತು ಕ್ಯಾಲೆಂಡರ್‌‌ನಂತಹ ನಿಮ್ಮ ಕೆಲಸದ ಖಾತೆಯ ಜೊತೆಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ ಡೇಟಾ"</string>
     <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಪಟ್ಟಿ"</string>
     <string name="enterprise_privacy_usage_stats" msgid="7062422823174345793">"ಪ್ರತಿ ಅಪ್ಲಿಕೇಶನ್‌ನಲ್ಲಿ ವ್ಯಯಿಸಿದ ಸಮಯ ಮತ್ತು ದಿನಾಂಕ"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ಈ ಸಾಧನವನ್ನು ನಿಮ್ಮ ಸಂಸ್ಥೆ ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ಕ್ಯಾಮರಾ ಆ್ಯಪ್}one{ಕ್ಯಾಮರಾ ಆ್ಯಪ್‌ಗಳು}other{ಕ್ಯಾಮರಾ ಆ್ಯಪ್‌ಗಳು}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ಕ್ಯಾಲೆಂಡರ್ ಅಪ್ಲಿಕೇಶನ್"</string>
@@ -457,7 +455,7 @@
     <string name="title_wifi_could_not_connect_timeout" msgid="7825788623604214601">"<xliff:g id="SSID">%1$s</xliff:g> ಹುಡುಕಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="title_wifi_could_not_connect_authentication_failure" msgid="6626386897327862432">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್ ಮಾನ್ಯವಾಗಿಲ್ಲ"</string>
     <string name="title_wifi_could_not_connect_ap_reject" msgid="5182833781690447828">"ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕವನ್ನು ಸಮ್ಮತಿಸಿಲ್ಲ"</string>
-    <string name="title_wifi_advanced_options" msgid="371185991282743258">"<xliff:g id="SSID">%1$s</xliff:g> ಪ್ರಾಕ್ಸಿ ಮತ್ತು IP ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡುವುದೇ?"</string>
+    <string name="title_wifi_advanced_options" msgid="371185991282743258">"<xliff:g id="SSID">%1$s</xliff:g> ಪ್ರಾಕ್ಸಿ ಮತ್ತು IP ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಬೇಕೆ?"</string>
     <string name="title_wifi_proxy_settings" msgid="1933444342984660569">"ಪ್ರಾಕ್ಸಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="title_wifi_proxy_hostname" msgid="1242297002220870385">"ಪ್ರಾಕ್ಸಿ ಹೋಸ್ಟ್‌ಹೆಸರು:"</string>
     <string name="title_wifi_proxy_port" msgid="566244407030390328">"ಪ್ರಾಕ್ಸಿ ಪೋರ್ಟ್:"</string>
@@ -632,12 +630,12 @@
     <string name="microphone" msgid="7893752847683941214">"ಮೈಕ್ರೊಫೋನ್"</string>
     <string name="mic_toggle_title" msgid="7193417007060235665">"ಮೈಕ್ರೊಫೋನ್ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
     <string name="mic_remote_toggle_title" msgid="7153283895012570080">"ನಿಮ್ಮ ರಿಮೋಟ್‌ನಲ್ಲಿ ಮೈಕ್ರೊಫೋನ್ ಆ್ಯಕ್ಸೆಸ್"</string>
-    <string name="open_mic_permissions" msgid="8121871594807641073">"ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಆ್ಯಪ್‌ನ ಪ್ರವೇಶ"</string>
+    <string name="open_mic_permissions" msgid="8121871594807641073">"ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಆ್ಯಪ್‌ನ ಆ್ಯಕ್ಸೆಸ್"</string>
     <string name="microphone_physical_privacy_enabled_title" msgid="6135130916399886772">"ಮೈಕ್ರೊಫೋನ್ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="microphone_physical_privacy_enabled_text" msgid="401238365312924088">"ನಿರ್ಬಂಧವನ್ನು ತೆಗೆದುಹಾಕಲು, ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸಾಧನದ ಗೌಪ್ಯತೆ ಸ್ವಿಚ್ ಅನ್ನು ಮೈಕ್ರೊಫೋನ್ ಆನ್ ಸ್ಥಾನಕ್ಕೆ ಸರಿಸಿ."</string>
     <string name="camera" msgid="1226671478936288283">"ಕ್ಯಾಮರಾ"</string>
     <string name="camera_toggle_title" msgid="5566469574224956142">"ಕ್ಯಾಮರಾ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
-    <string name="open_camera_permissions" msgid="301360297337141591">"ಕ್ಯಾಮರಾ‌ಗೆ ಆ್ಯಪ್‌ನ ಪ್ರವೇಶ"</string>
+    <string name="open_camera_permissions" msgid="301360297337141591">"ಕ್ಯಾಮರಾ‌ಗೆ ಆ್ಯಪ್‌ನ ಆ್ಯಕ್ಸೆಸ್"</string>
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"ಕ್ಯಾಮರಾ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="camera_physical_privacy_enabled_text" msgid="6692088634676282779">"ನಿರ್ಬಂಧವನ್ನು ತೆಗೆದುಹಾಕಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸಾಧನದ ಗೌಪ್ಯತೆ ಸ್ವಿಚ್ ಅನ್ನು ಕ್ಯಾಮರಾ ಆನ್ ಸ್ಥಾನಕ್ಕೆ ಸರಿಸಿ."</string>
     <string name="mic_toggle_info_title" msgid="1086545614315873599">"ಮೈಕ್ರೊಫೋನ್‌ ಪ್ರವೇಶದ ಅನುಮತಿ: <xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"ಕಾನ್ಫಿಗರೇಶನ್‌"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ಬಳಸುವುದೇ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ನೀವು ಟೈಪ್ ಮಾಡುವ ಎಲ್ಲಾ ಪಠ್ಯವನ್ನು <xliff:g id="SERVICE">%1$s</xliff:g> ಸಂಗ್ರಹಿಸಬಹುದು. ಇದು ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಸಂಖ್ಯೆಗಳ ರೀತಿಯ ವೈಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1024,8 +1022,8 @@
     <string name="high_power_on" msgid="3120162683093360951">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="high_power_off" msgid="3588854600942236231">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="high_power_system" msgid="6263052626979462255">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="manage_notification_access_title" msgid="8659254371564990084">"ಅಧಿಸೂಚನೆ ಆ್ಯಕ್ಸೆಸ್"</string>
-    <string name="no_notification_listeners" msgid="5119406452675724448">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ."</string>
+    <string name="manage_notification_access_title" msgid="8659254371564990084">"ನೋಟಿಫಿಕೇಶನ್ ಆ್ಯಕ್ಸೆಸ್"</string>
+    <string name="no_notification_listeners" msgid="5119406452675724448">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಆ್ಯಪ್‍ಗಳು ನೋಟಿಫಿಕೇಶನ್ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"ಸಂಪರ್ಕ ಹೆಸರುಗಳು ಮತ್ತು ನೀವು ಸ್ವೀಕರಿಸುವ ಸಂದೇಶಗಳ ಪಠ್ಯದಂತಹ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಸೇರಿದಂತೆ ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಎಲ್ಲ ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. ಇವುಗಳಿಗೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾ ಮಾಡಲು ಅಥವಾ ಅವುಗಳು ಹೊಂದಿರುವಂತಹ ಕ್ರಿಯೆ ಬಟನ್‌ಗಳನ್ನು ಟ್ರಿಗ್ಗರ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
     <string name="default_notification_access_package_summary" msgid="1354775994781420222">"ಸಿಸ್ಟಂಗೆ ಅಗತ್ಯವಿದೆ"</string>
     <string name="directory_access" msgid="7338555825237012006">"ಡೈರೆಕ್ಟರಿ ಆ್ಯಕ್ಸೆಸ್"</string>
@@ -1039,7 +1037,7 @@
     <string name="write_settings_description" msgid="7382397926674265937">"ಈ ಅನುಮತಿಯು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="write_settings_on" msgid="71675710746513956">"ಹೌದು"</string>
     <string name="write_settings_off" msgid="6730113471695092167">"ಇಲ್ಲ"</string>
-    <string name="manage_external_storage_title" msgid="8139593207533811077">"ಎಲ್ಲಾ ಫೈಲ್‌ಗಳ ಪ್ರವೇಶ"</string>
+    <string name="manage_external_storage_title" msgid="8139593207533811077">"ಎಲ್ಲಾ ಫೈಲ್‌ಗಳ ಆ್ಯಕ್ಸೆಸ್"</string>
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"ಎಲ್ಲಾ ಫೈಲ್‌ ನಿರ್ವಹಿಸಲು, ಪ್ರವೇಶಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
     <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"ಈ ಸಾಧನ ಅಥವಾ ಕನೆಕ್ಟ್ ಮಾಡಿದ ಶೇಖರಣಾ ವಾಲ್ಯೂಮ್‌ಗಳಲ್ಲಿ ಎಲ್ಲಾ ಫೈಲ್‌ಗಳನ್ನು ಓದಲು, ಮಾರ್ಪಡಿಸಲು ಮತ್ತು ಅಳಿಸಲು ಈ ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸಿ. ಅನುಮತಿಸಿದರೆ, ಬಳಕೆದಾರರ ಪೂರ್ವಾನುಮತಿ ಇಲ್ಲದೆ ಆ್ಯಪ್‌ಗಳು ಫೈಲ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಬಹುದು."</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ"</string>
@@ -1082,9 +1080,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"ಈ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"ನಿಮಗೆ ಯಾವುದೇ ಪ್ರಶ್ನೆಗಳಿದ್ದರೆ, ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
-    <string name="admin_profile_owner_message" msgid="5729169873349157622">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
-    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
-    <string name="admin_device_owner_message" msgid="1935507216776040907">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಸಾಧನಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="admin_profile_owner_message" msgid="5729169873349157622">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಆ್ಯಕ್ಸೆಸ್, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಆ್ಯಕ್ಸೆಸ್, ನೆಟ್‌‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="admin_device_owner_message" msgid="1935507216776040907">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಆ್ಯಕ್ಸೆಸ್, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಸಾಧನಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ತೆಗೆದುಹಾಕಿ"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"ಈ ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ಕನೆಕ್ಷನ್ ಯಶಸ್ವಿಯಾಗಿದೆ"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"ಎಲ್ಲವನ್ನೂ ತೋರಿಸಿ"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ಅಥೆಂಟಿಕೇಟರ್‌ನಿಂದ ಖಾತೆಯನ್ನು ಸೇರಿಸುವ ಉದ್ದೇಶವನ್ನು ಹಿಂಪಡೆಯಲು ವಿಫಲವಾಗಿದೆ."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ಖಾತೆಯನ್ನು ಸೇರಿಸಲು ವಿಫಲವಾಗಿದೆ ಅಥವಾ ಖಾತೆಯ ಪ್ರಕಾರವು ಲಭ್ಯವಿಲ್ಲ."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ಚಾನಲ್‌ಗಳು &amp; ಇನ್‌ಪುಟ್‌ಗಳು"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ಚಾನಲ್‌ಗಳು, ಬಾಹ್ಯ ಇನ್‌ಪುಟ್‌ಗಳು"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ಚಾನಲ್‌ಗಳು"</string>
@@ -1118,7 +1118,7 @@
     <string name="picture_settings_title" msgid="7643193630924322697">"ಚಿತ್ರ"</string>
     <string name="screen_settings_title" msgid="7806908869190824434">"ಸ್ಕ್ರೀನ್"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"ಧ್ವನಿ"</string>
-    <string name="power_and_energy" msgid="4638182439670702556">"ವಿದ್ಯುತ್ &amp; ಶಕ್ತಿ"</string>
+    <string name="power_and_energy" msgid="4638182439670702556">"ವಿದ್ಯುತ್ ಮತ್ತು ಶಕ್ತಿ"</string>
     <string name="power_on_behavior" msgid="927607372303160716">"ಪವರ್ ಆನ್ ನಡವಳಿಕೆ"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"ಮರುಹೊಂದಿಸಿ"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"ಇಥರ್ನೆಟ್ ಜೋಡಣೆ ಕೋಡ್‌"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ಇವುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ಈ ಮೋಡ್, ಸಾಧನದ ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸಬಹುದು ಎಂಬುದನ್ನು ಗಮನಿಸಿ."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <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_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 33a74313d..ecc4ce116 100644
--- a/Settings/res/values-ko/energy-modes.xml
+++ b/Settings/res/values-ko/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"필수 네트워크 기능"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"적은 에너지 사용량"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV를 사용하지 않을 때는 네트워크 연결을 사용 중지합니다."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"중요 업데이트 및 기능"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"권장 네트워크 기능"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"최적화된 에너지 사용"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"네트워크를 통해 TV의 절전 모드를 해제하는 기능(네트워크 대기 모드)을 사용 설정합니다."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[기능 1 삽입]"</item>
     <item msgid="8724721267222341891">"[기능 2 삽입]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"추가 네트워크 기능"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"에너지 사용량 증가"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"이 옵션은 TV를 사용하지 않을 때도 권장 기능 외에 추가 기능을 사용 설정하며, 이에 따라 에너지 사용량이 증가할 수 있습니다."</string>
+    <string 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-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 446247dac..7b9cd5667 100644
--- a/Settings/res/values-ko/strings.xml
+++ b/Settings/res/values-ko/strings.xml
@@ -57,7 +57,7 @@
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"리모컨 및 액세서리"</string>
     <string name="display_and_sound_category_title" msgid="9203309625380755860">"화면 및 소리"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"고객센터"</string>
-    <string name="privacy_category_title" msgid="8552430590908463601">"개인정보 보호"</string>
+    <string name="privacy_category_title" msgid="8552430590908463601">"개인 정보 보호"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"기기 설정"</string>
     <string name="privacy_account_settings_category" msgid="5786591549945777400">"계정 설정"</string>
     <string name="privacy_assistant_settings_title" msgid="4524957824712623680">"Google 어시스턴트"</string>
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"앱 설정"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"위치, 사용 및 진단, 광고"</string>
     <string name="add_account" msgid="7386223854837017129">"계정 추가"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"알 수 없는 계정"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"계정 삭제"</string>
     <string name="account_sync" msgid="4315295293211313989">"동기화된 앱 선택"</string>
     <string name="sync_now" msgid="4335217984374620551">"지금 동기화"</string>
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"초기화"</string>
     <string name="device_calibration" msgid="2907914144048739705">"보정"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"전원 끄기 타이머"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV 전원을 끄는 타이머를 설정하여 에너지를 절약합니다."</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV 전원을 끄는 타이머를 설정하여 에너지 절약"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"기기"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"형식 선택"</string>
@@ -152,14 +153,14 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"고급 소리 설정"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"게임 모드 허용"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"다이내믹 레인지 콘텐츠와 맞춤"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"이 옵션을 사용 설정하면 시스템에서 콘텐츠에 맞추어 다이내믹 레인지 형식을 전환합니다. 형식을 전환하는 중 검은색 화면이 표시될 수 있습니다.\n\n고급 디스플레이 설정을 클릭하여 더 많은 다이내믹 레인지 옵션을 확인하세요."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"이 옵션을 사용 설정하면 시스템에서 콘텐츠에 맞춰 다이내믹 레인지 형식을 전환합니다. 형식이 전환되는 동안 검은색 화면이 표시될 수 있습니다.\n\n고급 화면 설정을 클릭하여 더 많은 다이내믹 레인지 옵션을 확인하세요."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"선호하는 다이내믹 레인지"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"시스템 선호 전환"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"시스템에서 형식 전환을 관리하도록 함"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"이 옵션이 선택되면 시스템에서 디스플레이에 전송할 적절한 동적 범위를 결정하고 필요에 따라 콘텐츠를 이 동적 범위로 전환합니다."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"이 옵션이 선택되면 시스템에서 디스플레이에 전송할 적절한 다이내믹 레인지를 결정하고 필요에 따라 콘텐츠를 이 다이내믹 레인지로 전환합니다."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"항상 콘텐츠 형식에 맞춤"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"강제 전환"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"원하는 형식으로 강제로 전환됩니다."</string>
+    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"원하는 형식으로 강제 전환"</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"원하는 형식으로 강제로 전환됩니다. 강제로 전환하면 디스플레이 모드 또는 HDR 형식의 다른 설정에 영향을 미칠 수도 있습니다."</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"항상 SDR로 전환"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"항상 <xliff:g id="HDR_TYPE">%s</xliff:g> 형식으로 전환"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"샘플 텍스트"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"오즈의 마법사"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11장: 오즈의 멋진 에메랄드 도시"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"도로시와 친구들은 녹색 안경으로 눈을 보호하고 있었는데도 처음에는 휘황찬란한 도시에 눈이 부셨습니다. 거리에는 녹색 대리석으로 지은 아름다운 집이 늘어서 있고 어디든지 반짝이는 에메랄드가 박혀 있었습니다. 같은 녹색 대리석으로 된 도로를 따라 걷는데 블록이 만나는 곳에는 에메랄드가 줄지어 촘촘히 박혀 있어서 햇빛에 반짝거리고 있었습니다. 창문이 녹색 유리로 되어 있었으며, 도시를 덮고 있는 하늘도 녹색을 띠고 있고 햇빛도 녹색이었습니다. \n\n남녀노소 많은 사람이 걸어 다니고 있었는데 모두 녹색 옷을 입고 피부도 녹색을 띠고 있었습니다. 도로시의 별난 무리를 놀란 눈으로 쳐다보았으며 아이들은 사자를 보자 도망가서 엄마 뒤로 숨었지만, 말을 거는 사람은 없었습니다. 거리에 많은 상점이 있었으며 도로시가 들여다보니 안에 있는 모든 것이 녹색이었습니다. 녹색 사탕과 녹색 팝콘 그리고 갖가지 녹색 신발, 녹색 모자, 녹색 옷을 팔고 있었습니다. 한 남자가 녹색 레모네이드를 팔고 있는 곳이 있었는데 도로시가 보니 아이들이 레모네이드를 살 때 녹색 동전을 내고 있었습니다. \n\n말을 비롯해 어떤 동물도 없는 것 같았고, 남자들이 작은 녹색 손수레에 짐을 싣고 밀어서 운반했습니다. 모두 행복하고 만족스러우며 풍족해 보였습니다."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"도로시와 친구들은 녹색 안경으로 눈을 보호하고 있었는데도 처음에는 휘황찬란한 도시에 눈이 부셨습니다. 거리에는 녹색 대리석으로 지은 아름다운 집이 늘어서 있고 어디든지 반짝이는 에메랄드가 박혀 있었습니다. 같은 녹색 대리석으로 된 도로를 따라 걷는데 블록이 만나는 곳에는 에메랄드가 줄지어 촘촘히 박혀 있어서 햇빛에 반짝거리고 있었습니다. 창문이 녹색 유리로 되어 있었으며, 도시를 덮고 있는 하늘도 녹색을 띠고 있고 햇빛도 녹색이었습니다. \n\n남녀노소 많은 사람이 걸어 다니고 있었는데 모두 녹색 옷을 입고 피부도 녹색을 띠고 있었습니다. 사람들은 도로시의 별난 무리를 놀란 눈으로 쳐다보았으며 아이들은 사자를 보자 도망가서 엄마 뒤로 숨었지만, 말을 거는 사람은 없었습니다. 거리에 많은 상점이 있었으며 도로시가 들여다보니 안에 있는 모든 것이 녹색이었습니다. 녹색 사탕과 녹색 팝콘 그리고 갖가지 녹색 신발, 녹색 모자, 녹색 옷을 팔고 있었습니다. 한 남자가 녹색 레모네이드를 팔고 있는 곳이 있었는데 도로시가 보니 아이들이 레모네이드를 살 때 녹색 동전을 내고 있었습니다. \n\n말을 비롯해 어떤 동물도 없는 것 같았고, 남자들이 작은 녹색 손수레에 짐을 싣고 밀어서 운반했습니다. 모두 행복하고 만족스러우며 풍족해 보였습니다."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"형식 선택"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"자동"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"수동"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"해상도를 %1$s(으)로 변경하시겠습니까?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"지금부터 %1$s 해상도를 사용하려면 확인을 선택하세요."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision은 %1$s에서 지원되지 않으므로 \'고급 디스플레이 설정\'에서 사용 중지됩니다."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"이 모드는 %1$s 유형을 지원합니다. 일부 TV에서 더 많은 HDR 형식을 사용하려면 향상된 HDMI를 사용 설정해야 할 수 있습니다. TV 설정에서 지원 여부를 확인하세요."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"이 모드에서 지원하는 형식: %1$s\n일부 TV에서 더 많은 HDR 형식을 사용하려면 향상된 HDMI를 사용 설정해야 할 수 있습니다. TV 설정에서 지원 여부를 확인하세요."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"취소"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"확인"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g>(<xliff:g id="REFRESH_RATE">%2$s</xliff:g>Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"캐시된 데이터를 지우시겠습니까?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"모든 앱의 캐시된 데이터가 지워집니다."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"연결됨"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"연결 끊김"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"블루투스 설정을 변경할 권한이 없습니다."</string>
+    <string name="bluetooth_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="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"조직에서 관리하는 기기입니다."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 관리하는 기기입니다."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"자세히 알아보기"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{카메라 앱}other{카메라 앱}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"캘린더 앱"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"사용"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"설정"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> 사용"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g>에서는 비밀번호를 제외하고 사용자가 입력하는 모든 텍스트를 수집할 수 있습니다. 여기에는 신용카드 번호와 같은 개인정보도 포함됩니다."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"연결되었습니다."</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"모두 표시"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"검색 중"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"인증자로부터 계정 추가 인텐트를 가져올 수 없습니다."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"계정을 추가할 수 없거나 사용할 수 없는 계정 유형입니다."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"채널 및 입력"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"채널, 외부 입력"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"채널"</string>
@@ -1117,12 +1119,17 @@
     <string name="screen_settings_title" msgid="7806908869190824434">"화면"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"소리"</string>
     <string name="power_and_energy" msgid="4638182439670702556">"전원 및 에너지"</string>
-    <string name="power_on_behavior" msgid="927607372303160716">"전원이 켜질 때 동작"</string>
+    <string name="power_on_behavior" msgid="927607372303160716">"전원 켜기 동작"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"초기화"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"이더넷 페어링 코드"</string>
     <string name="energy_modes" msgid="1331693860386361744">"에너지 모드"</string>
     <string name="energy_modes_summary" msgid="7196407759836930799">"TV를 사용하지 않는 동안 에너지 효율 향상"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"사용 설정된 기능:"</string>
+    <string name="energy_mode_enables" msgid="357960364751477627">"사용 설정되는 기능:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"이 모드로 인해 기기의 전력 소비량이 증가할 수 있습니다."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\'<xliff:g id="ENERGYMODENAME">%s</xliff:g>\' 사용 설정"</string>
+    <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_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 72c0c84c9..d739581a8 100644
--- a/Settings/res/values-ky/energy-modes.xml
+++ b/Settings/res/values-ky/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Тармактын керектүү функциялары"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Электр кубаты азыраак керектелет"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Сыналгы өчүп турганда тармактан ажыратыңыз."</string>
+    <string 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-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Маанилүү жаңыртуулар жана функциялар"</item>
+    <item msgid="4976202876230149030">"Маанилүү жаңыртууларды жана функцияларды"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Тармактын сунушталган функциялары"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Электр кубатынын колдонулушу оптималдаштырылды"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Сыналгыны тармак аркылуу ойготкон функцияларды күйгүзөт (тармактык күтүү режими)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Тармактын кошумча функциялары"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Электр кубаты көбүрөөк керектелет"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Сунушталган функцияларга кошумча, бул параметр сыналгы өчүп турганда электр кубатын көбүрөөк керектеген кошумча функцияларлы иштетет."</string>
+    <string 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-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 8f7021adf..2118a29bb 100644
--- a/Settings/res/values-ky/strings.xml
+++ b/Settings/res/values-ky/strings.xml
@@ -40,7 +40,7 @@
     <string name="hotwording_title" msgid="2606899304616599026">"\"Ok Google\" аныктоо функциясы"</string>
     <string name="hotwording_summary" msgid="2170375928302175449">"Google Жардамчы менен каалаган убакта сүйлөшүңүз"</string>
     <string name="header_category_device" msgid="3023893663454705969">"Түзмөк"</string>
-    <string name="header_category_preferences" msgid="3738388885555798797">"Жеке жөндөөлөр"</string>
+    <string name="header_category_preferences" msgid="3738388885555798797">"Жеке параметрлер"</string>
     <string name="header_category_accessories" msgid="6479803330480847199">"Пульттар жана аксессуарлар"</string>
     <string name="header_category_personal" msgid="7880053929985150368">"Жеке"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"Тармакка туташуу"</string>
@@ -55,7 +55,7 @@
     <string name="device_pref_category_title" msgid="8292572846154873762">"Түзмөктүн параметрлери"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"Атайын мүмкүнчүлүктөр"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Пульттар жана Көмөкчү жабдыктар"</string>
-    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Дисплей жана добуш"</string>
+    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Экран жана үн"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Жардам жана пикир билдирүү"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"Купуялык"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"Түзмөктү тууралоо"</string>
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Колдонмону тууралоо"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Жайгашкан жер, Колдонуу жана мүчүлүштүктөрдү аныктоо, Жарнамалар"</string>
     <string name="add_account" msgid="7386223854837017129">"Аккаунт кошуу"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Белгисиз аккаунт"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Аккаунтту өчүрүү"</string>
     <string name="account_sync" msgid="4315295293211313989">"Колдонмолорду тандоо"</string>
     <string name="sync_now" msgid="4335217984374620551">"Азыр шайкештирүү"</string>
@@ -96,16 +97,16 @@
     <string name="overlay_security_slice_title" msgid="4895032817538300187"></string>
     <string name="update_slice_title" msgid="6553763903108611747"></string>
     <string name="all_apps_title" msgid="3717294436135280133">"Бардык колдонмолор"</string>
-    <string name="all_apps_show_system_apps" msgid="1260688031005374302">"Тутум колдонмолорун көрсөтүү"</string>
+    <string name="all_apps_show_system_apps" msgid="1260688031005374302">"Система колдонмолорун көрсөтүү"</string>
     <string name="all_apps_installed" msgid="8217778476185598971">"Орнотулган колдонмолор"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"Системанын колдонмолору"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"Өчүрүлгөн колдонмолор"</string>
     <string name="device_daydream" msgid="2631191946958113220">"Көшөгө"</string>
     <string name="device_display" msgid="244634591698925025">"Көрсөтүү"</string>
-    <string name="device_display_sound" msgid="7399153506435649193">"Дисплей жана добуш"</string>
+    <string name="device_display_sound" msgid="7399153506435649193">"Экран жана үн"</string>
     <string name="device_sound" msgid="8616320533559404963">"Үн"</string>
     <string name="device_surround_sound" msgid="1889436002598316470">"Айланадагы үндөр"</string>
-    <string name="device_sound_effects" msgid="2000295001122684957">"Тутум добуштары"</string>
+    <string name="device_sound_effects" msgid="2000295001122684957">"Система добуштары"</string>
     <string name="device_apps" msgid="2134756632245008919">"Колдонмолор"</string>
     <string name="device_storage" msgid="8540243547121791073">"Сактагыч"</string>
     <string name="device_reset" msgid="6115282675800077867">"Баштапкы абалга кайтаруу"</string>
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"Баштапкы абалга кайтаруу"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Калибрдөө аяктады"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"Өчүрүү таймери"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Сыналгыны өчүрүп, электр кубатын үнөмдөө үчүн таймерлерди коюңуз"</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"Электр кубатын үнөмдөө үчүн сыналгыны таймер менен өчүрөсүз"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Түзмөктөр"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"Форматтарды тандоо"</string>
@@ -147,29 +148,27 @@
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"Иштетүү үчүн форматты Кол менен тандоого өзгөртүңүз."</string>
     <string name="surround_sound_enabled_format_info_clicked" msgid="4003154853054756792">"Өчүрүү үчүн форматты Кол менен тандоого өзгөртүңүз."</string>
     <string name="display_category_title" msgid="247804007525046312">"Экран"</string>
-    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Өркүндөтүлгөн дисплейдин параметрлери"</string>
+    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Экрандын өркүндөтүлгөн параметрлери"</string>
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Өркүндөтүлгөн добуштун параметрлери"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Оюн режимине уруксат берүү"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Контенттин динамикалык диапазонуна дал келтирүү"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Бул параметр иштетилсе, контентке дал келүү үчүн тутум ар түрдүү динамикалык диазапондун форматтарына которулат. Форматка которулуп жатканда экран карарып калышы мүмкүн.\n\nДинамикалык диапазондун варианттарын көрүү үчүн Экрандын өркүндөтүлгөн параметрлерине өтүңүз."</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Бул параметр иштетилсе, түзмөк контентте колдонулган динамикалык диапазондун форматына которулат. Форматка которулуп жатканда экран өчүп калышы мүмкүн.\n\nДинамикалык диапазондун кошумча параметрлерин көрүү үчүн Экрандын өркүндөтүлгөн параметрлерине өтүңүз."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Тандалган динамикалык диапазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Тутум тарабынан тандалган формат"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Формат өзгөртүүсүн тутум башкарсын"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Бул параметр тандалганда, тутум ылайыктуу динамикалык диапазонду таап, экраныңыздын форматына жараша мазмун форматын өзгөртүшү мүмкүн."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Ар дайым мазмундун форматына дал келет"</string>
+    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Система тандаган формат"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Форматты система өзү тандайт"</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Бул параметр тандалса, система экраныңызга ылайыктуу динамикалык диапазонду таап, контентти ошого жараша көрсөтөт."</string>
+    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Формат контенттин параметрлери боюнча тандалат"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Башка форматка өзгөртүү"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Тандалган форматка өзгөртөт"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Тандалган форматка өзгөртүлсүн. Өзгөртүү Көрсөтүү режиминдеги же HDR форматындагы башка жөндөөлөргө таасир этиши мүмкүн."</string>
+    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Тандалган форматка өзгөртүлсүн. Өзгөртүү Көрсөтүү режиминдеги же HDR форматындагы башка параметрлерге таасир этиши мүмкүн."</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Ар дайым SDR сакталсын"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Ар дайым <xliff:g id="HDR_TYPE">%s</xliff:g> форматы сакталсын"</string>
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR форматына өзгөртүүнү улантасызбы?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Демейки шартта формат <xliff:g id="HDR_TYPE">%s</xliff:g> форматына өзгөртүлөт."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Экраныңыз 1080p 60 Гц дааналыгында көрсөтүлөт. Экраныңыз 4K 60 Гц дааналыгында көрсөтүлсө, бул параметр туура келбейт."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision учурдагы резолюцияда колдоого алынбайт. Эгер Dolby Vision форматын кол менен иштетсеңиз, экрандын резолюциясы 1080p 60 Гц болуп өзгөрөт"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Резолюция 1080p 60 Гц болуп өзгөрсүнбү?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision форматына ар дайым мажбурлап өзгөртүү"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Эгер Экрандын өркүндөтүлгөн параметрлериндеги HDR форматтарында Dolby Vision өчүрүлгөн болсо, башка форматка мажбурлап өзгөртүү аны кайрадан иштетет."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 форматына ар дайым мажбурлап өзгөртүү"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Үлгү текст"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Оз өлкөсүнүн ажайып сыйкырчысы"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11-бөлүм: Оз өлкөсүнүн ажайып зымырыт шаары"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Жашыл көз айнек тагынып турса да, Дороти менен достору жаркыраган ажайып шаарды көргөндө көздөрү уялып кетти. Шаардын көчөлөрүндөгү үйлөр жалаң гана жашыл мрамордон курулуп, күндүн нуруна чагылышып жалт-жулт эткен зымырыт таштары менен капталган. Жада калса алар өтүп бара жаткан көпүрө да жашыл мрамордон курулган экен. Бут астындагы мрамор төшөмөлөрдүн ортолору зымырыт таштары менен толтурулуп, алар күн нуруна жарк-журк этет. Терезелерге да жашыл айнек коюлуп, шаар үстүндө асман да, күн нурлары да жашыл түскө боёлуп турду. \n\nКөчөдө ары-бери өткөн адамдар да жашыл кийимдерди кийип, өңү-түстөрү да жашыл тартып турат экен. Дороти менен анын кызыктай досторунун жанынан өткөн адамдар аларды айран таң калып карап, арстанды көргөн кичинекей балдар энелеринин аркаларына жашына калып жатышты. Шаардыктардын эч кимиси алардын жанына барып, сүйлөшүүгө даай алышкан жок. Дороти шаардын дүкөндөрүндө сатылып жаткан көйнөктөр, кийим-кечелер, бут кийимдер, шляпалар, момпосуйлар, жада калса, бадырак жүгөрүлөр да жашыл түстө экендигин байкады. Бир жерде балдар жашыл тыйындарды төлөп жашыл лимонад алып жатышат. \n\nШаарда, сыягы, жылкылар жана башка жаныбарлар жок окшойт, себеби эркектер буюмдарын жашыл арабаларга салып түртүп алышкан. Элдин баары бактылуу, жашоосуна ыраазы жана гүлдөп тургандай туюлду."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Жашыл көз айнек тагынып турса да, Дороти менен достору жаркыраган ажайып шаарды көргөндө көздөрү уялып кетти. Шаардын көчөлөрүндөгү үйлөр жалаң гана жашыл мрамордон курулуп, күндүн нуруна чагылышып жалт-жулт эткен зымырыт таштары менен капталган. Жада калса алар өтүп бара жаткан көпүрө да жашыл мрамордон курулган экен. Бут астындагы мрамор төшөмөлөрдүн ортолору зымырыт таштары менен толтурулуп, алар күн нуруна жарк-журк этет. Терезелерге да жашыл айнек коюлуп, шаар үстүндө асман да, күн нурлары да жашыл түскө боёлуп турду. \n\nКөчөдө ары-бери өткөн адамдар да жашыл кийимдерди кийип, өңү-түстөрү да жашгылт тартып турат экен. Дороти менен анын кызыктай досторунун жанынан өткөн адамдар аларды айран таң калып карап, арстанды көргөн кичинекей балдар энелеринин аркаларына жашына калып жатышты. Шаардыктардын эч кимиси алардын жанына барып, сүйлөшүүгө даай алышкан жок. Дороти шаардын дүкөндөрүндө сатылып жаткан көйнөктөр, кийим-кечелер, бут кийимдер, шляпалар, момпосуйлар, жада калса, бадырак жүгөрүлөр да жашыл түстө экендигин байкады. Бир жерде балдар жашыл тыйындарды төлөп жашыл лимонад алып жатышат. \n\nШаарда, сыягы, жылкылар жана башка жаныбарлар жок окшойт, себеби эркектер буюмдарын жашыл арабаларга салып түртүп алышкан. Элдин баары бактылуу, жашоосуна ыраазы жана гүлдөп тургандай туюлду."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Форматты тандоо"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автоматтык түрдө"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Кол менен"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Резолюция %1$s болуп өзгөрсүнбү?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Мындан ары %1$s колдонуу үчүн \"Жарайт\" баскычын басыңыз."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s режиминде Dolby Vision колдоого алынбайт жана \"Экрандын өркүндөтүлгөн параметрлеринде\" өчүрүлөт"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Бул режимде %1$s колдоого алынат. Айрым сыналгыларда кошумча HDR форматтарын иштетүү үчүн Жакшыртылган HDMI\'ды күйгүзүү керектелиши мүмкүн. Сыналгынын параметрлерине өтүп, анын колдоого алынарын текшериңиз."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Бул режимде төмөнкү форматтар колдоого алынат: %1$s\nАйрым сыналгыларда кошумча HDR форматтарын иштетүү үчүн Жакшыртылган HDMI\'ды күйгүзүү керектелиши мүмкүн. Сыналгынын параметрлерине өтүп, анын колдоого алынарын текшериңиз."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Жокко чыгаруу"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Жарайт"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Герц"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Герц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Кеш берилиштери тазалансынбы?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Бул бардык колдонмолордун кештелген берилиштерин тазалайт."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Туташты"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Ажыратылды"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Bluetooth параметрлерин өзгөртүүгө уруксатыңыз жок."</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="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Бул түзмөк уюмуңуз тарабынан башкарылат."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Кеңири маалымат"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Камера колдонмосу}other{Камера колдонмолору}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Жылнаама колдонмосу"</string>
@@ -375,8 +373,8 @@
     <string name="about_build" msgid="8467840394761634575">"Android TV OS куралышы"</string>
     <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{Сиздин иштеп чыгуучу болушуңузга # кадам калды}other{Сиздин иштеп чыгуучу болушуңузга # кадам калды}}"</string>
     <string name="about_ads" msgid="7662896442040086522">"Жарнамалар"</string>
-    <string name="ads_description" msgid="8081069475265061074">"Жарнама параметрлерин башкарып, жарнама идентификаторун баштапкы абалга келтирүү сыяктуу аракеттерди аткара аласыз."</string>
-    <string name="ads_content_description" msgid="1006489792324920289">"Жарнамалар. Жарнама параметрлерин башкарып, жарнама идентификаторун баштапкы абалга келтирүү сыяктуу аракеттерди аткара аласыз."</string>
+    <string name="ads_description" msgid="8081069475265061074">"Жарнама параметрлерин башкарып, жарнама идентификаторун кайра коюу сыяктуу аракеттерди аткара аласыз."</string>
+    <string name="ads_content_description" msgid="1006489792324920289">"Жарнамалар. Жарнама параметрлерин башкарып, жарнама идентификаторун кайра коюу сыяктуу аракеттерди аткара аласыз."</string>
     <string name="show_dev_on" msgid="612741433124106067">"Эми иштеп чыгуучу болдуңуз!"</string>
     <string name="show_dev_already" msgid="1522591284776449818">"Кажети жок, буга чейин эле өндүрүүчү болгонсуз"</string>
     <string name="device_info_default" msgid="2374506935205518448">"Белгисиз"</string>
@@ -393,7 +391,7 @@
     <string name="manual" msgid="5683935624321864999">"Кол менен"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"Башкаруучу маалыматтар"</string>
     <string name="device_feedback" msgid="4871903271442960465">"Түзмөк тууралуу пикир билдирүү"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Иш тутумун жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Иш системасын жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"Адегенде Интернетке туташыңыз"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"Интернетке туташыңыз же операторуңуз менен байланышыңыз"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5634005787486307657">"Байланыш оператору кулпулаган түзмөктөрдө жеткиликтүү эмес"</string>
@@ -443,7 +441,7 @@
     <string name="wifi_setting_available_networks" msgid="2096957819727319750">"Жеткиликтүү тармактар"</string>
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"Жаңы тармак кошуу"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"Ыкчам туташуу"</string>
-    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"\"Ыкчам туташуу\" менен телефонуңуздагы QR кодун скандап, WiFi\'га ыкчам туташыңыз."</string>
+    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"\"Ыкчам туташуу\" менен телефонуңуздагы QR кодду скандап, WiFi\'га ыкчам туташыңыз."</string>
     <string name="security_type" msgid="2297615092250075696">"Коопсуздук түрү"</string>
     <string name="other_network" msgid="5299289104661858596">"Башка тармак…"</string>
     <string name="skip_network" msgid="3095529090560000692">"Өткөрүп жиберүү"</string>
@@ -471,7 +469,7 @@
     <string name="title_wifi_proxy_settings_invalid" msgid="7698883245005941665">"Прокси параметрлери жараксыз"</string>
     <string name="title_wifi_ip_settings_invalid" msgid="7283801973512992014">"IP параметрлери жараксыз"</string>
     <string name="title_wifi_known_network" msgid="6162483884727898697">"<xliff:g id="SSID">%1$s</xliff:g> – сакталган тармак"</string>
-    <string name="title_wifi_scan_qr_code" msgid="7485605625055717874">"Кошулуу үчүн QR кодун скандаңыз"</string>
+    <string name="title_wifi_scan_qr_code" msgid="7485605625055717874">"Кошулуу үчүн QR кодду скандаңыз"</string>
     <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>
@@ -479,7 +477,7 @@
     <string name="wifi_connect" msgid="2206086690065242121">"Туташуу"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"Тармак унутулсун"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"Ушуну менен бул тармакка туташуу үчүн колдонулган маалымат, ошондой эле сакталган сырсөз тазаланат"</string>
-    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Мобилдик телефондун камерасы менен QR кодун скандап, Wi-Fi тармагына туташып, нускамаларды аткарыңыз.\n \n "<b>"Android телефонунан"</b>" Жөндөөлөргө -&gt; Тармак жана Интернет -&gt; Wi-Fi -&gt; бөлүмүнө өтүп, Wi-Fi -&gt; Өркүндөтүлгөн -&gt; Түзмөктү кошууну тандап, QR кодун скандаңыз."</string>
+    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Мобилдик телефондун камерасы менен QR кодду скандап, Wi-Fi тармагына туташып, нускамаларды аткарыңыз.\n \n "<b>"Android телефонунан"</b>" Параметрлерге -&gt; Тармак жана Интернет -&gt; Wi-Fi -&gt; бөлүмүнө өтүп, Wi-Fi -&gt; Өркүндөтүлгөн -&gt; Түзмөктү кошууну тандап, QR кодду скандаңыз."</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"Жокко чыгаруу үчүн \"Артка\" баскычын басыңыз"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"OK"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"Улантуу"</string>
@@ -544,7 +542,7 @@
     <string name="storage_migrate_away" msgid="7880100961434638430">"Маалыматтарды башка сактагычка көчүрүү"</string>
     <string name="storage_no_apps" msgid="95566375753627272">"Камдык көчүрмөсүн сактай турган колдонмолор жок"</string>
     <string name="storage_forget" msgid="4671975563260507003">"Бул түзмөктүн сактагычы унутулсун"</string>
-    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"Бул дискте камтылган колдонмолор же дайындарды колдонуу үчүн аны кайра сайыңыз. Же түзмөк жеткиликтүү эмес болсо, бул сактагычты унутууну тандасаңыз болот.\n\nЭгер Унутууну тандасаңыз, дискте камтылган бардык дайындар биротоло жоголот.\n\nКолдонмолорду кийинчерээк кайра орнотсоңуз болот, бирок бул дискте сакталган дайындар жоголот."</string>
+    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"Бул дискте камтылган колдонмолор же дайындарды колдонуу үчүн аны кайра сайыңыз. Же түзмөк жеткиликтүү эмес болсо, бул сактагычты унутууну тандасаңыз болот.\n\nЭгер Унутууну тандасаңыз, дискте камтылган бардык нерселер биротоло жоголот.\n\nКолдонмолорду кийинчерээк кайра орнотсоңуз болот, бирок бул дискте сакталган дайындар жоголот."</string>
     <string name="storage_device_storage_section" msgid="22958375769694027">"Түзмөктүн сактагычы"</string>
     <string name="storage_removable_storage_section" msgid="280332107650735088">"Ташыма сактагыч"</string>
     <string name="storage_reset_section" msgid="3896575204828589494">"Кайра коюу"</string>
@@ -681,7 +679,7 @@
     <string name="accessibility_screen_reader_flattened_component_name" msgid="6834614827111101213">"com.google.android.marvin.talkback/com.google.android.marvin.talkback.TalkBackService"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Жогорку контрасттагы текст"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Жоон текст"</string>
-    <string name="accessibility_color_correction" msgid="6765093204922184119">"Түсүн тууралоо"</string>
+    <string name="accessibility_color_correction" msgid="6765093204922184119">"Түстөрдү тууралоо"</string>
     <string name="color_correction_usage" msgid="4160611639548748657">"Түстөрдү тууралоону колдонуу"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Түстүү режим"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Дейтераномалия"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Иштетүү"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурация"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> колдоносузбу?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> сырсөздөрдөн башка, бардык терилген тексттерди сактап турат. Тактап айтканда, насыя карталарынын номерлери сыяктуу жеке маалыматтарды."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"OK\'ди тандасаңыз, <xliff:g id="SERVICE">%1$s</xliff:g> токтойт."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Текстти-оозекилөө"</string>
@@ -766,7 +764,7 @@
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP текшерүү"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI ыңгайлаштыруу"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"Азыр өчүрүп күйгүзүлсүнбү?"</string>
-    <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"Бул жөндөөнү жаңыртуу үчүн, түзмөгүңүздү өчүрүп күйгүзүшүңүз керек"</string>
+    <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"Бул параметрди жаңыртуу үчүн, түзмөгүңүздү өчүрүп күйгүзүшүңүз керек"</string>
     <string name="system_never_check" msgid="2860070727606369055">"Эч качан текшерилбесин"</string>
     <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"DRM мазмунун гана белгилөө"</string>
     <string name="system_always_check" msgid="384870282800221580">"Ар дайым текшерилсин"</string>
@@ -781,7 +779,7 @@
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Wi‑Fi журналы"</string>
     <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Майда-барат маалыматты Wi‑Fi журналына жазууну иштетүү"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Тийүүлөр көрүнсүн"</string>
-    <string name="system_pointer_location" msgid="8724050865245555084">"Көрсөткүчтүн жайгашкан жери"</string>
+    <string name="system_pointer_location" msgid="8724050865245555084">"Көрсөткүчтүн турган жери"</string>
     <string name="system_show_layout_bounds" msgid="8803080672553699649">"Калыптардын чектери көрүнсүн"</string>
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"Экран жаңыртуусун көрсөтүү"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Жабдык катмарын көрсөтүү"</string>
@@ -935,9 +933,9 @@
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"<xliff:g id="VOLUME">%2$s</xliff:g> ичинен <xliff:g id="SIZE">%1$s</xliff:g> колдонулат"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"Маалыматты өчүрүү"</string>
     <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"Бул колдонмонун файлдар, жөндөөлөр, каттоо эсептери, маалыматтар базасы \nсыяктуу бардык маалыматтары биротоло жок болот."</string>
-    <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Демейки жөндөөлөрдү тазалап салуу"</string>
+    <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"Демейки параметрлерди тазалап салуу"</string>
     <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"Бул колдонмо айрым аракеттер үчүн ишке киргизилет деп коюлган"</string>
-    <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"Демейки жөндөөлөр коюлган жок"</string>
+    <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"Демейки параметрлер коюлган жок"</string>
     <string name="device_apps_app_management_clear_cache" msgid="2678301483598915479">"Кештерди тазалоо"</string>
     <string name="device_apps_app_management_notifications" msgid="1687529279264810317">"Билдирмелер"</string>
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"Үчүнчү тараптын булагы"</string>
@@ -976,14 +974,14 @@
     <string name="limit_network_in_standby_confirm_message" msgid="7176699480768019689">"Көшүү режиминде тармакка туташууга уруксат берсеңиз, көшүү режиминде электр энергиясы көбүрөөк колдонулат."</string>
     <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"Дайындардын камдык көчүрмөсүн сактап жаткан аккаунт жок"</string>
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
-    <string name="backup_erase_dialog_message" msgid="222169533402624861">"Wi-Fi сырсөздөрүнүн, кыстармалардын жана башка жөндөөлөрдүн, ошондой эле колдонмолордун дайындарынын камдык көчүрмөлөрүн сактоо аракети токтотулуп, Google серверлериндеги бардык көчүрмөлөр өчүрүлсүнбү?"</string>
+    <string name="backup_erase_dialog_message" msgid="222169533402624861">"Wi-Fi сырсөздөрүнүн, кыстармалардын жана башка параметрлердин, ошондой эле колдонмолордун дайындарынын камдык көчүрмөлөрүн сактоо аракети токтотулуп, Google серверлериндеги бардык көчүрмөлөр өчүрүлсүнбү?"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"Дайындарымдын камдык көчүрмөсүн сактоо"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"Камдык көчүрмө каттоо эсеби"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"Авто калыбына келтирүү"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"Түзмөктү баштапкы абалга келтирүү"</string>
-    <string name="factory_reset_description" msgid="6697396335158766785">"Бул аракет түзмөгүңүздү демейки жөндөөлөргө кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
-    <string name="factory_reset_info_description" msgid="5098454670833183487">"Бул аракет түзмөгүңүздү демейки жөндөөлөргө кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
-    <string name="factory_reset_content_description" msgid="1677022688420116803">"Баштапкы абалга кайтаруу. Бул аракет түзмөгүңүздү демейки жөндөөлөргө кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
+    <string name="factory_reset_description" msgid="6697396335158766785">"Бул аракет түзмөгүңүздү демейки параметрлерге кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
+    <string name="factory_reset_info_description" msgid="5098454670833183487">"Бул аракет түзмөгүңүздү демейки параметрлерге кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
+    <string name="factory_reset_content_description" msgid="1677022688420116803">"Баштапкы абалга кайтаруу. Бул аракет түзмөгүңүздү демейки параметрлерге кайтарып, бардык маалыматты, аккаунттарды, файлдарды жана жүктөлүп алынган колдонмолорду өчүрөт."</string>
     <string name="confirm_factory_reset_description" msgid="1337483463207721713">"Жеке маалыматыңыз менен жүктөп алган колдонмолоруңузду өчүрөсүзбү? Аларды кайра калыбына келтире албайсыз."</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"Баарын өчүрүү"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"<xliff:g id="DEVICEMODEL">%1$s</xliff:g> үчүн ат тандаңыз"</string>
@@ -998,7 +996,7 @@
     <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>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Ушундай жол менен телефондогу сүрөттөрдү, видеолорду жана башкаларды сыналгыга оңой өткөрө аласыз."</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Түзмөктүн аталышы менен телефондогу сүрөттөрдү, видеолорду жана башкаларды сыналгыга оңой өткөрө аласыз"</string>
     <string name="change_setting" msgid="7211706374208138343">"Өзгөртүү"</string>
     <string name="keep_settings" msgid="703474489210093961">"Өзгөртүлбөсүн"</string>
     <string name="apps_permissions" msgid="7876407267050498394">"Уруксаттар"</string>
@@ -1027,7 +1025,7 @@
     <string name="manage_notification_access_title" msgid="8659254371564990084">"Эскертмелерге уруксат"</string>
     <string name="no_notification_listeners" msgid="5119406452675724448">"Орнотулган колдонмолор үчүн билдирмелерди колдонууга уруксат суралган жок."</string>
     <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"Бул колдонмолор билдирмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алышат. Мындан тышкары, алар бул билдирмелерди жок кылып же алардагы баскычтарды баса алышат."</string>
-    <string name="default_notification_access_package_summary" msgid="1354775994781420222">"Тутум талап кылат"</string>
+    <string name="default_notification_access_package_summary" msgid="1354775994781420222">"Система талап кылат"</string>
     <string name="directory_access" msgid="7338555825237012006">"Каталогго мүмкүнчүлүк алуу"</string>
     <string name="directory_access_description" msgid="3630855858552422012">"Бул колдонмолордун айрым каталогдорго кирүүгө уруксаттары бар."</string>
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -1049,7 +1047,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Колдонмолорго ойготкучтарды коюуга жана башка аракеттерди графикке киргизүүгө уруксат берүү. Ушуну менен колдонмолор фондо иштеп, көбүрөөк кубат сарпталышы мүмкүн.\n\nЭгер бул уруксат өчүрүлсө, колдонмодогу ойготкучтар жана графикке киргизилген башка аракеттер иштебейт."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Экранды күйгүзүү"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Экранды күйгүзүүгө уруксат берүү"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Колдонмого экранды күйгүзүүгө уруксат бериңиз. Уруксат берилсе, колдонмо экранды каалаган убакта сизден уруксат сурабастан күйгүзүшү мүмкүн."</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Колдонмого экранды күйгүзүүгө уруксат бересиз. Колдонмо экранды каалаган убакта сизден уруксат сурабастан күйгүзө берет."</string>
     <string name="special_access" msgid="21806055758289916">"Атайын мүмкүнчүлүк"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>, <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"Аудио"</string>
@@ -1069,7 +1067,7 @@
     <string name="title_data_saver" msgid="7500278996154002792">"Трафикти үнөмдөө"</string>
     <string name="summary_data_saver" msgid="6793558728898207405">"Мобилдик трафикти үнөмдөө үчүн видеонун сапатын автоматтык түрдө тууралоо"</string>
     <string name="title_data_alert" msgid="8262081890052682475">"Маалыматтардын колдонулушу жана эскертүүлөр"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"Интернетке Wi-Fi, Ethernet же телефонуңуздагы хотспот аркылуу туташа аласыз."</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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Ийгиликтүү туташты"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Баарын көрсөтүү"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Изделүүдө"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Authenticator колдонмосунан аккаунтту кошуу ниети алынган жок."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Аккаунт кошулган жок же анын түрү колдоого алынбайт."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Каналдар жана киргизүүлөр"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Каналдар, тышкы киргизүүлөр"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Каналдар"</string>
@@ -1122,9 +1122,14 @@
     <string name="power_on_behavior" msgid="927607372303160716">"Сыналгы күйүп тургандагы иштөө режими"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Кайра коюу"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Ethernet жупташтыруучу коду"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Электр кубатын колдонуу режимдери"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Сыналгы өчүп турганда электр кубатынын колдонулушун жакшыртуу"</string>
+    <string name="energy_modes" msgid="1331693860386361744">"Электр кубатын керектеген режимдер"</string>
+    <string name="energy_modes_summary" msgid="7196407759836930799">"Сыналгы өчүп турганда, электр кубатын үнөмдөп керектейт"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Иштетет:"</string>
-    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Бул режим түзмөктө электр кубатынын колдонулушун жогорулатышы мүмкүн экенин эске алыңыз."</string>
+    <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ушул режимден улам түзмөк электр кубатын көбүрөөк керектеши мүмкүн."</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_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 cb4739e29..323b17787 100644
--- a/Settings/res/values-lo/energy-modes.xml
+++ b/Settings/res/values-lo/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ຄຸນສົມບັດທີ່ສຳຄັນຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ໃຊ້ພະລັງງານໜ້ອຍລົງ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ປິດການເຊື່ອມຕໍ່ເຄືອຂ່າຍເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"ການອັບເດດ ແລະ ຟັງຊັນທີ່ສຳຄັນ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ຄຸນສົມບັດທີ່ແນະນຳຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ໃຊ້ພະລັງງານຢ່າງມີປະສິດທິພາບ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ເປີດຄຸນສົມບັດທີ່ປຸກລະບົບຂອງໂທລະທັດຜ່ານເຄືອຂ່າຍ (ໂໝດສະແຕນບາຍທີ່ເຊື່ອມຕໍ່ເຄືອຂ່າຍ)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[ໃສ່ຄຸນສົມບັດ 1]"</item>
     <item msgid="8724721267222341891">"[ໃສ່ຄຸນສົມບັດ 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ຄຸນສົມບັດເພີ່ມເຕີມຂອງເຄືອຂ່າຍ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ໄດ້ໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ນອກຈາກຄຸນສົມບັດທີ່ແນະນຳແລ້ວ, ຕົວເລືອກນີ້ຈະເປີດຄຸນສົມບັດເພີ່ມເຕີມເມື່ອບໍ່ໄດ້ໃຊ້ໂທລະທັດ ເຊິ່ງອາດເຮັດໃຫ້ໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ."</string>
+    <string 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-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 065aaa1b8..934e959a9 100644
--- a/Settings/res/values-lo/strings.xml
+++ b/Settings/res/values-lo/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ການຕັ້ງຄ່າແອັບ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ສະຖານທີ່, ກນນຳໃຊ້ ແລະ ການວິນິໄສ, ໂຄສະນາ"</string>
     <string name="add_account" msgid="7386223854837017129">"ເພີ່ມບັນຊີ"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"ບັນຊີທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ລຶບບັນຊີ"</string>
     <string name="account_sync" msgid="4315295293211313989">"​ເລືອກ​ແອັບຯ​ທີ່​ຊິ້ງ​​​ຂໍ້​ມູນແລ້ວ"</string>
     <string name="sync_now" msgid="4335217984374620551">"ຊິ້ງຂໍ້ມູນດຽວນີ້"</string>
@@ -155,7 +156,7 @@
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ເມື່ອເປີດໃຊ້ຕົວເລືອກນີ້, ລະບົບຈະສະຫຼັບລະຫວ່າງຮູບແບບໄລຍະໄດນາມິກທີ່ແຕກຕ່າງກັນເພື່ອໃຫ້ກົງກັບເນື້ອຫາ. ສິ່ງນີ້ອາດຈະເຮັດໃຫ້ໜ້າຈໍສີດໍາໃນລະຫວ່າງການສະຫຼັບຮູບແບບ.\n\nຄລິກທີ່ການຕັ້ງຄ່າຂັ້ນສູງສໍາລັບຕົວເລືອກໄລຍະໄດນາມິກເພີ່ມເຕີມ."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ໄລຍະໄດນາມິກທີ່ຕ້ອງການ"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"ການປ່ຽນຄ່າຕາມຄວາມຕ້ອງການຂອງລະບົບ"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ໃຫ້ລະບົບການຈັດການຮູບແບບການປ່ຽນຄ່າ"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ໃຫ້ລະບົບຈັດການຮູບແບບການປ່ຽນຄ່າ"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"ເມື່ອຕົວເລືອກນີ້ຖືກເລືອກ, ລະບົບຈະກໍານົດຂອບເຂດໄດນາມິກທີ່ເໝາະສົມເພື່ອຖືກສົ່ງໄປຫາການສະແດງຂອງທ່ານ ແລະ ປ່ຽນແປງເນື້ອຫາໄປສູ່ໄລຍະໄດນາມິກນີ້ຕາມຄວາມຕ້ອງການ."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"ກົງກັບຮູບແບບຂອງເນື້ອຫາຕະຫຼອດ"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ບັງຄັບການປ່ຽນຄ່າ"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ທ່ານຕ້ອງການບັງຄັບເອົາພຸດ HDR ບໍ?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ໂດຍຄ່າເລີ່ມຕົ້ນການປ່ຽນຄ່າຈະຖືກບັງຄັບໃຫ້ <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ຈໍສະແດງຜົນຂອງທ່ານຈະເຮັດວຽກຢູ່ທີ່ຄວາມລະອຽດ 1080p 60Hz. ຕົວເລືອກນີ້ເຂົ້າກັນບໍ່ໄດ້ກັບຈໍສະແດງຜົນຂອງທ່ານເມື່ອເຮັດວຽກຢູ່ທີ່ຄວາມລະອຽດ 4k 60Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ບໍ່ຮອງຮັບ Dolby Vision ທີ່ຄວາມລະອຽດປັດຈຸບັນ. ຫາກທ່ານເປີດການນຳໃຊ້ Dolby Vision ດ້ວຍຕົນເອງ, ຄວາມລະອຽດໃນຈໍສະແດງຜົນຂອງທ່ານຈະປ່ຽນເປັນ 1080p 60Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ປ່ຽນຄວາມລະອຽດເປັນ 1080p 60Hz ບໍ?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ບັງຄັບການປ່ຽນຄ່າເປັນ Dolby Vision ທຸກເທື່ອ"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ຫາກ Dolby Vision ຖືກປິດການນຳໃຊ້ໃນຮູບແບບ HDR ໃນການຕັ້ງຄ່າຈໍສະແດງຜົນຂັ້ນສູງ, ການບັງຄັບການປ່ຽນຄ່າເປັນ Dolby Vision ຈະເປັນການເປີດການນຳໃຊ້ອີກເທື່ອໜຶ່ງ."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ບັງຄັບການປ່ຽນຄ່າເປັນ HDR10 ທຸກເທື່ອ"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ຂໍ້ຄວາມຕົວຢ່າງ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ພໍ່ມົດອັດສະຈັນແຫ່ງອອດຊ໌"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ບົດທີ 11: ເມືອງມໍລະກົດອັນໜ້າອັດສະຈັນຂອງອອດຊ໌"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ເຖິງແມ່ນວ່າຈະໃສ່ແວ່ນຕາສີຂຽວເພື່ອປົກປ້ອງສາຍຕາໄວ້ແລ້ວ ແຕ່ໂດໂຣທີ ແລະ ໝູ່ຄູ່ກໍອົດບໍ່ໄດ້ທີ່ຈະຕົກຕະລຶງກັບຄວາມງາມເມື່ອພົບເຫັນເມືອງອັດໜ້າອັດສະຈັນນີ້ເປັນເທື່ອທຳອິດ. ຫົນທາງທີ່ມີເຮືອນສວຍງາມສ້າງຂຶ້ນຈາກຫິນອ່ອນສີຂຽວປະດັບດ້ວຍມໍລະກົດເງົາງາມເປັນປະກາຍເຕັມໄປໝົດ. ເຂົາເຈົ້າພາກັນຍ່າງໄປຕາມຫົນທາງທີ່ສ້າງຂຶ້ນຈາກຫິນອ່ອນສີຂຽວຄືກັນ, ຮ່ອງລະຫວ່າງຫິນອ່ອນແຕ່ລະກ້ອນໂຮຍດ້ວຍມໍລະກົດຮຽງກັນເປັນແຖວ, ສ່ອງປະກາຍເປັນແສງຍິບຍັບເມື່ອຕ້ອງກັບແສງແດດ. ປ່ອງຢ້ຽມສ້າງຂຶ້ນຈາກແກ້ວສີຂຽວ; ແມ່ນແຕ່ທ້ອງຟ້າທີ່ປົກຄຸມເມືອງນີ້ກໍຍັງມີສີຂຽວອ່ອນ ແລະ ແສງແດດທີ່ສ່ອງລົງມາກໍເປັນສີຂຽວເຊັ່ນກັນ. \n\nມີຄົນຍ່າງໄປມາຫຼວງຫຼາຍ, ທັງຜູ້ຊາຍ, ຜູ້ຍິງ ແລະ ເດັກນ້ອຍ, ທຸກຄົນລ້ວນແລ້ວແຕ່ນຸ່ງເຄື່ອງທີ່ມີສີຂຽວ ແລະ ມີຜິວອອກເປັນສີຂຽວໆ. ເຂົາເຈົ້າພາກັນເບິ່ງມາຫາໂດໂຣທີ ແລະ ໝູ່ຄູ່ດ້ວຍສາຍຕາທີ່ສົງໄສ ແລະ ເດັກນ້ອຍກໍພາກັນແລ່ນໜີແລ້ວລີ້ຢູ່ຫຼັງແມ່ຂອງເຂົາເຈົ້າເມື່ອເຂົາເຈົ້າເຫັນສິງໂຕ; ແຕ່ບໍ່ມີໃຜລົມນຳເຂົາເຈົ້າເລີຍ. ຮ້ານຄ້າຫຼວງຫຼາຍຕັ້ງຢູ່ຕາມຖະໜົນຫົນທາງ ແລະ ໂດໂຣທີກໍເຫັນວ່າທຸກສິ່ງຢ່າງໃນນັ້ນລ້ວນແຕ່ເປັນສີຂຽວ. ມີເຂົ້າໜົມສີຂຽວ ແລະ ສາລີຂົ້ວເປັນສີຂຽວ, ຮວມທັງເກີບສີຂຽວ, ໝວກສີຂຽວ ແລະ ເຄື່ອງນຸ່ງທຸກແບບເປັນສີຂຽວນຳ. ມີຮ້ານໜຶ່ງທີ່ຂາຍນ້ຳໝາກນາວສີຂຽວ ແລະ ເມື່ອມີເດັກນ້ອຍໄປຊື້ນ້ຳໝາກນາວ ໂດໂຣທີກໍເຫັນວ່າເຂົາເຈົ້າຈ່າຍເງິນທີ່ມີສີຂຽວນຳ. \n\nເບິ່ງຄືວ່າເມືອງນີ້ຈະບໍ່ມີມ້າ ຫຼື ສັດຊະນິດອື່ນໃດເລີຍ; ຜູ້ຄົນຂົນເຄື່ອງດ້ວຍລໍ້ຍູ້ນ້ອຍໆສີຂຽວທີ່ເຂົາເຈົ້າຕ້ອງຍູ້ໄປທາງໜ້າ. ທຸກຄົນເບິ່ງຄືມີຄວາມສຸກ, ຄວາມຍິນດີ ແລະ ຄວາມຮັ່ງມີ."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ເຖິງແມ່ນວ່າຈະໃສ່ແວ່ນສີຂຽວເພື່ອປົກປ້ອງສາຍຕາໄວ້ແລ້ວ, ແຕ່ Dorothy ແລະ ໝູ່ຂອງລາວກໍອົດບໍ່ໄດ້ທີ່ຈະຕົກຕະລຶງກັບຄວາມງົດງາມເມື່ອເຫັນທຳອິດຂອງເມືອງທີ່ໜ້າອັດສະຈັນນີ້. ຖະໜົນຫົນທາງມີບ້ານເຮືອນທີ່ສວຍງາມສ້າງຈາກຫິນອ່ອນສີຂຽວປະດັບດ້ວຍມໍລະກົດແວວວາວລະຍິບລະຍັບເຕັມໄປໝົດ. ພວກເຂົາຍ່າງຜ່ານທາງຍ່າງເຮັດຈາກຫິນອ່ອນສີຂຽວຄືກັນ, ເຊິ່ງຊ່ອງລະຫວ່າງຫິນອ່ອນແຕ່ລະກ້ອນປະກອບໄປດ້ວຍມໍລະກົດຮຽງກັນເປັນແຖວ ແລະ ສ່ອງປະກາຍແວວວາວເມື່ອຕ້ອງກັບແສງຕາເວັນ. ບານປ່ອງຢ້ຽມເຮັດມາຈາກແກ້ວສີຂຽວ; ແມ່ນແຕ່ທ້ອງຟ້າທີ່ປົກຄຸມເມືອງນີ້ຍັງມີສີອົມຂຽວອ່ອນໆ ແລະ ແສງຕາເວັນທີ່ສ່ອງລົງມາກໍເປັນສີຂຽວເຊັ່ນກັນ. \n\nມີຜູ້ຄົນຍ່າງໄປມາຢູ່ຫຼວງຫຼາຍ, ທັງຜູ້ຊາຍ, ຜູ້ຍິງ ແລະ ເດັກນ້ອຍ, ທຸກຄົນລ້ວນແລ້ວແຕ່ແຕ່ງກາຍດ້ວຍເສື້ອຜ້າສີຂຽວ ແລະ ມີຜິວພັນເປັນສີຂຽວໆ. ພວກເຂົາພາກັນແນມເບິ່ງ Dorothy ແລະ ໝູ່ເພື່ອນຫຼາກຫຼາຍເຜົ່າພັນດ້ວຍສາຍຕາທີ່ປະຫຼາດໃຈ, ເດັກນ້ອຍທັງໝົດພາກັນແລ່ນໜີ ແລະ ໄປລີ້ຢູ່ຫຼັງແມ່ຂອງຕົນເອງເມື່ອແນມເຫັນສິງໂຕ; ແຕ່ບໍ່ມີໃຜເວົ້າກັບເຂົາເຈົ້າເລີຍ. ຮ້ານຄ້າຫຼາຍຮ້ານຕັ້ງຢູ່ຖະໜົນເສັ້ນນັ້ນ ແລະ Dorothy ເຫັນວ່າທຸກຢ່າງໃນຮ້ານເຫຼົ່ານີ້ລ້ວນແຕ່ເປັນສີຂຽວ. ມີການຂາຍເຂົ້າໜົມອົມ ແລະ ປັອບຄອນສີຂຽວ, ຮວມທັງເກີບສີຂຽວ, ໝວກສີຂຽວ ແລະ ເສື້ອຜ້າສີຂຽວຫຼາກຫຼາຍຮູບແບບ. ມາຮອດບ່ອນໜຶ່ງ, ມີຄົນຂາຍນ້ຳໝາກນາວສີຂຽວ ແລະ ເມື່ອມີເດັກນ້ອຍໄປຊື້ນ້ຳໝາກນາວ Dorothy ກໍເຫັນວ່າເຂົາເຈົ້າຈ່າຍເງິນດ້ວຍຫຼຽນສີຂຽວ. \n\nເບິ່ງຄືວ່າເມືອງນີ້ຈະບໍ່ມີມ້າ ຫຼື ສັດຊະນິດອື່ນໃດເລີຍ; ຜູ້ຄົນຂົນເຄື່ອງດ້ວຍກະຕ່ານ້ອຍໆສີຂຽວແບບທີ່ຕ້ອງຍູ້ໄປທາງໜ້າ. ທຸກຄົນເບິ່ງຄືມີຄວາມສຸກ ແລະ ພໍໃຈໃນສິ່ງທີ່ເປັນຢູ່ ຮວມທັງມີຄວາມຈະເລີນຮຸ່ງເຮືອງດີ."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ການເລືອກຮູບແບບ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ອັດຕະໂນມັດ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ດ້ວຍຕົວເອງ"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ປ່ຽນຄວາມລະອຽດເປັນ %1$s ບໍ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ເລືອກຕົກລົງເພື່ອໃຊ້ %1$s ຈາກນີ້ໄປ."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision ບໍ່ຖືກຮອງຮັບຢູ່ %1$s ແລະ ຈະຖືກປິດການນຳໃຊ້ໃນ \"ການຕັ້ງຄ່າການສະແດງຜົນຂັ້ນສູງ\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ໂໝດນີ້ຮອງຮັບ %1$s. ຢູ່ໂທລະພາບບາງເຄື່ອງ, ທ່ານອາດຕ້ອງເປີດ HDMI ທີ່ໄດ້ປັບປຸງໃຫ້ດີຂຶ້ນແລ້ວເພື່ອເປີດໃຊ້ຮູບແບບ HDR ເພີ່ມເຕີມ. ກວດສອບເບິ່ງການຕັ້ງຄ່າໂທລະພາບຂອງທ່ານເພື່ອເບິ່ງວ່າສິ່ງນີ້ຖືກຮອງຮັບຫຼືບໍ່."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ໂໝດນີ້ຮອງຮັບ: %1$s\nຢູ່ໂທລະທັດບາງເຄື່ອງ, ທ່ານອາດຕ້ອງເປີດ HDMI ທີ່ໄດ້ຮັບການປັບປຸງໃຫ້ດີຂຶ້ນເພື່ອເປີດໃຊ້ຮູບແບບ HDR ເພີ່ມເຕີມ. ກວດສອບເບິ່ງການຕັ້ງຄ່າໂທລະທັດຂອງທ່ານເພື່ອເບິ່ງວ່າສິ່ງນີ້ຖືກຮອງຮັບຫຼືບໍ່."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ຍົກເລີກ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ຕົກລົງ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ລຶບຂໍ້ມູນທີ່ເກັບໄວ້ບໍ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ອັນນີ້ຈະລຶບຂໍ້ມູນທີ່ເກັບໄວ້ສຳ​ລັບທຸກແອັບຯ."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ທ່ານ​ບໍ່​ມີ​ສິດ​ອະນຸຍາດ​ໃນ​ການ​ແກ້ໄຂ​ການ​ຕັ້ງຄ່າ Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ໃຊ້ສຳລັບສຽງໂທລະທັດ"</string>
     <string name="send_feedback" msgid="936698637869795473">"ສົ່ງຄຳຕິຊົມ"</string>
     <string name="launch_help" msgid="2607478763131952469">"ສູນຊ່ວຍເຫຼືອ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ອຸປະກອນນີ້ແມ່ນຈັດການໂດຍອົງກອນຂອງທ່ານ."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ສຶກສາເພີ່ມເຕີມ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ແອັບກ້ອງຖ່າຍຮູບ}other{ແອັບກ້ອງຖ່າຍຮູບ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ແອັບປະຕິທິນ"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ເປີດນຳໃຊ້"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"ການ​ປັບ​ແຕ່ງ​ຄ່າ"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> ສາ​ມາດ​ເກັບ​ກຳ​ຂໍ້​ຄວາມ​ທຸກ​ຢ່າງ​ທີ່​ທ່ານ​ພິມ, ຍົກ​ເວັ້ນ​ລະ​ຫັດ​ຜ່ານ. ນີ້​​ຈະ​ຮວມ​ໄປ​ເຖິງ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ​ ເຊັ່ນ: ໝາຍ​ເລກ​ບັດ​ເຄຣ​ດິດ."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ການເຊື່ອມຕໍ່ສຳເລັດແລ້ວ"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"ສະແດງທັງໝົດ"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"ກຳລັງຊອກຫາ"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ບໍ່ສາມາດດຶງຂໍ້ມູນກົນໄກປະສານຂອງບັນຊີຈາກຕົວພິສູດຢືນຢັນໄດ້."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ເພີ່ມບັນຊີບໍ່ສຳເລັດ ຫຼື ປະເພດບັນຊີບໍ່ມີໃຫ້."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ຊ່ອງ ແລະ ອິນພຸດ"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ຊ່ອງ, ອິນພຸດພາຍນອກ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ຊ່ອງ"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ເປີດການນຳໃຊ້:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ກະລຸນາຮັບຊາບວ່າໂໝດນີ້ອາດເຮັດໃຫ້ອຸປະກອນໃຊ້ພະລັງງານຫຼາຍຂຶ້ນ."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"ເປີດການນຳໃຊ້ \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 e6b69ccd5..8b5bba32f 100644
--- a/Settings/res/values-lt/energy-modes.xml
+++ b/Settings/res/values-lt/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Pagrindinės tinklo funkcijos"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Vartojama mažai energijos"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Išjunkite tinklo ryšį, kai televizorius nenaudojamas."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kritiniai atnaujinimai ir funkcijos"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Rekomenduojamos tinklo funkcijos"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizuotas energijos vartojimas"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Įjungiamos funkcijos, suaktyvinančios televizorių per tinklą (tinklo budėjimo režimu)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Įterpti 1 funkciją]"</item>
     <item msgid="8724721267222341891">"[Įterpti 2 funkciją]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Papildomos tinklo funkcijos"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Vartojama daugiau energijos"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Pasirinkus šią parinktį, be rekomenduojamų funkcijų, įjungiamos papildomos funkcijos, kai televizorius nenaudojamas, todėl gali būti vartojama daugiau energijos."</string>
+    <string 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-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 c38e45b47..748bceb5c 100644
--- a/Settings/res/values-lt/strings.xml
+++ b/Settings/res/values-lt/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Programos nustatymai"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Vietovė, naudojimas ir diagnostika, skelbimai"</string>
     <string name="add_account" msgid="7386223854837017129">"Pridėti paskyrą"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Nežinoma paskyra"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Paskyros pašalinimas"</string>
     <string name="account_sync" msgid="4315295293211313989">"Pasirinkti sinchr. programas"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinchronizuoti dabar"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Pavyzdinis tekstas"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Nuostabusis Ozo šalies burtininkas"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11 skyrius. Nuostabusis Smaragdo miestas"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Netgi žaliais akiniais apsaugoję akis Dorotė ir jos draugai iš pradžių buvo apstulbinti nuostabiojo miesto žvilgesiu. Gatvėse stovėjo gražūs namai, pastatyti iš žalio marmuro ir nusagstyti žvilgančiais smaragdais. Jie ėjo tokiu pačiu žaliu marmuru grįstu šaligatviu, o šaligatvio plytelių sujungimo vietos buvo papuoštos viena šalia kitos esančiomis saulėje žvilgančių smaragdų eilėmis. Langų stiklai buvo žali, netgi dangaus virš miesto ir saulės spindulių spalva buvo žalia. \n\nMieste buvo daug žmonių (vyrų, moterų ir vaikų), kurie vaikščiojo apsirengę žaliais drabužiais. Jų oda buvo žalsvos spalvos. Į Dorotę ir jos keistą draugiją visi žiūrėjo su nuostaba, o pamatę Liūtą vaikai bėgo tolyn ir slėpėsi už savo mamų, tačiau niekas su jais nešnekėjo. Gatvėse buvo daug parduotuvių, o Dorotė pastebėjo, kad jose viskas taip pat buvo žalios spalvos. Viduje buvo parduodami žali saldainiai ir žali kukurūzų spragėsiai bei įvairūs žali batai, žalios kepurės ir žali drabužiai. Vienoje vietoje vyras siūlė nusipirkti žalio limonado ir Dorotė pastebėjo, kad jį perkantys vaikai atsiskaitė žaliomis monetomis. \n\nMieste nebuvo arklių ar kitų gyvūnų. Vyrai viską vežiojo mažais žaliais priekyje stumiamais vežimėliais. Visi atrodė laimingi, patenkinti ir turtingi."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Netgi žaliais akiniais apsaugoję akis Dorotė ir jos draugai iš pradžių buvo apstulbinti nuostabiojo miesto žvilgesio. Gatvėse stovėjo gražūs namai, pastatyti iš žalio marmuro ir nusagstyti žvilgančiais smaragdais. Jie ėjo tokiu pačiu žaliu marmuru grįstu šaligatviu, o šaligatvio plytelių sujungimo vietos buvo papuoštos saulėje žvilgančių smaragdų eilėmis. Langų stiklai buvo žali, netgi dangaus virš miesto ir saulės spindulių spalva buvo žalia. \n\nMieste buvo daug žmonių (vyrų, moterų ir vaikų), kurie vaikščiojo apsirengę žaliais drabužiais. Jų oda buvo žalsvos spalvos. Į Dorotę ir jos keistą draugiją visi žiūrėjo su nuostaba, o pamatę Liūtą vaikai bėgo tolyn ir slėpėsi už savo mamų, tačiau niekas su jais nešnekėjo. Gatvėse buvo daug parduotuvių, o Dorotė pastebėjo, kad jose viskas taip pat buvo žalios spalvos. Viduje buvo parduodami žali saldainiai ir žali kukurūzų spragėsiai bei įvairūs žali batai, žalios kepurės ir žali drabužiai. Vienoje vietoje vyras siūlė nusipirkti žalio limonado ir Dorotė pastebėjo, kad jį perkantys vaikai atsiskaitė žaliomis monetomis. \n\nMieste nebuvo arklių ar kitų gyvūnų. Vyrai viską vežiojo mažais žaliais priekyje stumiamais vežimėliais. Visi atrodė laimingi, patenkinti ir turtingi."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formato pasirinkimas"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatinis"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Neautomatinis"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Pakeisti skyrą į %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pasirinkite „Gerai“, kad nuo dabar naudotumėte %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"„Dolby Vision“ nepalaikoma %1$s ir bus išjungta skiltyje „Išplėstiniai pateikties nustatymai“."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Šis režimas palaiko %1$s. Kai kuriuose televizoriuose gali reikėti įjungti patobulintą HDMI, kad būtų pasiekiama daugiau HDR formatų. Peržiūrėkite TV nustatymus, ar ši funkcija palaikoma."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Šis režimas palaiko: %1$s\nKai kuriuose televizoriuose gali reikėti įjungti patobulintą HDMI, kad būtų pasiekiama daugiau HDR formatų. Peržiūrėkite TV nustatymus, ar ši funkcija palaikoma."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Atšaukti"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Gerai"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Išvalyti talpykloje saugomus duomenis?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Bus išval. visų progr. talpykl. saugomi duomen."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Susieta"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Atjungta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Neturite leidimo keisti „Bluetooth“ nustatymų."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Naudoti TV garsui"</string>
     <string name="send_feedback" msgid="936698637869795473">"Siųsti atsiliepimą"</string>
     <string name="launch_help" msgid="2607478763131952469">"Pagalbos centras"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Šį įrenginį tvarko jūsų organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Šį įrenginį tvarko „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Sužinoti daugiau"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Fotoaparato programa}one{Fotoaparato programos}few{Fotoaparato programos}many{Fotoaparato programos}other{Fotoaparato programos}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendoriaus programa"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Įgalinti"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigūracija"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ gali rinkti visą įvedamą tekstą, išskyrus slaptažodžius. Tai apima ir asmeninius duomenis, pvz., kredito kortelės numerius."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ galės skaityti turinį ekrane, pateikti turinį kitose programose, stebėti jūsų sąveikas su programomis ar aparatinės įrangos jutikliais ir sąveikauti su programomis jūsų vardu."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Sustabdyti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Pasirinkus „Gerai“ bus sustabdyta „<xliff:g id="SERVICE">%1$s</xliff:g>“."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Tekstas į kalbą"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Sėkmingai prisijungta"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Rodyti viską"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Ieškoma"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nepavyko gauti paskyros pridėjimo tikslo iš autentifikavimo priemonės."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Nepavyko pridėti paskyros arba paskyros tipas nepasiekiamas."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanalai ir įvestys"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanalai, išorinės įvestys"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanalai"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Įgalinama:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Atminkite, kad šiuo režimu gali būti vartojama daugiau įrenginio energijos."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Įgalinti „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“"</string>
+    <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_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 b9e743128..d35895c7f 100644
--- a/Settings/res/values-lv/energy-modes.xml
+++ b/Settings/res/values-lv/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Būtiskas tīkla funkcijas"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mazs enerģijas patēriņš"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Tiek izslēgts tīkla savienojums, kad televizors netiek lietots."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Svarīgi atjauninājumi un funkcijas"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ieteiktās tīkla funkcijas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizēts enerģijas patēriņš"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Tiek ieslēgtas funkcijas, kas aktivizē televizoru tīklā (tīklierosas gatavības režīms)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Papildu tīkla funkcijas"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Palielināts enerģijas patēriņš"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Papildus ieteiktajām funkcijām ar šo opciju tiek ieslēgtas papildu funkcijas, kad televizors netiek lietots. Tādējādi var tikt palielināts enerģijas patēriņš."</string>
+    <string 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-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 ba7446743..627ee60f7 100644
--- a/Settings/res/values-lv/strings.xml
+++ b/Settings/res/values-lv/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Lietotnes iestatījumi"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Atrašanās vieta, lietojums un diagnostika, reklāmas"</string>
     <string name="add_account" msgid="7386223854837017129">"Pievienot kontu"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Nezināms konts"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Konta noņemšana"</string>
     <string name="account_sync" msgid="4315295293211313989">"Izvēlieties sinhr. lietotnes"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinhronizēt tūlīt"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vai veikt piespiedu konvertēšanu uz HDR formātu?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Pēc noklusējuma tiks veikta piespiedu konvertēšana uz šo formātu: <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Displejā tiks lietota 1080p, 60Hz izšķirtspēja. Šī opcija nav saderīga ar displeju, ja tajā tiek izmantota 4K, 60Hz izšķirtspēja."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Tehnoloģija Dolby Vision netiek atbalstīta pašreizējā izšķirtspējā. Ja manuāli iespējosiet Dolby Vision, jūsu displeja izšķirtspēja tiks mainīta uz 1080p (60 Hz)."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vai mainīt izšķirtspēju uz 1080p (60 Hz)?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Vienmēr veikt piespiedu konvertēšanu formātā Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ja sadaļas “Displeja papildiestatījumi” HDR formātu sarakstā ir atspējots formāts Dolby Vision, tad, veicot piespiedu konvertēšanu formātā Dolby Vision, tas tiks iespējots."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Vienmēr veikt piespiedu konvertēšanu formātā HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Teksta paraugs"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Brīnumainais burvis no Oza zemes"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. nodaļa: Oza zemes brīnumainā Smaragda pilsēta"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Pat raugoties caur zaļajām brillēm, kas sargāja acis, Dorotija un viņas draugi sākotnēji apžilba no brīnišķīgās pilsētas spožuma. Ielas greznoja skaisti zaļa marmora nami, viscaur izgreznoti ar vizuļojošu smaragdu. Ielas bija izklātas ar tāda paša zaļa marmora bruģi, kura bluķu spraugās bija iestrādātas cieši kopā saliktu smaragdu rindas, kas laistījās saules gaismā. Logos bija zaļa stikla rūtis; pat debesīm virs pilsētas bija zaļa nokrāsa, un arī saules stari šķita zaļi. \n\nIelās bija daudz ļaužu — gan vīrieši, gan sievietes, gan bērni —, un visi bija tērpušies zaļās drēbēs, un tiem bija zaļgana āda. Cilvēki ar izbrīnu uzlūkoja Dorotiju un viņas savādos pavadoņus, un, ieraugot Gļēvo Lauvu, bērni bēga un slēpās aiz savām mātēm. Taču neviens viņus neuzrunāja. Visapkārt bija daudz veikalu, un Dorotija ievēroja, ka arī tajos viss ir zaļš. Tika piedāvātas gan zaļas ledenes un zaļi kukurūzas našķi, gan zaļas kurpes, zaļas cepures un visu veidu zaļas drēbes. Kāds vīrs tirgoja zaļu limonādi, un Dorotija redzēja, ka bērni to pērk, maksājot ar zaļiem penijiem. \n\nNekur nemanīja nevienu zirgu vai citu dzīvnieku; vīri pārvadāja lietas mazos zaļos ratiņos, kurus tie ejot stūma pa priekšu. Visi šķita laimīgi, apmierināti un pārtikuši."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Pat raugoties caur zaļajām brillēm, kas sargāja acis, Dorotija un viņas draugi sākotnēji apžilba no brīnišķīgās pilsētas spožuma. Ielas greznoja skaisti zaļa marmora nami, viscaur izrotāti ar vizuļojošu smaragdu. Ielas bija izklātas ar tāda paša zaļa marmora bruģi, kura bluķu spraugās bija iestrādātas cieši kopā saliktu smaragdu rindas, kas laistījās saules gaismā. Logos bija zaļa stikla rūtis; pat debesīm virs pilsētas bija zaļa nokrāsa, un arī saules stari šķita zaļi. \n\nIelās bija daudz ļaužu — gan vīrieši, gan sievietes, gan bērni —, un visi bija tērpušies zaļās drēbēs, un tiem bija zaļgana āda. Cilvēki ar izbrīnu uzlūkoja Dorotiju un viņas savādos pavadoņus, un, ieraugot Bailīgo Lauvu, bērni bēga un slēpās aiz savām mātēm. Taču neviens viņus neuzrunāja. Visapkārt bija daudz veikalu, un Dorotija ievēroja, ka arī tajos viss ir zaļš. Tika piedāvātas gan zaļas ledenes un zaļi kukurūzas našķi, gan zaļas kurpes, zaļas cepures un visu veidu zaļas drēbes. Kāds vīrs tirgoja zaļu limonādi, un Dorotija redzēja, ka bērni to pērk, maksājot ar zaļiem penijiem. \n\nNekur nemanīja nevienu zirgu vai citu dzīvnieku; vīri pārvadāja lietas mazos zaļos ratiņos, kurus tie ejot stūma pa priekšu. Visi šķita laimīgi, apmierināti un pārtikuši."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formāta atlase"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automātiski"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuāli"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vai mainīt izšķirtspēju uz %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Atlasiet “Labi”, lai turpmāk izmantotu šādu izšķirtspēju: %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Tehnoloģija Dolby Vision netiek atbalstīta režīmā %1$s, un tā būs atspējota displeja papildiestatījumos"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Šis režīms atbalsta %1$s. Dažos televizoros, iespējams, būs jāieslēdz uzlabotais HDMI, lai iespējotu vairāk HDR formātu. Pārbaudiet sava televizora iestatījumus, lai uzzinātu, vai tas tiek atbalstīts."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Šis režīms atbalsta: %1$s\nDažos televizoros, iespējams, būs jāieslēdz uzlabotais HDMI, lai iespējotu vairāk HDR formātu. Pārbaudiet sava televizora iestatījumus, lai uzzinātu, vai tas tiek atbalstīts."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Atcelt"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Labi"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vai dzēst kešatmiņā ievietotos datus?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Tiks dzēsti kešatmiņā ievietotie lietotņu dati."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Izveidots savienojums"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Savienojums pārtraukts"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Jums nav atļaujas mainīt Bluetooth iestatījumus."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Izmantot TV audio izvadei"</string>
     <string name="send_feedback" msgid="936698637869795473">"Sūtīt atsauksmes"</string>
     <string name="launch_help" msgid="2607478763131952469">"Palīdzības centrs"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Šo ierīci pārvalda jūsu organizācija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Šo ierīci pārvalda <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Uzzināt vairāk"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameras lietotne}zero{Kameras lietotnes}one{Kameras lietotnes}other{Kameras lietotnes}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalendāra lietotne"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Iespējot"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurācija"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Izmantot <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Pakalpojumā <xliff:g id="SERVICE">%1$s</xliff:g> var tikt vākts viss jūsu ievadītais teksts, izņemot paroles. Tas attiecas arī uz personas datiem, piemēram, kredītkartes numuru."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"Pakalpojums <xliff:g id="SERVICE">%1$s</xliff:g> varēs nolasīt jūsu ekrānā redzamo saturu, attēlot saturu pāri citām lietotnēm, izsekot jūsu mijiedarbību ar lietotnēm vai aparatūras sensoriem un mijiedarboties ar lietotnēm jūsu vārdā."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Vai apturēt pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbību?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Atlasot “Labi”, pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbība tiks pārtraukta."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Teksta pārvēršana runā"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Savienojums sekmīgi izveidots."</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Rādīt visu"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Notiek meklēšana"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Neizdevās no autentifikatora izgūt konta pievienošanas nolūku."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Neizdevās pievienot kontu, vai arī attiecīgais konta veids nav pieejams."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanāli un ieejas"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanāli, ārējās ieejas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanāli"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Tiek iespējotas šādas funkcijas:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ņemiet vērā, ka, izmantojot šo režīmu, var tikt palielināts ierīces enerģijas patēriņš."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Režīma “<xliff:g id="ENERGYMODENAME">%s</xliff:g>” iespējošana"</string>
+    <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_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/arrays.xml b/Settings/res/values-mk/arrays.xml
index 64406db4e..79c76f871 100644
--- a/Settings/res/values-mk/arrays.xml
+++ b/Settings/res/values-mk/arrays.xml
@@ -54,7 +54,7 @@
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="2544683044075498815">"Многу мали"</item>
     <item msgid="4812733698855185131">"Мали"</item>
-    <item msgid="628695363180883207">"Нормално"</item>
+    <item msgid="628695363180883207">"Нормални"</item>
     <item msgid="7397980392121949818">"Големи"</item>
     <item msgid="8774213681644780958">"Многу големи"</item>
   </string-array>
diff --git a/Settings/res/values-mk/energy-modes.xml b/Settings/res/values-mk/energy-modes.xml
index 36eb8cd36..3304314e7 100644
--- a/Settings/res/values-mk/energy-modes.xml
+++ b/Settings/res/values-mk/energy-modes.xml
@@ -16,27 +16,29 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Суштински карактеристики на мрежата"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Ниска потрошувачка на енергија"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Исклучете ја мрежната врска кога телевизорот не се користи."</string>
+    <string 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-array name="energy_mode_low_features">
-    <item msgid="4976202876230149030">"Критични ажурирања и функции"</item>
+    <item msgid="4976202876230149030">"Важни ажурирања и функции"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Препорачани карактеристики на мрежата"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизирана потрошувачка на енергија"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Вклучува карактеристики што го будат телевизорот преку мрежата (мрежна подготвеност)."</string>
+    <string 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-array name="energy_mode_moderate_features">
-    <item msgid="2654586107956150296">"[Внеси карактеристика 1]"</item>
-    <item msgid="8724721267222341891">"[Внеси карактеристика 2]"</item>
+    <item msgid="2654586107956150296">"[Внесете функција 1]"</item>
+    <item msgid="8724721267222341891">"[Внесете функција 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Дополнителни карактеристики на мрежата"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Зголемена потрошувачка на енергија"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Покрај препорачаните карактеристики, оваа опција вклучува дополнителни карактеристики кога телевизорот не се користи што може да ја зголемат потрошувачката на енергија."</string>
+    <string 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-array name="energy_mode_high_features">
-    <item msgid="3018897868803319747">"[Внеси карактеристика 1]"</item>
-    <item msgid="170760143032597722">"[Внеси карактеристика 2]"</item>
+    <item msgid="3018897868803319747">"[Внесете функција 1]"</item>
+    <item msgid="170760143032597722">"[Внесете функција 2]"</item>
   </string-array>
     <!-- no translation found for energy_mode_high_eco_hint (3266580507783627848) -->
     <skip />
diff --git a/Settings/res/values-mk/strings.xml b/Settings/res/values-mk/strings.xml
index beab89d00..50753b7e4 100644
--- a/Settings/res/values-mk/strings.xml
+++ b/Settings/res/values-mk/strings.xml
@@ -55,7 +55,7 @@
     <string name="device_pref_category_title" msgid="8292572846154873762">"Поставки за уредот"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"Пристапност"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Далечински управувач и додатоци"</string>
-    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Екран и звук"</string>
+    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Приказ и звук"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Помош и повратни информации"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"Приватност"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"Поставки за уредот"</string>
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Поставки за апликацијата"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Локација, користење и дијагностика, реклами"</string>
     <string name="add_account" msgid="7386223854837017129">"Додајте сметка"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Непозната сметка"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Отстрани сметка"</string>
     <string name="account_sync" msgid="4315295293211313989">"Изберете синхронизирани апликации"</string>
     <string name="sync_now" msgid="4335217984374620551">"Синхронизирај сега"</string>
@@ -100,9 +101,9 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"Инсталирани апликации"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"Системски апликации"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"Оневозможени апликации"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"Заштитник на екран"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"Штедач на екран"</string>
     <string name="device_display" msgid="244634591698925025">"Приказ"</string>
-    <string name="device_display_sound" msgid="7399153506435649193">"Екран и звук"</string>
+    <string name="device_display_sound" msgid="7399153506435649193">"Приказ и звук"</string>
     <string name="device_sound" msgid="8616320533559404963">"Звук"</string>
     <string name="device_surround_sound" msgid="1889436002598316470">"Опкружувачки звук"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"Системски звуци"</string>
@@ -141,7 +142,7 @@
     <string name="surround_sound_unsupported_title" msgid="2302820271700954900">"НЕПОДДРЖАНИ ФОРМАТИ"</string>
     <string name="surround_sound_format_info" msgid="5671866505653542934">"ИНФОРМАЦИИ ЗА ФОРМАТОТ"</string>
     <string name="surround_sound_show_formats" msgid="1929849219042916469">"Прикажи ги форматите"</string>
-    <string name="surround_sound_hide_formats" msgid="7770931097236868238">"Сокриј ги форматите"</string>
+    <string name="surround_sound_hide_formats" msgid="7770931097236868238">"Скриј ги форматите"</string>
     <string name="surround_sound_enabled_formats" msgid="5159269040069877148">"ОВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="surround_sound_disabled_formats" msgid="2250466936859455802">"ОНЕВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"За да овозможите, променете го изборот на форматот на „Рачно“."</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Дали сакате да го наметнете HDR-излезот?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Стандардно, ќе се наметне конверзија во <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Екранот ќе работи со резолуција од 1080p 60Hz. Оваа опција не е компатибилна со вашиот екран кога работи со резолуција од 4k 60Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Тековната резолуција не го поддржува Dolby Vision. Ако го вклучите Dolby Vision рачно, резолуцијата на екранот ќе се промени на 1080p 60 Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Дали да се промени резолуцијата на 1080p 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Секогаш наметнувај конверзија во Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Ако Dolby Vision е оневозможен во HDR формати во Напредни поставки за екранот, наметнувањето конверзија во Dolby Vision повторно ќе го овозможи."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Секогаш наметнувај конверзија во HDR10"</string>
@@ -180,7 +179,7 @@
     <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Ако HDR10+ е оневозможен во HDR формати во Напредни поставки за екранот, наметнувањето конверзија во HDR10+ повторно ќе го овозможи."</string>
     <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Секогаш наметнувај конверзија во SDR"</string>
     <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Наметнувањето конверзија во SDR ќе ги оневозможи сите формати во HDR формати во Напредни поставки за екран."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Усогласи со стапка на слики за содржини"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Усогласи со стапка на слики на содржини"</string>
     <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Само беспрекорно"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Ако апликацијата го побара тоа, вашиот уред ќе го усогласи својот излез со оригиналната стапка на слики на содржините што ги гледате, САМО ако вашиот ТВ може да изврши беспрекорен премин."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Поврзаните екрани не поддржуваат непречени промени на стапки на освежување. Опцијава нема да има ефект освен ако промените на екран што ја поддржува."</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Пример за текст"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Чудесниот волшебник од Оз"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Поглавје 11: Чудесниот смарагден град Оз"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"И покрај тоа што очите им беа заштитени со зелени очила, Дороти и нејзините пријатели беа заслепени од блескотот на прекрасниот град. По должината на улиците имаше редици прекрасни куќи, изградени од зелен мермер и украсени насекаде со блескави смарагди. Одеа по тротоар од зелен мермер, а на местата каде што се спојуваа мермерните плочи имаше низи од смарагди наредени еден до друг и светкаа на сонцето. Стаклата на прозорците беа зелени, дури и небото над градот беше зеленикаво, па и самите сончеви зраци се зеленееја. \n\nПокрај нив поминуваа многу луѓе - мажи, жени и деца - сите беа облечени во зелено и имаа зеленикава кожа. Чудејќи се, ги погледнуваа Дороти и нејзиното необично друштво, а сите деца бегаа од нив и се криеја зад своите мајки штом ќе го забележеа лавот; но никој не им се обрати. На улицата имаше многу дуќани и Дороти забележа дека и во нив сѐ е зелено. Тука се продаваа зелени бонбони и зелени пуканки, како и зелени чевли и зелена облека од сите видови. На едно место некој човек продаваше зелена лимонада. Кога децата ја купуваа, Дороти виде дека ја плаќаат со зелени парички. \n\nТука, изгледа, немаше ни коњи ни некои други животни; луѓето туркаа пред себе мали зелени колички и секој изгледаше среќен и задоволен како да живее блажено."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Иако очите им беа заштитени со зелените очила, Дороти и другарите на почеток беа заслепени од сјајот на прекрасниот град. На улиците беа наредени прекрасни куќи, сите од зелен мермер и начичкани со блескави смарагди. Чекореа по патека направена од истиот зелен мермер, а на местата каде што се спојуваа плочите имаше смарагди, наредени еден до друг и блескаа на сончевата светлина. Прозорците беа од зелено стакло; дури и небото над градот имаше зелена нијанса, а и зраците на сонцето беа зелени. \n\nИмаше многу луѓе, мажи, жени и деца кои одеа наоколу и сите беа облечени во зелени алишта и имаа зеленикави кожи. Гледаа во Дороти и нејзината необична свита со чудење, а децата се разбегаа и се сокрија зад мајките кога го видоа Лавот; но никој не им прозборе. Имаше многу продавници на улицата, а Дороти виде дека сѐ во нив е зелено. Се продаваа зелени бонбони и зелени пуканки, како и зелени чевли, зелени капи и секакви зелени алишта. На едно место, еден човек продаваше зелена лимонада, а кога децата ја купуваа, Дороти виде дека ја плаќаат со зелени парички. \n\nИзгледа дека немаше коњи ниту друг вид на животни; мажите ги носеа работите наоколу во мали зелени колички, што ги туркаа пред себе. Сите изгледаа среќни, задоволни и богати."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Избор на формат"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автоматски"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Рачно"</string>
@@ -210,7 +209,7 @@
     <string name="hdr_format_selection_manual_summary" msgid="7886959642083639353">"Кога е избрано, рачно може да ги оневозможите HDR-форматите што синџирот на уреди ги поддржува, а предизвикуваат проблеми со репродукцијата. Не може присилно да се овозможат HDR-форматите што вашиот синџир на уреди не ги поддржува. Апликациите може да изберат формат што не е со највисок квалитет."</string>
     <string name="hdr_format_info" msgid="5652559220799426076">"ИНФОРМАЦИИ ЗА ФОРМАТОТ"</string>
     <string name="hdr_show_formats" msgid="171065892975445851">"Прикажи ги форматите"</string>
-    <string name="hdr_hide_formats" msgid="8561568998525727230">"Сокриј ги форматите"</string>
+    <string name="hdr_hide_formats" msgid="8561568998525727230">"Скриј ги форматите"</string>
     <string name="hdr_enabled_formats" msgid="8527870623949982774">"ОВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="hdr_disabled_formats" msgid="4758522849421497896">"ОНЕВОЗМОЖЕНИ ФОРМАТИ"</string>
     <string name="hdr_enabled_format_info_clicked" msgid="1466675962665861040">"За да оневозможите, променете го изборот на форматот на „Рачно“."</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Да се промени резолуцијата на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Изберете „Во ред“ за да користите %1$s отсега, па натаму."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision не е поддржан кај %1$s и ќе биде оневозможен во „Напредни поставки за екран“"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Овој режим поддржува %1$s. На некои телевизори, можеби ќе треба да вклучите „Подобрен HDMI“ за да се овозможат повеќе HDR-формати. Проверете ги поставките на телевизорот за да видите дали е поддржано ова."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Режимов поддржува: %1$s\nна некои телевизори, можеби ќе треба да вклучите „Подобрен HDMI“ за да се овозможат повеќе HDR-формати. Проверете ги поставките на телевизорот за да видите дали е поддржано ова."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Откажи"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Во ред"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Исчисти кеширани податоци?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ова ќе исчисти кеширани податоци за сите аплик."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Поврзано"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Не е поврзано"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Немате дозвола за промена на поставките на Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Користи за аудио на ТВ"</string>
     <string name="send_feedback" msgid="936698637869795473">"Испратете повратни информации"</string>
     <string name="launch_help" msgid="2607478763131952469">"Центар за помош"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -299,7 +298,7 @@
     <string name="system_home_theater_control" msgid="6228949628173590310">"Контрола на домашно кино"</string>
     <string name="system_developer_options" msgid="8480844257066475479">"Опции на програмер"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"Ништо"</string>
-    <string name="system_diagnostic" msgid="1654842813331919958">"Употреба и дијагностика"</string>
+    <string name="system_diagnostic" msgid="1654842813331919958">"Користење и дијагностика"</string>
     <string name="no_device_admins" msgid="4628974717150185625">"Не се достапни апликации за администраторот на уредот"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Оневозможено од администраторот"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Не е достапно"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Вашата организација управува со уредов."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> управува со уредов."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" U+2060⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Дознајте повеќе"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Апликација за камера}one{Апликации за камера}other{Апликации за камера}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Апликацијата „Календар“"</string>
@@ -392,7 +390,7 @@
     <string name="device_status_summary" msgid="3270932829412434985">"Мрежа, сериски броеви и други информации"</string>
     <string name="manual" msgid="5683935624321864999">"Рачно"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"Регулаторни информации"</string>
-    <string name="device_feedback" msgid="4871903271442960465">"Испрати информации за уредот"</string>
+    <string name="device_feedback" msgid="4871903271442960465">"Повратни информации за уредов"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"Подигнувачот веќе е отклучен"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"Прво поврзете се на интернет"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"Поврзете се на интернет или контактирајте со операторот"</string>
@@ -682,7 +680,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Текст со висок контраст"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Текст во болд"</string>
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Корекција на боите"</string>
-    <string name="color_correction_usage" msgid="4160611639548748657">"Користи „Корекција на бои“"</string>
+    <string name="color_correction_usage" msgid="4160611639548748657">"Користи „Корекција на боите“"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Режим во боја"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Девтераномалија"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Црвена и зелена"</string>
@@ -695,7 +693,7 @@
     <string name="palette_color_orange" msgid="6209196069366109835">"Портокалова"</string>
     <string name="palette_color_yellow" msgid="298466132578870590">"Жолта"</string>
     <string name="palette_color_green" msgid="4904783063036825668">"Зелена"</string>
-    <string name="palette_color_cyan" msgid="3212217287628948203">"Цијан"</string>
+    <string name="palette_color_cyan" msgid="3212217287628948203">"Тиркизна"</string>
     <string name="palette_color_blue" msgid="8836682634988540630">"Сина"</string>
     <string name="palette_color_purple" msgid="2123828754639683555">"Виолетова"</string>
     <string name="palette_color_gray" msgid="4014534773994261194">"Сива"</string>
@@ -745,14 +743,14 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Овозможи"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурација"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Употреби <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ може да го прибира целиот текст што го внесувате, освен лозинките. Тоа опфаќа и лични податоци, како што се броеви на кредитни картички."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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_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>
@@ -763,14 +761,14 @@
     <string name="system_apps" msgid="8481888654606868074">"Апликации"</string>
     <string name="system_stay_awake" msgid="5935117574414511413">"Остани во активен режим"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Екранот никогаш нема да биде во режим во мирување"</string>
-    <string name="system_hdcp_checking" msgid="3757586362130048838">"Проверување HDCP"</string>
+    <string name="system_hdcp_checking" msgid="3757586362130048838">"Проверка со HDCP"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI оптимизација"</string>
     <string name="system_reboot_confirm" msgid="7035370306447878560">"Рестартирај сега?"</string>
     <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"За да ја ажурирате оваа поставка, потребно е рестартирање на вашиот уред"</string>
     <string name="system_never_check" msgid="2860070727606369055">"Никогаш не проверувај"</string>
     <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"Провери само DRM содржина"</string>
     <string name="system_always_check" msgid="384870282800221580">"Секогаш проверувај"</string>
-    <string name="system_bt_hci_log" msgid="1891838112637932603">"Најава на Bluetooth HCI"</string>
+    <string name="system_bt_hci_log" msgid="1891838112637932603">"Евиденција за Bluetooth HCI"</string>
     <string name="system_email_address" msgid="3725494874473757217">"Адреса за е-пошта"</string>
     <string name="system_usb_debugging" msgid="2158285492172755923">"Отстранување грешки преку USB"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Овозможи лажни локации"</string>
@@ -779,17 +777,17 @@
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Потврди апликации преку USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Провери апликации инсталирани преку ADB/ADT за штетно однесување"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Вербално пријавување на Wi‑Fi"</string>
-    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Овозможи вербално пријавување на Wi‑Fi"</string>
+    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Овозможи детално евидентирање за Wi-Fi"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Прикажи допири"</string>
     <string name="system_pointer_location" msgid="8724050865245555084">"Локација на покажувач"</string>
-    <string name="system_show_layout_bounds" msgid="8803080672553699649">"Прикажи граници на слој"</string>
+    <string name="system_show_layout_bounds" msgid="8803080672553699649">"Прикажи граници на распоред"</string>
     <string name="system_show_gpu_view_updates" msgid="1625918928089365222">"Прикажи ажурирање со GPU"</string>
     <string name="system_show_hardware_layer" msgid="5833664339844452290">"Прикажи слој на хардвер"</string>
     <string name="system_show_gpu_overdraw" msgid="5073007513540516704">"Прикажи GPU пречекорување"</string>
     <string name="system_show_surface_updates" msgid="7680759813613585278">"Прикажи ажуририрања на површина"</string>
-    <string name="system_window_animation_scale" msgid="685477540250939659">"Опсег на анимација на прозор"</string>
-    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Степен на преодна анимација"</string>
-    <string name="system_animator_duration_scale" msgid="3829445237130423625">"Скала за времетраење на аниматор"</string>
+    <string name="system_window_animation_scale" msgid="685477540250939659">"Брзина на анимации за прозорци"</string>
+    <string name="system_transition_animation_scale" msgid="7266380208347453619">"Брзина на преодни анимации"</string>
+    <string name="system_animator_duration_scale" msgid="3829445237130423625">"Брзина на општи анимации"</string>
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Овозможен е строг режим"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Прикажување профил на GPU"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"Овозможи траги"</string>
@@ -799,12 +797,12 @@
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"Оневозможи режим на штедење"</string>
     <string name="system_desc_hdcp_checking" msgid="1664068008848077241">"Користи само за DRM содржина"</string>
     <string name="system_desc_hdmi_optimization" msgid="5695603795556335912">"Оптимизирај го екранот за максимална резолуција или максимална брзина на приказ на кадри. Ова влијае само врз Ултра HD-екрани. Менувањето на оваа поставка ќе предизвика рестартирање на вашиот уред."</string>
-    <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Овозможи Bluetooth HCI за евиденција на пресретнување пакети"</string>
+    <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"Овозможи евиденција за Bluetooth HCI"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"Режим за отстранување грешки кога е поврзано USB"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"Пред да се изврши, апликацијата во која се отстрануваат грешки чека да се закачи програмата за отстранување грешки"</string>
-    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Прикажи граници на клип, маргини итн."</string>
+    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"Прикажувај граници на исечок, маргини итн."</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"Осветли прегледи во прозорците при цртање со GPU"</string>
-    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Осветли слоеви на хардвер со зелено при нивно ажурирање"</string>
+    <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"Осветлувај ги хардверските слоеви со зелено кога се ажурираат"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"Од најдобро кон најлошо: сино, зелено, светло црвено, црвено"</string>
     <string name="system_desc_show_surface_updates" msgid="4018685547515133353">"Осветли површини на прозорци при нивно ажурирање"</string>
     <string name="system_desc_strict_mode_enabled" msgid="1974896408481676324">"Осветли екран при долги операции на главна нишка"</string>
@@ -825,12 +823,12 @@
     <string name="enable_opengl_traces_none" msgid="4718084947494592040">"Нема"</string>
   <string-array name="animation_scale_entries">
     <item msgid="5408992662476056082">"Анимацијата е исклучена"</item>
-    <item msgid="6818290063799857019">"Опсег на анимација 0,5x"</item>
-    <item msgid="8257959452691080724">"Опсег на анимација 1x"</item>
-    <item msgid="4781052272686018414">"Опсег на анимација 1,5x"</item>
-    <item msgid="2272016945160227610">"Опсег на анимација 2x"</item>
-    <item msgid="5015441793276576312">"Опсег на анимација 5x"</item>
-    <item msgid="1290233583371556415">"Опсег на анимација 10x"</item>
+    <item msgid="6818290063799857019">"Брзина на анимации 0,5x"</item>
+    <item msgid="8257959452691080724">"Брзина на анимации 1x"</item>
+    <item msgid="4781052272686018414">"Брзина на анимации 1,5x"</item>
+    <item msgid="2272016945160227610">"Брзина на анимации 2x"</item>
+    <item msgid="5015441793276576312">"Брзина на анимации 5x"</item>
+    <item msgid="1290233583371556415">"Брзина на анимации 10x"</item>
   </string-array>
     <string name="track_frame_time_off" msgid="8845064783618702239">"Исклучено"</string>
     <string name="track_frame_time_bars" msgid="5841531515222229632">"На екранот како цртички"</string>
@@ -874,7 +872,7 @@
     <string name="inputs_aux" msgid="5331442342029867329">"Aux"</string>
     <string name="inputs_custom_name" msgid="2649826613531559538">"Приспособено име"</string>
     <string name="inputs_custom_name_description_fmt" msgid="2879134265596928298">"Внесете име за влезот <xliff:g id="INPUT">%1$s</xliff:g>."</string>
-    <string name="inputs_hide" msgid="9223355763198742416">"Сокриј"</string>
+    <string name="inputs_hide" msgid="9223355763198742416">"Скриј"</string>
     <string name="inputs_show" msgid="2937435050499142756">"Прикажи го овој влез"</string>
     <string name="input_header_names" msgid="5903234218909970550">"Име"</string>
     <string name="inputs_hdmi_control" msgid="650355636965841054">"Контрола на HDMI"</string>
@@ -950,10 +948,10 @@
     <string name="settings_on" msgid="7734010120323404333">"Вклучено"</string>
     <string name="settings_off" msgid="4060451657850476369">"Исклучено"</string>
     <string name="device_daydreams_none" msgid="3405655350757277348">"Исклучи го екранот"</string>
-    <string name="device_daydreams_select" msgid="7203264446482623438">"Заштитник на екран"</string>
+    <string name="device_daydreams_select" msgid="7203264446482623438">"Штедач на екран"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"Започни сега"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"Кога да започне"</string>
-    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Заштитникот на екран започнува по овој период на неактивност. Ако не е избран заштитник на екран, екранот се исклучува."</string>
+    <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Штедачот на екран започнува по овој период на неактивност. Ако не е избран штедач на екран, екранот се исклучува."</string>
     <string name="device_daydreams_sleep_summary" msgid="3081688734381995693">"По <xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
     <string name="device_energy_saver_screen_off" msgid="6908468996426629480">"Исклучи го екранот"</string>
     <!-- no translation found for device_energy_saver_timeout_description (3206609135199137514) -->
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Поврзувањето е успешно"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Прикажи ги сите"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Се пребарува"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Не можеше да се вчита намерата за додавање сметка од Authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Не можеше да се додаде сметка или типот сметка не е достапен."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Канали и влезови"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Канали, надворешни влезови"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Канали"</string>
@@ -1119,12 +1119,17 @@
     <string name="screen_settings_title" msgid="7806908869190824434">"Екран"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"Звук"</string>
     <string name="power_and_energy" msgid="4638182439670702556">"Напојување и енергија"</string>
-    <string name="power_on_behavior" msgid="927607372303160716">"Однесување кога е вклучен"</string>
+    <string name="power_on_behavior" msgid="927607372303160716">"Однесување при вклучувањето"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"Ресетирај"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"Код за спарување преку Ethernet"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"Режим на енергија"</string>
-    <string name="energy_modes_summary" msgid="7196407759836930799">"Подобрете ја енергетската ефикасност кога не се користи телевизорот"</string>
+    <string name="energy_modes" msgid="1331693860386361744">"Енергетски режим"</string>
+    <string name="energy_modes_summary" msgid="7196407759836930799">"Подобрете ја енергетската ефикасност кога телевизорот не се користи"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Овозможува:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имајте предвид дека овој режим може да ја зголеми потрошувачката на енергија на уредот."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Да се овозможи „<xliff:g id="ENERGYMODENAME">%s</xliff:g>“?"</string>
+    <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_integration_hint" msgid="7560895390042161430">"Кога е овозможена „Најди го мојот далечински управувач“, може да репродуцирате звук за да го лоцирате далечинскиот управувач на Google TV ако е изгубен."</string>
+    <string name="find_my_remote_play_sound" msgid="3364983972397728084">"Репродуцирај звук"</string>
 </resources>
diff --git a/Settings/res/values-mk/widget-strings.xml b/Settings/res/values-mk/widget-strings.xml
index 779028ddf..92684a6ea 100644
--- a/Settings/res/values-mk/widget-strings.xml
+++ b/Settings/res/values-mk/widget-strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="text_obfuscation_toggle_caption" msgid="8131892286447339613">"Сокриј ја лозинката"</string>
+    <string name="text_obfuscation_toggle_caption" msgid="8131892286447339613">"Скриј ја лозинката"</string>
 </resources>
diff --git a/Settings/res/values-ml/energy-modes.xml b/Settings/res/values-ml/energy-modes.xml
index 11d539733..f9df24af9 100644
--- a/Settings/res/values-ml/energy-modes.xml
+++ b/Settings/res/values-ml/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ആവശ്യമായ നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"കുറഞ്ഞ ഊർജ്ജ ഉപഭോഗം"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ടിവി ഉപയോഗിക്കാത്തപ്പോൾ നെറ്റ്‌വർക്ക് കണക്ഷൻ ഓഫാക്കുക."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"നിർണ്ണായക അപ്ഡേറ്റുകളും ഫംഗ്ഷനുകളും"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"നിർദ്ദേശിച്ച നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ഒപ്റ്റിമൈസ് ചെയ്‌ത ഊർജ്ജ ഉപഭോഗം"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"നെറ്റ്‌വർക്കിലൂടെ ടിവിയെ സജീവമാക്കുന്ന ഫീച്ചറുകൾ ഓണാക്കുന്നു (സ്റ്റാൻഡ്‌ബൈ ആയി നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[ഫീച്ചർ 1 ചേർക്കുക]"</item>
     <item msgid="8724721267222341891">"[ഫീച്ചർ 2 ചേർക്കുക]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"അധിക നെറ്റ്‌വർക്ക് ഫീച്ചറുകൾ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"വർദ്ധിച്ച ഊർജ്ജ ഉപഭോഗം"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"നിർദ്ദേശിച്ച ഫീച്ചറുകൾക്ക് പുറമേ, ടിവി ഉപയോഗിക്കാത്തപ്പോൾ ഈ ഓപ്‌ഷൻ അധിക ഫീച്ചറുകൾ ഓണാക്കുന്നു, അത് ഊർജ്ജ ഉപഭോഗം വർധിപ്പിച്ചേക്കാം."</string>
+    <string 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-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 10779df31..6e92a503a 100644
--- a/Settings/res/values-ml/strings.xml
+++ b/Settings/res/values-ml/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ആപ്പ് ക്രമീകരണം"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ലൊക്കേഷൻ, ഉപയോഗം, പ്രശ്‌നനിർണ്ണയം, പരസ്യങ്ങൾ എന്നിവ"</string>
     <string name="add_account" msgid="7386223854837017129">"അക്കൗണ്ട് ചേർക്കുക"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"അജ്ഞാത അക്കൗണ്ട്"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"അക്കൗണ്ട് നീക്കംചെയ്യുക"</string>
     <string name="account_sync" msgid="4315295293211313989">"സമന്വയിപ്പിച്ച ആപ്പുകൾ തിരഞ്ഞെടുക്കുക"</string>
     <string name="sync_now" msgid="4335217984374620551">"ഇപ്പോൾ സമന്വയിപ്പിക്കുക"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"സാമ്പിൾ ടെക്‌സ്‌റ്റ്"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ഓസ് നഗരത്തിലെ അതിശയിപ്പിക്കുന്ന മന്ത്രവാദി"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"അധ്യായം 11: ഓസ് എന്ന അത്ഭുതകരമായ മരതകനഗരം"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"പച്ചക്കണ്ണടകൾ കൊണ്ട് കണ്ണുകൾ പരിരക്ഷിച്ച നിലയിലായിരുന്നുവെങ്കിലും, അത്ഭുതകരമായ നഗരത്തിന്റെ ഹരിതദീപ്‌തി കണ്ട് ഡൊറോത്തിയും കൂട്ടുകാരും അന്തംവിട്ടുപോയി. തെരുവുകളുടെ ഇരുഭാഗത്തും പച്ച മാർബിളുകൾ കൊണ്ട് നിർമ്മിച്ച കെട്ടിടങ്ങൾ നിരന്നുനിന്നിരുന്നു, എല്ലായിടത്തും തിളങ്ങുന്ന മരതകം പതിച്ചിരുന്നു. വീടുകൾ നിർമ്മിച്ചിരുന്ന അതേ പച്ച മാർബിൾ പതിച്ച നടപ്പാതയിലൂടെ അവർ നടന്നു, നടപ്പാതയിൽ വിരിച്ചിരുന്ന മാർബിൾ ബ്ലോക്കുകൾ കൂടിച്ചേരുന്ന ഇടങ്ങളിൽ മരതകത്തിന്റെ നിരകൾ കാണാനുണ്ടായിരുന്നു. സൂര്യവെളിച്ചത്തിൽ, അടുത്തടുത്തായി അടുക്കിയിരുന്ന മരതകങ്ങൾ വെട്ടിത്തിളങ്ങി. വീടുകളുടെ ജാലകങ്ങൾ പച്ച നിറത്തിൽ ഉള്ളവയായിരുന്നു. നഗരത്തിന് മുകളിലെ ആകാശം ഹരിതാഭമായിരുന്നു, സൂര്യപ്രകാശം പോലും പച്ചയായിരുന്നു. \n\nപുരുഷന്മാരും സ്ത്രീകളും കുട്ടികളും ഉൾപ്പെടെ അനേകം പേർ അവിടവിടെ നടന്നിരുന്നു. എല്ലാവരും അണിഞ്ഞിരുന്നത് പച്ച വസ്ത്രങ്ങളായിരുന്നു, അവരുടെ ചർമ്മവും പച്ചയായിരുന്നു. ഡൊറോത്തിയെയും അവളുടെ അപരിചിതരായ കൂട്ടുകാരെയും അവർ അത്ഭുതത്തോടെ നോക്കി. സിംഹത്തെ കണ്ടപ്പോൾ എല്ലാ കുട്ടികളും ഓടിപ്പോയി അവരുടെ അമ്മമാരുടെ പിന്നിലൊളിച്ചു. എന്നാൽ ആരും ഡൊറോത്തിയോടും കൂട്ടുകാരോടും സംസാരിച്ചില്ല. തെരുവിൽ പല തരത്തിലുള്ള കടകളും ഉണ്ടായിരുന്നു. അവയിൽ ഉണ്ടായിരുന്നവയെല്ലാം പച്ച നിറത്തിലായിരുന്നു. പച്ച മിഠായികളും പച്ച പോപ്പ്കോണും വിൽപ്പനയ്ക്ക് വച്ചിരുന്നു. കൂടാതെ വിൽപ്പനയ്ക്ക് വച്ചിരുന്ന ഷൂകളും തൊപ്പികളും വസ്ത്രങ്ങളും പച്ച നിറത്തിൽ തന്നെയായിരുന്നു. ഒരിടത്ത് ഒരു മനുഷ്യൻ പച്ച നിറത്തിലുള്ള നാരങ്ങാവെള്ളം വിൽക്കുന്നത് അവർ കണ്ടു. അത് വാങ്ങുന്നതിന് കുട്ടികൾ കൊടുക്കുന്ന നാണയങ്ങളും പച്ച നിറത്തിലായിരുന്നുവെന്നത് ഡൊറോത്തിയെ അത്ഭുതപ്പെടുത്തി. \n\nകുതിരകളെയോ മറ്റ് തരത്തിലുള്ള മൃഗങ്ങളെയോ അവിടെ കാണാനുണ്ടായിരുന്നില്ല. ചെറിയ പച്ച വണ്ടികളിൽ ആളുകൾ സാധനങ്ങൾ തള്ളിക്കൊണ്ട് പോകുന്നത് ഡൊറോത്തിയും കൂട്ടുകാരും കണ്ടു. അവിടെ ഉണ്ടായിരുന്നവരെല്ലാം സംതൃപ്‌തരും സന്തോഷവാന്മാരും സമ്പന്നരുമായി കാണപ്പെട്ടു."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"പച്ചക്കണ്ണടകൾ കൊണ്ട് കണ്ണുകൾ പരിരക്ഷിച്ച നിലയിലായിരുന്നുവെങ്കിലും, അത്ഭുതകരമായ നഗരത്തിന്റെ ഹരിതദീപ്‌തി കണ്ട് ഡൊറോത്തിയും കൂട്ടുകാരും അന്തംവിട്ടുപോയി. തെരുവുകളുടെ ഇരുഭാഗത്തും പച്ച മാർബിളുകൾ കൊണ്ട് നിർമ്മിച്ച കെട്ടിടങ്ങൾ നിരന്നുനിന്നിരുന്നു, എല്ലായിടത്തും തിളങ്ങുന്ന മരതകം പതിച്ചിരുന്നു. വീടുകൾ നിർമ്മിച്ചിരുന്ന അതേ പച്ച മാർബിൾ പതിച്ച നടപ്പാതയിലൂടെ അവർ നടന്നു, നടപ്പാതയിൽ വിരിച്ചിരുന്ന മാർബിൾ ബ്ലോക്കുകൾ കൂടിച്ചേരുന്ന ഇടങ്ങളിൽ മരതകത്തിന്റെ നിരകൾ കാണാനുണ്ടായിരുന്നു. സൂര്യവെളിച്ചത്തിൽ, അടുത്തടുത്തായി അടുക്കിയിരുന്ന മരതകങ്ങൾ വെട്ടിത്തിളങ്ങി. വീടുകളുടെ ജാലകങ്ങൾ പച്ച നിറത്തിൽ ഉള്ളവയായിരുന്നു. നഗരത്തിന് മുകളിലെ ആകാശം ഹരിതാഭമായിരുന്നു, സൂര്യപ്രകാശം പോലും പച്ചയായിരുന്നു. \n\nപുരുഷന്മാരും സ്ത്രീകളും കുട്ടികളും ഉൾപ്പെടെ അനേകം പേർ അവിടവിടെ നടന്നിരുന്നു. എല്ലാവരും അണിഞ്ഞിരുന്നത് പച്ച വസ്ത്രങ്ങളായിരുന്നു, അവരുടെ ചർമ്മവും പച്ചയായിരുന്നു. ഡൊറോത്തിയെയും അവളുടെ അപരിചിതരായ കൂട്ടുകാരെയും അവർ അത്ഭുതത്തോടെ നോക്കി. സിംഹത്തെ കണ്ടപ്പോൾ എല്ലാ കുട്ടികളും ഓടിപ്പോയി അവരുടെ അമ്മമാരുടെ പിന്നിലൊളിച്ചു. എന്നാൽ ആരും ഡൊറോത്തിയോടും കൂട്ടുകാരോടും സംസാരിച്ചില്ല. തെരുവിൽ പല തരത്തിലുള്ള കടകളും ഉണ്ടായിരുന്നു. അവയിൽ ഉണ്ടായിരുന്നവയെല്ലാം പച്ച നിറത്തിലായിരുന്നു. പച്ച മിഠായികളും പച്ച പോപ്പ്കോണും വിൽപ്പനയ്ക്ക് വച്ചിരുന്നു. കൂടാതെ വിൽപ്പനയ്ക്ക് വച്ചിരുന്ന ഷൂകളും തൊപ്പികളും വസ്ത്രങ്ങളും പച്ച നിറത്തിൽ തന്നെയായിരുന്നു. ഒരിടത്ത് ഒരു മനുഷ്യൻ പച്ച നിറത്തിലുള്ള നാരങ്ങാവെള്ളം വിൽക്കുന്നത് അവർ കണ്ടു. അത് വാങ്ങുന്നതിന് കുട്ടികൾ കൊടുക്കുന്ന നാണയങ്ങളും പച്ച നിറത്തിലായിരുന്നുവെന്നത് ഡൊറോത്തിയെ അത്ഭുതപ്പെടുത്തി. \n\nകുതിരകളെയോ മറ്റ് തരത്തിലുള്ള മൃഗങ്ങളെയോ അവിടെ കാണാനുണ്ടായിരുന്നില്ല. ചെറിയ പച്ച വണ്ടികളിൽ ആളുകൾ സാധനങ്ങൾ തള്ളിക്കൊണ്ട് പോകുന്നത് ഡൊറോത്തിയും കൂട്ടുകാരും കണ്ടു. അവിടെ ഉണ്ടായിരുന്നവരെല്ലാം സംതൃപ്‌തരും സന്തോഷവാന്മാരും സമ്പന്നരുമായി കാണപ്പെട്ടു."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ഫോർമാറ്റ് തിരഞ്ഞെടുക്കൽ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"സ്വയമേവയുള്ള"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"നേരിട്ടുള്ള"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"റെസല്യൂഷൻ %1$s ആക്കി മാറ്റണോ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ഇപ്പോൾ മുതൽ %1$s ഉപയോഗിക്കാൻ ശരി തിരഞ്ഞെടുക്കുക."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s എന്നതിൽ ഡോൾബി വിഷൻ പിന്തുണയ്‌ക്കുന്നില്ല, ഇത് \"വിപുലമായ ഡിസ്‌പ്ലേ ക്രമീകരണത്തിൽ\" പ്രവർത്തനരഹിതമാക്കും"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ഈ മോഡ് %1$s പിന്തുണയ്‌ക്കുന്നു. ചില ടിവികളിൽ, കൂടുതൽ HDR ഫോർമാറ്റുകൾ പ്രവർത്തനക്ഷമമാക്കാൻ നിങ്ങൾക്ക് മെച്ചപ്പെടുത്തിയ HDMI ഓണാക്കേണ്ടി വന്നേക്കാം. ഇതിന് പിന്തുണയുണ്ടോ എന്നറിയാൻ നിങ്ങളുടെ ടിവി ക്രമീകരണം പരിശോധിക്കുക."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ഈ മോഡ് ഇനിപ്പറയുന്നത് പിന്തുണയ്ക്കുന്നു: %1$s\nചില ടിവികളിൽ, കൂടുതൽ HDR ഫോർമാറ്റുകൾ പ്രവർത്തനക്ഷമമാക്കാൻ നിങ്ങൾക്ക് മെച്ചപ്പെടുത്തിയ HDMI ഓണാക്കേണ്ടി വന്നേക്കാം. ഇതിന് പിന്തുണയുണ്ടോ എന്നറിയാൻ നിങ്ങളുടെ ടിവി ക്രമീകരണം പരിശോധിക്കുക."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"റദ്ദാക്കുക"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ശരി"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"കാഷെ ചെയ്‌ത ഡാറ്റ മായ്‌ക്കണോ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ഇത് എല്ലാ അപ്ലിക്കേഷനുകൾക്കുമായി കാഷെ ചെയ്ത ഡാറ്റ മായ്‌ക്കും."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"കണക്റ്റ് ചെയ്തു"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"വിച്ഛേദിച്ചു"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ടിവി ഓഡിയോയ്ക്കായി ഉപയോഗിക്കുക"</string>
     <string name="send_feedback" msgid="936698637869795473">"ഫീഡ്ബാക്ക് അയയ്ക്കുക"</string>
     <string name="launch_help" msgid="2607478763131952469">"സഹായകേന്ദ്രം"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -286,7 +287,7 @@
     <string name="language_empty_list_user_restricted" msgid="5430199913998605436">"ഉപകരണ ഭാഷ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
     <string name="system_keyboard" msgid="1514460705385401872">"കീബോർഡ്"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"കീബോർഡും സ്വയമേവ പൂരിപ്പിക്കലും"</string>
-    <string name="system_autofill" msgid="6983989261108020046">"സ്വമേധയാ പൂരിപ്പിക്കൽ"</string>
+    <string name="system_autofill" msgid="6983989261108020046">"സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
     <string name="system_home" msgid="2149349845791104094">"ഹോം സ്‌ക്രീൻ"</string>
     <string name="system_search" msgid="3170169128257586925">"Search"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ഈ ഉപകരണം മാനേജുചെയ്യുന്നത് നിങ്ങളുടെ സ്ഥാപനമാണ്."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ഈ ഉപകരണം നിയന്ത്രിക്കുന്നത് <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ആണ്."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"കൂടുതലറിയുക"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ക്യാമറാ ആപ്പ്}other{ക്യാമറാ ആപ്പുകൾ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar ആപ്പ്"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"കോൺഫിഗറേഷൻ"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"പാസ്‌വേഡുകൾ ഒഴികെ നിങ്ങൾ ടൈപ്പുചെയ്ത എല്ലാ ടെക്സ്റ്റും <xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് ശേഖരിക്കാനാകും. ക്രെഡിറ്റ് കാർഡ് നമ്പറുകൾ പോലുള്ള വ്യക്തിഗത ഡാറ്റ ഇതിൽ ഉൾപ്പെടുന്നു."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -847,8 +847,8 @@
     <string name="title_current_keyboard" msgid="891238509164879851">"നിലവിലെ കീബോർഡ്"</string>
     <string name="title_configure" msgid="846802387014612210">"കോൺഫിഗർ ചെയ്യുക"</string>
     <string name="desc_configure_keyboard" msgid="3474279140150468141">"ക്കീബോർഡ് ഓപ്ഷനുകൾ"</string>
-    <string name="title_current_autofill_service" msgid="9029001041887283153">"നിലവിലെ സ്വമേധയാ പൂരിപ്പിക്കൽ സേവനം"</string>
-    <string name="title_select_autofill_service" msgid="696559582725756848">"സ്വമേധയാ പൂരിപ്പിക്കൽ സേവനം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="title_current_autofill_service" msgid="9029001041887283153">"നിലവിലെ സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം"</string>
+    <string name="title_select_autofill_service" msgid="696559582725756848">"സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം തിരഞ്ഞെടുക്കുക"</string>
     <string name="autofill_none" msgid="1615056985649424207">"ഒന്നുമില്ല"</string>
     <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=പാസ്‍വേഡ് സേവനം&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
     <string name="computing_size" msgid="8623916230485437579">"കണക്കാക്കുന്നു…"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"കണക്‌റ്റ് ചെയ്‌തു"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"എല്ലാം കാണിക്കുക"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"തിരയുന്നു"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ഓതന്റിക്കേറ്ററിൽ നിന്ന് \'അക്കൗണ്ട് ചേർക്കൽ ഇന്റെന്റ്\' വീണ്ടെടുക്കാനായില്ല."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"അക്കൗണ്ട് ചേർക്കാനായില്ല അല്ലെങ്കിൽ അക്കൗണ്ട് തരം ലഭ്യമല്ല."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ചാനലുകളും ഇൻപുട്ടുകളും"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ചാനലുകൾ, ബാഹ്യ ഇൻപുട്ടുകൾ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ചാനലുകൾ"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"പ്രവർത്തനക്ഷമമാക്കുന്നു:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ഉപകരണത്തിന്റെ ഊർജ്ജ ഉപഭോഗം ഈ മോഡ് വർദ്ധിപ്പിച്ചേക്കാമെന്ന കാര്യം ശ്രദ്ധിക്കുക."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <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_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 91a73ecc2..e34ec5eb1 100644
--- a/Settings/res/values-mn/energy-modes.xml
+++ b/Settings/res/values-mn/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Сүлжээний үндсэн онцлогууд"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Эрчим хүчний бага хэрэглээ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ТВ-ийг ашиглаагүй үед сүлжээний холболтыг унтраана уу."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Чухал шинэчлэлт болон ажиллагаа"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Санал болгосон сүлжээний онцлогууд"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Эрчим хүчний оновчилсон хэрэглээ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ТВ-ийг сүлжээгээр (сүлжээнд холбогдсон зогсолт) сэрээдэг онцлогуудыг асаана."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Сүлжээний нэмэлт онцлогууд"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Эрчим хүчний нэмэгдсэн хэрэглээ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Санал болгосон онцлогуудаас гадна энэ сонголт нь ТВ-ийг ашиглаагүй үед нэмэлт онцлогуудыг асаадаг бөгөөд энэ нь эрчим хүчний хэрэглээг нэмэгдүүлж магадгүй."</string>
+    <string 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-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 0bb78022f..a5c025c88 100644
--- a/Settings/res/values-mn/strings.xml
+++ b/Settings/res/values-mn/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Аппын тохиргоо"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Байршил, Ашиглалт болон оношилгоо, Зар"</string>
     <string name="add_account" msgid="7386223854837017129">"Аккаунт нэмэх"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Тодорхойгүй бүртгэл"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Бүртгэлийг хасах"</string>
     <string name="account_sync" msgid="4315295293211313989">"Синк хийгдсэн программыг сонгоно уу"</string>
     <string name="sync_now" msgid="4335217984374620551">"Одоо синк хийх"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Жишээ текст"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Озын Гайхамшигт шидтэн"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Бүлэг 11: Озын Гайхамшигт Маргад эрдэнийн хот"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Дороти болон түүний нөхөд ногоон шилээр нүдээ хамгаалсан байсан ч гайхамшигт хотын гялтганах гэрэлд нүд нь гялбаж байлаа. Хотын байшингуудыг ногоон гантигаар барьсан ба энд тэндгүй маргад эрдэнийн чулууг битүү шигтгэсэн байх аж. Тэдний явж буй маргад ногоон замыг хооронд нь маргад эрдэнээр холбосон бөгөөд нарны гэрэлд гялалзана. Байшингуудын цонхыг ногоон өвсөөр хүрээлсэн бөгөөд тэр ч бүү хэл тэнгэрийн хаяа, нарны цацраг нь хүртэл ногоон туяатай байлаа. \n\nЭнд тэндгүй ногоон өнгийн хувцас өмссөн, арьс нь ногоон туяатай хүмүүс явж байв. Тэд Дороти болон түүний хачирхалтай нөхдийг гайхан харах бөгөөд хүүхэд багачууд арсланг харсан даруйдаа ээжийнхээ ард нуугдах хэдий ч хэн ч тэдэнтэй үг сольсонгүй. Гудамжинд маш олон дэлгүүр байх хэдий ч тэдгээр нь мөн л ногоон өнгөтэй болохыг Дороти ажив. Дэлгүүрт ногоон өнгийн чихэр, эрдэнэ шиш хямдралтай үнээр зарагдах бөгөөд гутал, малгай зэрэг бүх төрлийн хувцас ногоон өнгөтэй байв. Тэнд нэгэн эр ногоон өнгийн нимбэгийн шүүс зарж байх ба үүнийг нь авч ууж буй хүүхдүүд ногоон өнгийн зоосоор төлбөрөө төлж байхыг Дороти харав. \n\nАжиглаад байхад энд ямар ч амьтан, морь мал байхгүй бөгөөд хүмүүс жижиг тэргээр ачаа бараагаа зөөж харагдана. Энэ хотын бүх хүн аз жаргалтай, амар тайван харагдаж байлаа."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Дороти болон түүний нөхөд ногоон өнгийн шилээр нүдээ хамгаалсан байсан ч гайхамшигт Хотын сүр жавхланд нүд гялбаж байлаа. Хотын байшингуудыг ногоон гантигаар барьсан бөгөөд энд тэндгүй маргад эрдэнийн чулууг битүү шигтгэсэн байх аж. Тэдний явж буй ногоон гантиг замыг хооронд нь маргад эрдэнээр шигүү холбосон нь нарны гэрэлд гялалзан харагдана. Байшингуудын цонхыг ногоон өвсөөр хүрээлсэн, тэр ч бүү хэл энэ Хотын тэнгэрийн хаяа, нарны цацраг нь хүртэл ногоон туяатай байлаа. \n\nЭнд тэндгүй ногоон өнгийн хувцас өмссөн, арьс нь ногоовтор туяатай хүмүүс явж харагдана. Тэд Дороти болон түүний хачирхалтай нөхдийг гайхширсан нүдээр харах бөгөөд хүүхэд багачууд Арсланг харсан даруйдаа ээжийнхээ ард нуугдах хэдий ч тэдэнтэй хэн ч үг сольсонгүй. Гудамжинд маш олон тооны дэлгүүр байх хэдий ч тэдгээр нь мөн л ногоон өнгөтэй болохыг Дороти ажиглав. Дэлгүүрт ногоон өнгийн чихэр болон эрдэнэ шиш байх бөгөөд гутал, малгай зэрэг бүх төрлийн ногоон өнгөтэй хувцас худалдаалж байв. Тэнд нэгэн эр ногоон өнгийн нимбэгний шүүс зарж байхтай таарав. Үүнийг нь авч ууж буй хүүхдүүд ногоон өнгийн зоос төлж байгаа нь Доротид харагдав. \n\nАжиглаад байхад энд ямар ч амьтан, морь мал байхгүй бөгөөд хүмүүс жижиг ногоон тэргээр ачаа бараагаа зөөж харагдана. Энэ хотын бүх хүн аз жаргалтай, амар тайван харагдаж байлаа."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Форматын сонголт"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автомат"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Гар арга"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Нягтралыг %1$s болгож өөрчлөх үү?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Одооноос %1$s-г ашиглахын тулд OK-г сонгоно уу."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision нь %1$s дээр дэмжигдээгүй бөгөөд \"Дэлгэцийн нарийвчилсан тохиргоо\" хэсэгт идэвхгүй болно."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Энэ горим %1$s-г дэмждэг. Зарим ТВ дээр илүү олон HDR форматыг идэвхжүүлэхийн тулд сайжруулсан HDMI-г асаах шаардлагатай байж магадгүй. Үүнийг дэмжиж байгаа эсэхийг харахын тулд ТВ-н тохиргоогоо шалгана уу."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Энэ горим дараахыг дэмждэг: %1$s\nЗарим ТВ-д та бусад HDR форматыг идэвхжүүлэхийн тулд сайжруулсан HDMI-г асаах шаардлагатай байж магадгүй. Үүнийг дэмждэг эсэхийг харахын тулд ТВ-ийн тохиргоогоо шалгана уу."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Цуцлах"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Кеш хийгдсэн өгөгдлийг арилгах уу?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Бүх програмд зориулан кеш хийгдсэн өгөгдлийг арилгах болно."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Холбогдсон"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Салсан"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Танд Bluetooth тохиргоог өөрчлөх зөвшөөрөл байхгүй байна."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ТВ-ийн аудионд ашиглах"</string>
     <string name="send_feedback" msgid="936698637869795473">"Санал хүсэлт илгээх"</string>
     <string name="launch_help" msgid="2607478763131952469">"Тусламжийн төв"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Нэвтрүүлэг"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Энэ төхөөрөмжийг таны байгууллага удирдаж байна."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> удирддаг"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Дэлгэрэнгүй үзэх"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Камерын апп}other{Камерын аппууд}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Хуанлины апп"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Идэвхжүүлэх"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Тохируулга"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> нь нууц үгээс бусад таны бичсэн текстүүдийг хадгалж болно. Үүнд кредит картын дугаар гэх мэт хувийн мэдээлэл багтана."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"OK-г сонгосноор <xliff:g id="SERVICE">%1$s</xliff:g>-г зогсоох болно."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Бичвэрийг ярианд хувиргах"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Амжилттай холбогдлоо"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Бүгдийг харуулах"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Хайж байна"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Баталгаажуулагчаас бүртгэл нэмэх оролдлогыг сэргээж чадсангүй."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Бүртгэл нэмж чадаагүй эсвэл бүртгэлийн төлөв боломжгүй байна."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Суваг, оролт"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Суваг, гадаад оролт"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Суваг"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Идэвхжүүлнэ:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Энэ горим нь төхөөрөмжийн эрчим хүч зарцуулалтыг нэмэгдүүлж болохыг анхаарна уу."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"-г идэвхжүүлэх"</string>
+    <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_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 e89f5d41f..5fe830554 100644
--- a/Settings/res/values-mr/energy-modes.xml
+++ b/Settings/res/values-mr/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"नेटवर्कशी संबंधित आवश्यक वैशिष्‍ट्ये"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ऊर्जेचा कमी वापर"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"टीव्ही वापरात नसताना नेटवर्क कनेक्शन बंद करा."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"महत्त्वाची अपडेट आणि फंक्शन"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"नेटवर्कशी संबंधित शिफारस केलेली वैशिष्‍ट्ये"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ऊर्जेचा ऑप्टिमाइझ केलेला वापर"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"नेटवर्क असताना टीव्ही सुरू होतो अशी वैशिष्‍ट्ये सुरू करा (नेटवर्क असताना स्टँडबाय)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[पहिले वैशिष्‍ट्य घाला]"</item>
     <item msgid="8724721267222341891">"[दुसरे वैशिष्‍ट्य घाला]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"नेटवर्कशी संबंधित अतिरिक्त वैशिष्‍ट्ये"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ऊर्जेचा वाढलेला वापर"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"शिफारस केलेली वैशिष्‍ट्यांव्यतिरिक्त, टीव्ही वापरात नसताना हा पर्याय अतिरिक्त वैशिष्‍ट्ये सुरू करतो, ज्यामुळे ऊर्जेचा वापर वाढू शकतो."</string>
+    <string 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-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 b3617c246..0e05a8715 100644
--- a/Settings/res/values-mr/strings.xml
+++ b/Settings/res/values-mr/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ॲप सेटिंग्ज"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"स्थान, वापर आणि निदाने, जाहिराती"</string>
     <string name="add_account" msgid="7386223854837017129">"खाते जोडा"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"अज्ञात खाते"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"खाते काढा"</string>
     <string name="account_sync" msgid="4315295293211313989">"सिंक केलेली अ‍ॅप्‍स निवडा"</string>
     <string name="sync_now" msgid="4335217984374620551">"आता सिंक करा"</string>
@@ -107,7 +108,7 @@
     <string name="device_surround_sound" msgid="1889436002598316470">"आसपासचा ध्वनी"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"सिस्टम ध्वनी"</string>
     <string name="device_apps" msgid="2134756632245008919">"ॲप्लिकेशन"</string>
-    <string name="device_storage" msgid="8540243547121791073">"संचयन"</string>
+    <string name="device_storage" msgid="8540243547121791073">"स्टोरेज"</string>
     <string name="device_reset" msgid="6115282675800077867">"फॅक्टरी रीसेट करा"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"बॅकअप घ्या आणि रिस्टोअर करा"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"फॅक्‍टरी डेटा रीसेट"</string>
@@ -151,7 +152,7 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"प्रगत आवाज सेटिंग्ज"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"गेम मोडला अनुमती द्या"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"जुळणाऱ्या आशयाची डायनॅमिक रेंज"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"आशय डायनॅमिक रेंज जुळवा"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"हा पर्याय सुरू करताना, आशयाशी जुळण्यासाठी सिस्टीम वेगवेगळ्या डायनॅमिक रेंज फॉरमॅट दरम्यान स्विच करेल. यामुळे फॉरमॅट स्विचच्या वेळी स्क्रीन काळी होऊ शकते.\n\nआणखी डायनॅमिक रेंज पर्यायांसाठी प्रगत डिस्प्ले सेटिंग्जवर क्लिक करा."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"प्राधान्य असलेली डायनॅमिक रेंज"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"सिस्टीमचे प्राधान्य असलेले रूपांतर"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"तुम्हाला HDR आउटपुटची सक्ती करायची आहे का?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"बाय डीफॉल्ट, सक्तीने <xliff:g id="HDR_TYPE">%s</xliff:g> मध्ये रूपांतर केले जाईल."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"तुमचा डिस्प्ले १०८०p ६०Hz रेझोल्यूशन इतक्या वेगाने रन केला जाईल. ४k ६०Hz रेझोल्यूशन इतक्या वेगाने रन होत असते, तेव्हा हा पर्याय तुमच्या डिस्प्लेशी कंपॅटिबल नाही."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"सध्याच्या रेझोल्यूशनवर Dolby Vision ला सपोर्ट नाही. तुम्ही Dolby Vision मॅन्युअली सुरू केल्यास, तुमच्या डिस्प्लेचे रेझोल्यूशन १०८०p ६०Hz वर बदलले जाईल"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"रेझोल्यूशन १०८०p ६०Hz वर बदलायचे आहे का?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"नेहमी सक्तीने Dolby Vision मध्ये रूपांतर करा"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"प्रगत डिस्प्ले सेटिंग्ज मध्ये HDR फॉरमॅट मधील Dolby Vision बंद असल्यास, सक्तीने Dolby Vision मध्ये रूपांतर केल्यास, ते पुन्हा सुरू होईल."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"नेहमी सक्तीने HDR10 मध्ये रूपांतर करा"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"नमुन्याचा मजकूर"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Oz चा अद्भुत जादूगार"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"अध्याय ११: Oz चे अद्भुत पाचूंचे शहर"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"डॉर्थी आणि तिच्या मित्रांचे डोळे हिरव्या चष्म्याने झाकले असले तरीही अद्भुत शहराच्या झगमगाटाने ते विस्मयचकित झाले. रस्त्यांवर हिरव्या संगमरवराने बनलेल्या आणि चमचमणारे पाचू सगळीकडे बसवलेल्या सुंदर घरांच्या रांगा होत्या. ते त्याच हिरव्या मार्बलच्या रस्त्यावरून चालत गेले आणि जेथे ते ब्लॉक एकत्र जुळत होते तेथे पाचू लावलेल्या पंक्ती होत्या व त्या सूर्यप्रकाशात चमकत होते. खिडक्यांचे भाग हिरव्या काचांचे होते; त्या शहरावर असलेल्या आकाशात देखील हिरव्या रंगाची छटा होती आणि सूर्याचे किरण हिरवे होते. \n\n तेथे अनेक पुरुष, स्त्रिया आणि लहान मुले चालत होती, त्यांचे पोशाख हिरव्या रंगाचे होते आणि त्यांची त्वचा हिरवट रंगाची होती. त्यांनी डॉर्थीकडे आणि तिच्या विचित्र सोबत्याकडे आश्चर्यचकित होऊन पाहिले आणि सिंहाला पाहून सर्व लहान मुले पळाली व त्यांच्या आयांच्या पाठीमागे जाऊन लपली, परंतु त्यांच्याशी कोणीही बोलले नाही. रस्त्यांमध्ये अनेक दुकाने होती आणि डॉर्थीने पाहिले की त्यामधील प्रत्येक गोष्ट हिरवी होती. विकण्यासाठी हिरवी कँडी आणि हिरवे पॉप-कॉर्न होते, तसेच हिरवे जोडे, हिरव्या टोप्या आणि सर्व प्रकारचे हिरवे कपडे विक्रीसाठी ठेवले होते. एका ठिकाणी एक माणूस लिंबाचे हिरवे सरबत विकत होता आणि डॉर्थीने पाहिले की लहान मुलांनी ते विकत घेतले आणि त्याच्यासाठी त्यांनी हिरवे पैसे दिले. \n\nतेथे घोडे किंवा कोणत्याही प्रकारचे प्राणी दिसत नव्हते; माणसे ढकलून लहान हिरव्या गाड्यांमध्ये वस्तू घेऊन जात होते. प्रत्येकजण आनंदी, समाधनी आणि समृद्ध दिसत होता."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"डोरोथी आणि तिच्या मित्रमैत्रिणींचे डोळे हिरव्या चष्म्याने झाकलेले असले, तरीही ते अद्भुत शहराच्या झगमगाटाने प्रथम विस्मयचकित झाले. रस्त्यांच्या कडेला हिरव्या संगमरवराने बनलेल्या सुंदर घरांच्या रांगा होत्या आणि त्यांवर चमचमणारे पाचू सगळीकडे बसवले होते. ते त्याच हिरव्या संगमरवराने बनलेल्या रस्त्यावरून चालत गेले आणि जेथे ब्लॉक एकत्र जुळत होते तेथे जवळजवळ बसवलेल्या पाचूच्या रांगा होत्या आणि त्या सूर्यप्रकाशात चमकत होत्या. खिडक्यांची तावदाने हिरव्या काचांची होती; शहरावर असलेल्या आकाशालादेखील हिरव्या रंगाची छटा होती आणि सूर्याची किरणे हिरवी होती. \n\n तेथे अनेक पुरुष, स्त्रिया आणि लहान मुले चालत होती, त्यांचे पोशाख हिरव्या रंगांचे होते आणि त्यांची त्वचा हिरवट रंगाची होती. त्यांनी डोरोथी आणि तिच्या विचित्र सोबत्यांकडे आश्चर्यचकित नजरेने पाहिले आणि सिंहाला पाहून सर्व लहान मुले पळाली व त्यांच्या आयांच्या पाठीमागे जाऊन लपली, पण त्यांच्याशी कोणीही बोलले नाही. रस्त्यांमध्ये अनेक दुकाने होती आणि डोरोथीने पाहिले, की त्यामधील प्रत्येक गोष्ट हिरवी होती. विकण्यासाठी हिरवी कँडी आणि हिरवे पॉप-कॉर्न होते, तसेच हिरवे शूज, हिरव्या टोप्या आणि सर्व प्रकारचे हिरवे कपडे विक्रीसाठी ठेवले होते. एका ठिकाणी एक माणूस लिंबाचे हिरवे सरबत विकत होता आणि डोरोथीने पाहिले, की लहान मुलांनी ते हिरवे पैसे देऊन विकत घेतले. \n\nतेथे घोडे किंवा कोणत्याही प्रकारचे प्राणी दिसत नव्हते; माणसे लहान हिरव्या गाड्या ढकलून त्यामधून वस्तू घेऊन जात होती. सर्वजण आनंदी, समाधनी आणि समृद्ध दिसत होते."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"फॉरमॅटची निवड"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ऑटोमॅटिक"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"मॅन्युअल"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"रेझोल्यूशन %1$s वर बदलायचे आहे का?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"यापुढे %1$s वापरण्यासाठी ओके निवडा."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s वर Dolby Vision ला सपोर्ट नसून ते \"प्रगत डिस्प्ले सेटिंग्ज\" मध्ये बंद केले जाईल"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"हा मोड %1$s ला सपोर्ट करतो. काही टीव्हीवर, आणखी HDR फॉरमॅट सुरू करण्यासाठी, तुम्ही वर्धित HDMI सुरू करणे आवश्यक आहे. याला सपोर्ट आहे का हे पाहण्यासाठी तुमच्या टीव्हीची सेटिंग्ज तपासा."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"हा मोड पुढील गोष्टींना सपोर्ट करतो: %1$s\nकाही टीव्हीवर, आणखी HDR फॉरमॅट सुरू करण्यासाठी, तुम्ही वर्धित HDMI सुरू करणे आवश्यक आहे. याला सपोर्ट आहे का हे पाहण्यासाठी तुमच्या टीव्हीची सेटिंग्ज तपासा."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"रद्द करा"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ओके"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"कॅशे    केलेला डेटा साफ करायचा?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"हे सर्व ॲप्ससाठी कॅशे    केलेला डेटा साफ करेल."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"कनेक्ट केलेले आहे"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"डिस्कनेक्ट केलेले आहे"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"आपल्‍याकडे ब्लूटूथ सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"टीव्ही ऑडिओसाठी वापरा"</string>
     <string name="send_feedback" msgid="936698637869795473">"फीडबॅक पाठवा"</string>
     <string name="launch_help" msgid="2607478763131952469">"मदत केंद्र"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -289,7 +288,7 @@
     <string name="system_keyboard" msgid="1514460705385401872">"कीबोर्ड"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"कीबोर्ड आणि ऑटोफिल"</string>
     <string name="system_autofill" msgid="6983989261108020046">"ऑटोफिल"</string>
-    <string name="system_home" msgid="2149349845791104094">"मुख्य स्क्रीन"</string>
+    <string name="system_home" msgid="2149349845791104094">"होम स्क्रीन"</string>
     <string name="system_search" msgid="3170169128257586925">"शोधा"</string>
     <string name="system_google" msgid="945985164023885276">"Google"</string>
     <string name="system_security" msgid="1012999639810957132">"सुरक्षा आणि निर्बंध"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"हे डिव्हाइस तुमच्या संस्थेने व्यवस्थापित केले आहे."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"अधिक जाणून घ्या"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{कॅमेरा ॲप}other{कॅमेरा ॲप्स}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Calendar अ‍ॅप"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"सक्षम करा"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"कॉंफिगरेशन"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायची?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> संकेतशब्दांशिवाय, तुम्ही टाइप करता तो सर्व मजकूर संकलित करू शकते. यात क्रेडिट कार्ड नंबर सारखा वैयक्तिक डेटा समाविष्ट होतो."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -915,7 +913,7 @@
     <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"तुम्ही चुकीचा पिन 5 वेळा प्रविष्‍ट केला.\n<xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> सेकंदांनी पुन्हा प्रयत्न करा."</string>
     <string name="pin_toast_wrong" msgid="4297542365877164402">"चुकीचा पिन, पुन्हा प्रयत्न करा"</string>
     <string name="pin_toast_not_match" msgid="2439298696342975155">"पुन्हा प्रयत्न करा, पिन जुळत नाही"</string>
-    <string name="wifi_setup_input_password" msgid="8510003548463241234">"<xliff:g id="SSID">%1$s</xliff:g> साठी पासवर्ड प्रविष्‍ट करा"</string>
+    <string name="wifi_setup_input_password" msgid="8510003548463241234">"<xliff:g id="SSID">%1$s</xliff:g> साठी पासवर्ड एंटर करा"</string>
     <string name="wifi_setup_description" msgid="6843574399437584520">"पुढे सुरू ठेवण्यासाठी <xliff:g id="WIFI_SUBMIT_ICON">%1$s</xliff:g> निवडा."</string>
     <string name="label_done_key" msgid="8576286462300373440">"पूर्ण झाले"</string>
     <string name="wifi_setup_connection_success" msgid="3301901673876973474">"यशस्वीरित्या कनेक्ट केले"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"कनेक्शन यशस्वी झाले"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"सर्व दाखवा"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"शोधत आहे"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ऑथेंटिकेटरकडून खाते जोडण्याचा उद्देश मिळवता आला नाही."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"खाते जोडता आले नाही किंवा खाते प्रकार उपलब्ध नाही."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"चॅनल आणि इनपुट"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"चॅनल, बाह्य इनपुट"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"चॅनल"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"सुरू करते:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"या मोडमुळे डिव्हाइसच्या पॉवरचा वापर वाढू शकतो याची नोंद घ्यावी."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" सुरू करा"</string>
+    <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_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 49341cf20..9f97615a5 100644
--- a/Settings/res/values-ms/energy-modes.xml
+++ b/Settings/res/values-ms/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Ciri rangkaian yang penting"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Penggunaan tenaga rendah"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Matikan sambungan rangkaian ketika TV tidak digunakan."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kemaskinian dan fungsi yang amat penting"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Ciri rangkaian yang disyorkan"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Penggunaan tenaga dioptimumkan"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Menghidupkan ciri yang membangkitkan TV melalui rangkaian (tunggu sedia berangkaian)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ciri rangkaian tambahan"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Penggunaan tenaga meningkat"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Selain ciri yang disyorkan, pilihan ini menghidupkan ciri tambahan ketika TV tidak digunakan. Hal ini boleh meningkatkan penggunaan tenaga."</string>
+    <string 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-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 2f75b4d5f..b7c7e6c20 100644
--- a/Settings/res/values-ms/strings.xml
+++ b/Settings/res/values-ms/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Tetapan Apl"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokasi, Penggunaan &amp; Diagnostik, Iklan"</string>
     <string name="add_account" msgid="7386223854837017129">"Tambah akaun"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Akaun Tidak Diketahui"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Alih keluar akaun"</string>
     <string name="account_sync" msgid="4315295293211313989">"Pilih aplikasi disegerakkan"</string>
     <string name="sync_now" msgid="4335217984374620551">"Segerakkan sekarang"</string>
@@ -112,7 +113,7 @@
     <string name="device_backup_restore" msgid="3634531946308269398">"Sandarkan &amp; Pulihkan"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Tetapan semula data kilang"</string>
     <string name="device_calibration" msgid="2907914144048739705">"Penentukuran"</string>
-    <string name="device_energy_saver" msgid="6611757996220443028">"Pemasa Pemati"</string>
+    <string name="device_energy_saver" msgid="6611757996220443028">"Pemasa untuk Mematikan TV"</string>
     <string name="device_energy_saver_summary" msgid="5306058475316008429">"Tetapkan pemasa untuk mematikan TV dan menjimatkan tenaga"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"Peranti"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Adakah anda mahu memaksa output HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Secara lalai, penukaran akan dipaksa menjadi <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Paparan anda akan dijalankan pada peleraian 60Hz 1080p. Pilihan ini tidak serasi dengan paparan anda apabila dijalankan pada peleraian 60Hz 4k."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision tidak disokong pada peleraian semasa. Jika anda mendayakan Dolby Vision secara manual, peleraian pada paparan anda akan ditukarkan kepada 60Hz 1080p"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Tukar peleraian kepada 60Hz 1080p?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Sentiasa paksa penukaran kepada Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Jika Dolby Vision dilumpuhkan dalam Format HDR dalam Tetapan Paparan Lanjutan, tindakan memaksa penukaran kepada Dolby Vision akan mendayakan semula Dolby Vision."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Sentiasa paksa penukaran kepada HDR10"</string>
@@ -180,7 +179,7 @@
     <string name="dynamic_range_selection_force_hdr10plus_summary" msgid="918038386222537401">"Jika HDR10+ dilumpuhkan dalam Format HDR dalam Tetapan Paparan Lanjutan, tindakan memaksa penukaran kepada HDR10+ akan mendayakan semula HDR10+."</string>
     <string name="dynamic_range_selection_force_sdr_title" msgid="1063579223517652945">"Sentiasa paksa penukaran kepada SDR"</string>
     <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"Tindakan memaksa penukaran kepada SDR akan melumpuhkan semua format dalam Format HDR dalam Tetapan Paparan Lanjutan."</string>
-    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Kadar bingkai kandungan dipadankan"</string>
+    <string name="match_content_frame_rate_title" msgid="153291168560947689">"Padankan kadar bingkai kandungan"</string>
     <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"Lancar sahaja"</string>
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Jika diminta oleh apl, peranti anda akan memadankan output mengikut kadar bingkai asal kandungan yang sedang anda tonton, HANYA jika TV anda boleh menjalankan peralihan yang lancar."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Paparan anda yang disambungkan tidak menyokong peralihan kadar segar semula yang lancar. Pilihan ini tidak akan memberikan kesan melainkan anda menukar kepada paparan yang menyokong tindakan."</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Teks contoh"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Ahli Sihir Oz yang Menakjubkan"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Bab 11: Oz, Kota Zamrud yang Menakjubkan"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Biarpun mata mereka ditutupi cermin mata hijau, Dorothy dan rakan-rakannya tetap silau dengan kilauan Kota hebat yang terang-benderang itu. Rumah-rumah cantik yang diperbuat daripada marmar hijau bertatah batu zamrud yang berkilau-kilau membarisi jalan-jalannya. Mereka berjalan di atas laluan jalan kaki yang berturap marmar hijau serupa. Zamrud disusun rapi di garisan cantuman bongkah-bongkah laluan itu, sehingga bergemerlapan dalam terangnya sinaran matahari. Cermin tingkap diperbuat daripada kaca berwarna hijau; malah langit yang memayungi Kota itu berwarna kehijauan, bahkan sinar matahari juga berwarna hijau. \n\nKelihatan ramai orang, lelaki, wanita dan kanak-kanak, berjalan-jalan, dan mereka berpakaian serba hijau dan berkulit kehijauan. Mereka memandang Dorothy dan rakannya yang pelbagai rupa dengan penuh tanda-tanya, malah kanak-kanak berlari dan bersembunyi di sebalik tubuh ibu mereka apabila ternampak sang Singa; namun tiada siapa yang menegur. Banyak kedai terdapat di jalan, dan Dorothy mendapati semua barangan di dalam kedai-kedai itu berwarna hijau. Ada dijual gula-gula hijau dan bertih jagung hijau, selain kasut hijau, topi hijau dan pelbagai jenis pakaian hijau. Di satu tempat, seorang lelaki menjual lemonad hijau, dan apabila kanak-kanak membelinya, Dorothy lihat mereka membayar dengan duit syiling hijau. \n\nTidak kelihatan kuda atau sebarang jenis haiwan lain; kaum lelaki menggunakan pedati kecil berwarna hijau yang ditolak oleh mereka sendiri untuk mengangkut barang-barang. Semua orang kelihatan gembira dan bahagia dan makmur."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Biarpun mata mereka ditutupi cermin mata hijau, Dorothy dan rakan-rakannya tetap silau dengan kilauan Kota hebat yang terang-benderang itu. Rumah-rumah cantik yang diperbuat daripada marmar hijau bertatah batu zamrud yang berkilau-kilau membarisi jalan. Mereka berjalan di atas laluan jalan kaki yang berturap marmar hijau serupa. Zamrud disusun rapi di garisan cantuman bongkah-bongkah laluan itu, bergemerlapan dalam sinaran matahari. Cermin tingkap diperbuat daripada kaca berwarna hijau; malah langit yang memayungi Kota itu berwarna kehijauan, bahkan sinar matahari juga berwarna hijau. \n\nKelihatan ramai orang, lelaki, wanita dan kanak-kanak, berjalan-jalan dengan berpakaian serba hijau dan berkulit kehijauan. Mereka memandang Dorothy dan rakannya yang pelbagai rupa dengan penuh tanda tanya, malah kanak-kanak berlari dan bersembunyi di sebalik tubuh ibu mereka apabila ternampak sang Singa; namun tiada sesiapa yang menegur. Terdapat banyak kedai di jalan dan Dorothy mendapati semua barangan di dalam kedai-kedai itu berwarna hijau. Ada gula-gula hijau dan bertih jagung hijau, selain kasut hijau, topi hijau dan pelbagai jenis pakaian hijau. Di satu tempat, seorang lelaki menjual lemonad hijau dan apabila kanak-kanak membeli lemonad itu, Dorothy lihat mereka membayar dengan duit syiling hijau. \n\nTidak kelihatan kuda atau sebarang jenis haiwan lain; kaum lelaki menggunakan pedati kecil berwarna hijau yang ditolak oleh mereka sendiri untuk mengangkut barang-barang. Semua orang kelihatan gembira, bahagia dan makmur."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Pilihan format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatik"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Tukar resolusi kepada %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Pilih OK untuk menggunakan %1$s mulai sekarang."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision tidak disokong pada %1$s dan akan dilumpuhkan dalam \"Tetapan Paparan Terperinci\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Mod ini menyokong %1$s. Pada sesetengah TV, anda mungkin perlu menghidupkan HDMI Dipertingkat untuk mendayakan lebih banyak format HDR. Semak tetapan TV anda untuk melihat jika ciri ini disokong."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Mod ini menyokong: %1$s\nPada sesetengah TV, anda mungkin perlu menghidupkan HDMI Dipertingkatkan untuk mendayakan lebih banyak format HDR. Semak tetapan TV anda untuk melihat jika ciri ini disokong."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Batal"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Padam bersih data cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Ini akan memadam bersih data cache semua apl."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Disambungkan"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Diputuskan sambungan"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Anda tidak mempunyai kebenaran untuk menukar tetapan Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Gunakan untuk audio TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Hantar maklum balas"</string>
     <string name="launch_help" msgid="2607478763131952469">"Pusat Bantuan"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Peranti ini diurus oleh organisasi anda."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Peranti ini diurus oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Ketahui lebih lanjut"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Apl kamera}other{Apl kamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Apl Kalendar"</string>
@@ -359,7 +357,7 @@
     <string name="app_names_concatenation_template_2" msgid="5297284354915830297">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"Tutorial"</string>
-    <string name="about_system_update" msgid="7421264399111367755">"Kemas kini sistem"</string>
+    <string name="about_system_update" msgid="7421264399111367755">"Kemaskinian sistem"</string>
     <string name="system_update_description" msgid="998883510488461766">"Ini akan mengemas kini perisian sistem anda kepada versi terkini. Peranti anda akan dimulakan semula."</string>
     <string name="system_update_content_description" msgid="5702888187682876466">"Kemas kini sistem, Ini akan mengemas kini perisian sistem anda kepada versi terkini. Peranti anda akan dimulakan semula."</string>
     <string name="about_preference" msgid="9112690446998150670">"Perihal"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Dayakan"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurasi"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> boleh mengumpulkan semua teks yang anda taip, kecuali kata laluan. Ini termasuklah data peribadi, seperti nombor kad kredit."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> akan dapat membaca skrin anda, memaparkan kandungan yang menindan apl lain, menjejaki interaksi anda dengan penderia apl atau perkakasan dan berinteraksi dengan apl bagi pihak anda."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Memilih OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Teks kepada pertuturan"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Sambungan berjaya"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Paparkan semua"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Mencari"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Gagal mendapatkan niat tambahkan akaun daripada pengesah."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Gagal menambahkan akaun atau jenis akaun tidak tersedia."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Saluran &amp; Input"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Saluran, input luar"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Saluran"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Mendayakan:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Harap maklum bahawa mod ini mungkin meningkatkan penggunaan tenaga peranti."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Dayakan \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 e126da04d..02fb62e74 100644
--- a/Settings/res/values-my/energy-modes.xml
+++ b/Settings/res/values-my/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"မရှိမဖြစ် ကွန်ရက်အင်္ဂါရပ်များ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"လျော့ကျသွားသော စွမ်းအင်အသုံးပြုမှု"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV သုံးမနေပါက ကွန်ရက်ချိတ်ဆက်မှုကို ပိတ်ပါ။"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"အရေးကြီးအပ်ဒိတ်နှင့် လုပ်ဆောင်ချက်များ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"အကြံပြုထားသော ကွန်ရက်အင်္ဂါရပ်များ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ပိုကောင်းအောင်လုပ်ထားသော စွမ်းအင်အသုံးပြုမှု"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ကွန်ရက်မှတစ်ဆင့် TV ကို နှိုးသော အင်္ဂါရပ်များကို ဖွင့်ပေးသည် (အရန်သင့် ကွန်ရက်ချိတ်ဆက်ထားသည်)။"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ထပ်ဆောင်း ကွန်ရက်အင်္ဂါရပ်များ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"မြင့်တက်လာသော စွမ်းအင်အသုံးပြုမှု"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"အကြံပြုထားသော တူးလ်များအပြင် TV သုံးမနေပါက ဤနည်းလမ်းသည် စွမ်းအင်အသုံးပြုမှုကို မြင့်တက်စေနိုင်သော ထပ်ဆောင်းအင်္ဂါရပ်များကို ဖွင့်ပေးသည်။"</string>
+    <string 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-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 4a0d57b80..50fa92e03 100644
--- a/Settings/res/values-my/strings.xml
+++ b/Settings/res/values-my/strings.xml
@@ -42,7 +42,7 @@
     <string name="header_category_device" msgid="3023893663454705969">"ကိရိယာ"</string>
     <string name="header_category_preferences" msgid="3738388885555798797">"ဦးစားပေးချက်များ"</string>
     <string name="header_category_accessories" msgid="6479803330480847199">"အဝေးထိန်းခလုတ်နှင့် ဆက်စပ်ပစ္စည်းများ"</string>
-    <string name="header_category_personal" msgid="7880053929985150368">"ကိုယ်ရေး"</string>
+    <string name="header_category_personal" msgid="7880053929985150368">"ကိုယ်ပိုင်"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"ကွန်ရက်သို့ ချိတ်ဆက်ရန်"</string>
     <string name="add_an_account" msgid="2601275122685226096">"အကောင့်တစ်ခုထည့်ရန်"</string>
     <string name="accounts_category_title" msgid="7286858931427579845">"အကောင့်များနှင့် အကောင့်ဝင်ရောက်ခြင်း"</string>
@@ -55,7 +55,7 @@
     <string name="device_pref_category_title" msgid="8292572846154873762">"စက် ရွေးချယ်စရာများ"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"အများသုံးနိုင်မှု"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"အဝေးထိန်းခလုတ်နှင့် ဆက်စပ်ပစ္စည်းများ"</string>
-    <string name="display_and_sound_category_title" msgid="9203309625380755860">"ဖန်သားပြင်ပြသမှုနှင့် အသံ"</string>
+    <string name="display_and_sound_category_title" msgid="9203309625380755860">"ဖန်သားပြင်နှင့် အသံ"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"အကူအညီနှင့် အကြံပြုချက်"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"ကန့်သတ်ဆက်တင်"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"စက်ဆက်တင်များ"</string>
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"အက်ပ်ဆက်တင်များ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"တည်နေရာ၊ အသုံးပြုမှု၊ အမှားရှာဖွေခြင်းနှင့် ကြော်ငြာများ"</string>
     <string name="add_account" msgid="7386223854837017129">"အကောင့်ထည့်ရန်"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"အမျိုးအမည်မသိ အကောင့်"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"အကောင့်ကို ဖယ်ရှားရန်"</string>
     <string name="account_sync" msgid="4315295293211313989">"စင့်ခ်လုပ်ထားသည့် အက်ပ်များ ရွေးရန်"</string>
     <string name="sync_now" msgid="4335217984374620551">"ယခု စင့်ခ်လုပ်ရန်"</string>
@@ -100,9 +101,9 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"ထည့်ထားသည့် အက်ပ်များ"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"စနစ် အက်ပ်များ"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"ပိတ်ထားသော အက်ပ်များ"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"စခရင်နားချိန်"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"စခရင်နားချိန်ပုံ"</string>
     <string name="device_display" msgid="244634591698925025">"မြင်ကွင်း"</string>
-    <string name="device_display_sound" msgid="7399153506435649193">"ဖန်သားပြင်ပြသမှုနှင့် အသံ"</string>
+    <string name="device_display_sound" msgid="7399153506435649193">"ဖန်သားပြင်နှင့် အသံ"</string>
     <string name="device_sound" msgid="8616320533559404963">"အသံ"</string>
     <string name="device_surround_sound" msgid="1889436002598316470">"ပတ်ပတ်လည်အသံစနစ်"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"စနစ်၏ အသံများ"</string>
@@ -146,8 +147,8 @@
     <string name="surround_sound_disabled_formats" msgid="2250466936859455802">"ပိတ်ထားသည့်ဖော်မက်"</string>
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"ဖွင့်ရန် ဖော်မက်ရွေးချယ်မှုကို ‘ကိုယ်တိုင်’ သို့ ပြောင်းပါ။"</string>
     <string name="surround_sound_enabled_format_info_clicked" msgid="4003154853054756792">"ပိတ်ရန် ဖော်မက်ရွေးချယ်မှုကို ‘ကိုယ်တိုင်’ သို့ ပြောင်းပါ။"</string>
-    <string name="display_category_title" msgid="247804007525046312">"ဖန်သားပြင်ပြသမှု"</string>
-    <string name="advanced_display_settings_title" msgid="6293280819870140631">"အဆင့်မြင့် ဖန်သားပြင်ပြသမှု ဆက်တင်များ"</string>
+    <string name="display_category_title" msgid="247804007525046312">"ဖန်သားပြင်"</string>
+    <string name="advanced_display_settings_title" msgid="6293280819870140631">"အဆင့်မြင့် ဖန်သားပြင် ဆက်တင်များ"</string>
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"အဆင့်မြင့် အသံ ဆက်တင်များ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"ဂိမ်းမုဒ် ခွင့်ပြုခြင်း"</string>
@@ -155,7 +156,7 @@
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"ဤရွေးစရာကို ဖွင့်ထားသောအခါ စနစ်သည် အကြောင်းအရာနှင့် ကိုက်ညီစေရန် အရောင်အပိုင်းအခြား ဖော်မက်အမျိုးမျိုးကြား ပြောင်းမည်။ ၎င်းက ဖော်မက်ပြောင်းလဲမှုအတွင်း အမည်းရောင်စခရင်ကို ဖြစ်စေနိုင်သည်။\n\nနောက်ထပ် အရောင်အပိုင်းအခြား ရွေးစရာများအတွက် ‘အဆင့်မြင့် ဖန်သားပြင်’ ဆက်တင်များကို နှိပ်ပါ။"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ဦးစားပေး အရောင်အပိုင်းအခြား"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"စနစ်ဦးစားပေး ပြောင်းလဲမှု"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"စနစ်အား ဖော်မက်ပြောင်းလဲမှုကို စီမံခွင့်ပြုပါ"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"စနစ်အား ဖော်မက်ပြောင်းလဲမှုကို စီမံခွင့်ပြုသည်"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"၎င်းကို ရွေးထားသောအခါ စနစ်သည် သင့်ဖန်သားပြင်သို့ပို့ရန် သင့်တော်သော အရောင်အပိုင်းအခြားကို ဆုံးဖြတ်ပေးပြီး အကြောင်းအရာကို ဤအရောင်အပိုင်းအခြားသို့ လိုသလိုပြောင်းပေးမည်။"</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"အကြောင်းအရာ၏ ဖော်မက်ကို အမြဲတမ်း ကိုက်ညီအောင်လုပ်သည်"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"ပြောင်းလဲမှု လုပ်ခိုင်းခြင်း"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"နမူနာ စာသား"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Oz ၏ အံ့ဖွယ်ဝိဇ္ဇာ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"အခန်း ၁၁- Oz ၏ အံ့ဖွယ် မြစိမ်းရောင်မြို့တော်"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"မျက်လုံးများကို ကာကွယ်ရန် အစိမ်းရောင်မျက်မှန်များ တပ်ထားသော်လည်း ဒေါ်ရသီနှင့် သူ့သူငယ်ချင်းများသည် အံ့ဖွယ်မြို့တော်၏ တောက်ပမှုကြောင့် မျက်စိစူးသွားပါသေးသည်။ အစိမ်းရောင်စကျင်ကျောက်များဖြင့် ဆောက်လုပ်ထားပြီး တဖိတ်ဖိတ်တောက်ပနေသည့် မြများ မြှုပ်သွင်းထားသည့် လှပသောအိမ်များကို လမ်းများတစ်လျှောက် အစီအရီ တည်ဆောက်ထားပါသည်။ နေရောင်အောက်တွင် တစ်လျှပ်လျှပ်တောက်ပနေသည့် မြများကို ခပ်စိတ်စိတ် အတန်းလိုက် စီတန်း၍ဆက်ထားပြီး ယင်းအစိမ်းရောင်စကျင်ကျောက်ဖြင့် ဆက်ခင်းထားသည့် ပလက်ဖောင်းတစ်လျှောက် သူတို့ လမ်းလျှောက်လာခဲ့ကြသည်။ ပြတင်းပေါက်မှန်အားလုံးသည် အစိမ်းရောင်ဖန်သားများဖြစ်သည်။ မြို့အထက်ရှိ ကောင်းကင်ပြင်သည်ပင်လျှင် အစိမ်းရောင်သန်းလျက်ရှိပြီး နေရောင်ခြည်သည်လည်း အစိမ်းရောင်ပင်ဖြစ်သည်။ \n\nလူများစွာရှိပြီး ယောက်ျား၊ မိန်းမနှင့် ကလေးများ လမ်းလျှောက်လျက်ရှိကာ သူတို့အားလုံးသည် အစိမ်းရောင်အဝတ်အစားများကို ဝတ်ဆင်ထား၍ အစိမ်းရောင်သန်းသည့် အသားအရေများ ရှိကြပါသည်။ သူတို့သည် ဒေါ်ရသီနှင့် ကွဲပြားခြားနားသည့် သူ့အဖော်များကို စိတ်ဝင်တစား ကြည့်နေကြပြီး ခြင်္သေ့ကို တွေ့လိုက်သည့်အခါတွင် ကလေးများက သူတို့၏ မိခင်နောက်ကျောသို့ သွားရောက် ကွယ်ဝှက်နေကြသည်။ သို့သော် မည်သူကမျှ သူတို့ကို စကားမပြောကြပါ။ လမ်းတစ်လျှောက် ဆိုင်များစွာ ရှိသည်။ ၎င်းဆိုင်များရှိ အရာအားလုံးသည် အစိမ်းရောင်များဖြစ်သည်ကို ဒေါ်ရသီ တွေ့ခဲ့ရသည်။ အစိမ်းရောင်ချိုချဉ်နှင့် အစိမ်းရောင်ပေါက်ပေါက်ဆုပ်တို့အပြင် အစိမ်းရောင်ဖိနပ်၊ အစိမ်းရောင်ဦးထုပ်နှင့် အစိမ်းရောင် အဝတ်အထည် မျိုးစုံတို့ကို ရောင်းနေကြသည်။ တစ်နေရာတွင် လူတစ်ဦးသည် အစိမ်းရောင် သံပရာရည်ကို ရောင်းချနေပြီး ကလေးများကလည်း အစိမ်းရောင် ဒင်္ဂါးပြားများဖြင့် ပေးချေနေသည်ကို ဒေါ်ရသီတွေ့ခဲ့ရသည်။ \n\nထိုနေရာတွင် မြင်းအစရှိသည့် တိရစ္ဆာန်တစ်ကောင်မျှ မတွေ့ခဲ့ရပါ။ ယောက်ျားများသည် ပစ္စည်းများကို အစိမ်းရောင်လှည်းလေးများတွင်ထည့်၍ တွန်းသွားပါသည်။ လူတိုင်းလူတိုင်းသည် ပျော်ရွှင်ကျေနပ်အားရနေပုံ ရပါသည်။"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"မျက်လုံးများကို အစိမ်းရောင်မျက်မှန်များဖြင့် ကာကွယ်ထားသော်လည်း ဒေါ်ရသီနှင့် မိတ်ဆွေများသည် အံ့ဩဖွယ်မြို့တော်၏ တောက်ပမှုကြောင့် ပထမတော့ မျက်လုံးကျိန်းသွားခဲ့ရပါသည်။ လမ်းများတစ်လျှောက် အစိမ်းရောင်သလင်းကျောက်များဖြင့် ဆောက်လုပ်ထားသည့်အိမ်များ စီတန်းလျက်ရှိပြီး လင်းလက်သည့် မြစိမ်းရောင်ကျောက်များဖြင့် နေရာအနှံ့အပြားတွင် အလှဆင်ထားပါသည်။ ထိုအစိမ်းရောင် သလင်းကျောက်လူသွားလမ်းပေါ် သူတို့လျှောက်ခဲ့ကြသည်။ တစ်ခုနှင့် တစ်ခုဆက်ထားသည့်နေရာတွင် မြစိမ်းရောင်ကျောက်များ စီတန်းထားပြီး စူးရှသည့်နေရောင်အောက်တွင် တဖိတ်ဖိတ်တောက်ပလျက်ရှိပါသည်။ ပြတင်းပေါက်များသည်လည်း အစိမ်းရောင်မှန်သားများဖြစ်ပြီး မြို့တော်၏အထက်ဝေဟင် ကောင်းကင်ပင်လျှင် အစိမ်းရောင်သန်းလျက်ရှိပါသည်။ နေရောင်ခြည်အလင်းတန်းများသည်လည်း အစိမ်းရောင်များပင်။ \n\nယောက်ျားများ၊ မိန်းများနှင့် ကလေးငယ်များ လမ်းလျှောက်နေကြသူအများအပြားသည် အစိမ်းရောင်အဝတ်အထည်များ ဝတ်ဆင်ထားပြီး အစိမ်းရောင်အသားအရည်ရှိကြပါသည်။ ထိုသူတို့သည် ဒေါ်ရသီနှင့် သူ၏ထူးဆန်းထွေပြားသည့် မိတ်ဆွေများကို အံ့ဩသည့် မျက်လုံးများဖြင့် ကြည့်နေကြပြီး ကလေးများသည် ခြင်္သေ့ကိုတွေ့သည့်အခါ ထွက်ပြေးပြီး ၎င်းတို့၏မိခင်များ၏နောက်တွင် သွားရောက်ပုန်းခိုနေကြပါသည်။ သို့သော်လည်း မည်သူမျှ သူတို့ကို စကားမပြောခဲ့ကြပါ။ လမ်းပေါ်တွင် ဆိုင်များစွာရှိပါသည်။ ၎င်းတို့ထံတွင် အရာရာတိုင်းက အစိမ်းရောင်ဖြစ်သည်ကို ဒေါ်ရသီတွေ့မြင်ခဲ့ရသည်။ အစိမ်းရောင်ဖိနပ်များ၊ အစိမ်းရောင်ဦးထုပ်များနှင့် အစိမ်းရောင် အဝတ်ထည်အမျိုးမျိုးတို့အပြင် အစိမ်းရောင်ချိုချဉ်နှင့် အစိမ်းရောင် ပြောင်းဖူးပေါက်ပေါက်များကိုလည်း ရောင်းနေကြသည်။ တစ်နေရာတွင် လူကြီးတစ်ယောက်သည် အစိမ်းရောင် သံပုရာရည်ရောင်းနေပြီး ဝယ်ယူသည့်ကလေးငယ်များက အစိမ်းရောင်အကြွေစေ့များဖြင့် ပေးချေနေကြသည်ကို ဒေါ်ရသီတွေ့မြင်ခဲ့ရသည်။ \n\nမြင်းများ သို့မဟုတ် အခြားမည်သည့်တိရစ္ဆာန်မျိုးမှ ရှိပုံမရပါ။ ယောက်ျားများသည် ပစ္စည်းများကို အစိမ်းရောင်လှည်းလေးများတွင်ထည့်၍ တွန်းထိုးသယ်ယူနေပါသည်။ လူတိုင်းလူတိုင်းသည် ပျော်ရွှင်ကျေနပ်အားရနေပုံ ရပါသည်။"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ဖော်မက် ရွေးချယ်မှု"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"အလိုအလျောက်"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ကိုယ်တိုင်"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ပုံရိပ်ပြတ်သားကိန်းကို %1$s သို့ ပြောင်းမလား။"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"%1$s ကို ယခုမှစသုံးရန် OK ကိုရွေးပါ။"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"‘Dolby မြင်ကွင်း’ ကို %1$s ဖြင့် မပံ့ပိုးသဖြင့် \"အဆင့်မြင့် ဖန်သားပြင်ဆက်တင်များ\" တွင် ပိတ်ပါမည်"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ဤမုဒ်သည် %1$s ကို ပံ့ပိုးသည်။ အချို့ TV များတွင် နောက်ထပ် HDR ဖော်မက်များ ဖွင့်ရန် ‘အဆင့်မြင့် HDMI’ ကို ဖွင့်ရန် လိုအပ်နိုင်သည်။ ၎င်းကို ပံ့ပိုးထားခြင်း ရှိ၊ မရှိ သိနိုင်ရန် TV ဆက်တင်များကို ကြည့်ပါ။"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ဤမုဒ်ကပံ့ပိုးသည့် အမျိုးအစားများ- %1$s\nTV အချို့တွင် နောက်ထပ် HDR ဖော်မက်များ ဖွင့်ရန်အတွက် ‘အဆင့်မြင့် HDMI’ ကိုဖွင့်ရန် လိုအပ်နိုင်သည်။ ၎င်းကို ပံ့ပိုးထားခြင်း ရှိ၊ မရှိ သိနိုင်ရန် TV ဆက်တင်များကို ကြည့်ပါ။"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"မလုပ်တော့"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ကရှ်ဒေတာများကို ရှင်းမည်လား?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"apps အားလုံးအတွက် ကရှ်ဒေတာများကို ရှင်းမည်။"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"ချိတ်ဆက်ထားသည်"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ချိတ်ဆက်မထားပါ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ဘလူးတုသ် ဆက်တင်များကို ပြောင်းလဲရန် သင့်ဆီမှာ ခွင့်ပြုချက် မရှိပါ။"</string>
+    <string name="bluetooth_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="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ဤစက်ပစ္စည်းကို သင်၏အဖွဲ့အစည်းက စီမံခန့်ခွဲထားသည်။"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က စီမံခန့်ခွဲထားပါသည်။"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"၊"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ပိုမိုလေ့လာရန်"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ကင်မရာအက်ပ်}other{ကင်မရာအက်ပ်များ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ပြက္ခဒိန်အက်ပ်"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ဖွင့်ပါ"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"စီစဉ်သတ်မှတ်ချက်"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g>ကိုသုံးမလား?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> သည် သက် ရိုက်ထည့်သည့် စာသား အားလုံးကို၊ စကားဝှက်များမှ အပ၊ စုစည်းနိုင်သည်။ ၎င်းထဲမှာ အကြွေးကဒ် နံပါတ်များလို ကိုယ်ရေး ဒေတာများ ပါဝင်ကြသည်။"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"OK ကို ရွေးပါက <xliff:g id="SERVICE">%1$s</xliff:g>ကို ရပ်ပါမည်။"</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"စာမှ စကားသို့"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ချိတ်ဆက်ပြီးပါပြီ"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"အားလုံးပြရန်"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"ရှာဖွေနေသည်"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"အကောင့်ထည့်ခြင်း ရည်ရွယ်ချက်ကို အထောက်အထားစိစစ်စနစ်မှ ပြန်ယူ၍မရပါ။"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"အကောင့်ထည့်၍မရပါ (သို့) အကောင့်အမျိုးအစား မရနိုင်ပါ။"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ချန်နယ်နှင့် ထည့်သွင်းမှုများ"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ချန်နယ်များ၊ ပြင်ပထည့်သွင်းမှုများ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ချန်နယ်များ"</string>
@@ -1121,8 +1123,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="7196407759836930799">"TV သုံးမနေပါက စွမ်းအင်ချွေတာမှုကို ပိုကောင်းစေသည်"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"ဖွင့်ထားသည်များ-"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ဤမုဒ်သည် စက်ပစ္စည်း၏ စွမ်းအင်အသုံးပြုမှုကို မြင့်တက်စေနိုင်ကြောင်း သတိပြုပါ။"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"“<xliff:g id="ENERGYMODENAME">%s</xliff:g>” ဖွင့်ခြင်း"</string>
+    <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_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 9aa3a1471..d8bbdb752 100644
--- a/Settings/res/values-nb/energy-modes.xml
+++ b/Settings/res/values-nb/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Nødvendige nettverksfunksjoner"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Lavt strømforbruk"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Slå av nettverkstilkoblingen når TV-en ikke er i bruk."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kritiske oppdateringer og funksjoner"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Anbefalte nettverksfunksjoner"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalisert strømforbruk"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Slår på funksjoner som vekker TV-en via nettverket (ventemodus med nettverk)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Flere nettverksfunksjoner"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Økt strømforbruk"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"I tillegg til de anbefalte funksjonene slår dette alternativet på flere funksjoner når TV-en ikke er i bruk. Disse funksjonene kan øke strømforbruket."</string>
+    <string 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-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 ebfce8a7d..f65eb8e31 100644
--- a/Settings/res/values-nb/strings.xml
+++ b/Settings/res/values-nb/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Appinnstillinger"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Posisjon, bruk og diagnostikk, annonser"</string>
     <string name="add_account" msgid="7386223854837017129">"Legg til konto"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Ukjent konto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Fjern konto"</string>
     <string name="account_sync" msgid="4315295293211313989">"Velg synkroniserte apper"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synkroniser nå"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vil du tvinge HDR-utdata?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Som standard blir konverteringen tvunget til <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Skjermen kjøres med 1080p-oppløsning og 60 Hz. Dette alternativet er ikke kompatibelt med skjermen når den kjører med 4k-oppløsning og 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision støttes ikke med denne oppløsningen. Hvis du slår på Dolby Vision manuelt, byttes oppløsningen på skjermen til 1080p 60 Hz."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vil du bytte oppløsning til 1080p 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Tving alltid konvertering til Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Hvis Dolby Vision er deaktivert i HDR-formater i Avanserte skjerminnstillinger og du tvinger konvertering til Dolby Vision, aktiveres det igjen."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Tving alltid konvertering til HDR10"</string>
@@ -187,13 +186,13 @@
     <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Alltid"</string>
     <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Hvis appen ber om det, kommer enheten til å matche utgangen til den opprinnelige bildefrekvensen til innholdet du ser på. Dette kan føre til at skjermen blir tom i et øyeblikk når du avslutter eller starter videoavspilling."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Aldri"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selv om appen ber om det, kommer enheten aldri til å prøve å matche utgangen til den opprinnelige bildefrekvensen til innholdet du ser på."</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Selv om appen ber om det, prøver enheten aldri å matche utgangen til den opprinnelige bildefrekvensen for innholdet du ser på."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Tekstskalering"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"Skaler til <xliff:g id="SCALE">%1$d</xliff:g> %%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Eksempeltekst"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Trollmannen fra Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kapittel 11: Den vidunderlige smaragdbyen Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Selv om øynene deres var beskyttet av de grønne brillene, ble Dorothy og vennene hennes overveldet ved synet av denne vidunderlige byen. Langs gatene sto vakre hus bygget av grønn marmor og prydet med skinnende smaragder overalt. De gikk langs et fortau laget av den samme grønne marmoren, og der steinene møttes, var det rader av smaragder som glitret i lyset fra solen. Vindusrutene var av grønt glass, og selv himmelen hadde et grønt skjær over seg. Til og med solstrålene var grønne. \n\nDet var mange mennesker som gikk rundt i byen, både menn, kvinner og barn. Alle var kledd i grønne klær og hadde grønnlig hud. De så undrende på Dorothy og det brokete selskapet hennes. Barna løp og gjemte seg bak mødrene sine da de så Løven, men ingen sa noe til dem. Butikkene i gatene var alle fylt med grønne varer. Grønt godteri og grønt popkorn var til salgs, og det var også utstilt grønne sko, grønne hatter og grønne klær i alle mulige varianter. I én av butikkene solgte en mann grønn limonade, og Dorothy kunne se at barna betalte med grønne mynter. \n\nDet var ingen hester eller andre dyr å se i byen – mennene bar ting i små, grønne vogner som de dyttet foran seg. Alle virket glade, tilfredse og velstående."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Selv om øynene deres var beskyttet av de grønne brillene, ble Dorothy og vennene hennes overveldet ved synet av denne vidunderlige byen. Langs gatene sto vakre hus bygget av grønn marmor og prydet med skinnende smaragder overalt. De gikk langs et fortau laget av den samme grønne marmoren, og der steinene møttes, var det rader av smaragder som glitret i lyset fra solen. Vindusrutene var av grønt glass, og selv himmelen hadde et grønt skjær over seg. Til og med solstrålene var grønne. \n\nDet var mange mennesker som gikk rundt i byen, både menn, kvinner og barn. Alle var kledd i grønne klær og hadde grønnlig hud. De så undrende på Dorothy og det brokete selskapet hennes. Barna løp og gjemte seg bak mødrene sine da de så Løven, men ingen sa noe til dem. Butikkene i gatene var alle fylt med grønne varer. Grønt godteri og grønt popkorn var til salgs, og det var også utstilt grønne sko, grønne hatter og grønne klær i alle mulige varianter. I én av butikkene solgte en mann grønn limonade, og Dorothy kunne se at barna betalte med grønne mynter. \n\nDet var ingen hester eller andre dyr å se i byen – mennene bar ting i små, grønne vogner som de dyttet foran seg. Alle virket glade, tilfredse og velstående."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Valg av format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatisk"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuelt"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vil du endre oppløsning til %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Velg OK for å bruke %1$s fra nå av."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision støttes ikke ved %1$s og blir slått av i «Avanserte skjerminnstillinger»"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Denne modusen støtter %1$s. På noen TV-er må du muligens slå på Forbedret HDMI for å aktivere flere HDR-formater. Sjekk TV-innstillingene for å se om dette støttes."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Denne modusen har støtte for %1$s\nPå noen TV-er må du muligens slå på forbedret HDMI for å aktivere flere HDR-formater. Sjekk TV-innstillingene for å se om dette støttes."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Avbryt"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vil du slette bufrede data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Dette sletter bufrede data for alle apper."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Tilkoblet"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Frakoblet"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Du har ikke tillatelse til å endre Bluetooth-innstillingene."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Bruk til TV-lyd"</string>
     <string name="send_feedback" msgid="936698637869795473">"Send tilbakemelding"</string>
     <string name="launch_help" msgid="2607478763131952469">"Brukerstøtte"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Denne enheten administreres av organisasjonen din."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Denne enheten administreres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Finn ut mer"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraapp}other{Kameraapper}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalender-app"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktivér"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurasjon"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> kan samle inn all teksten du skriver, bortsett fra passord. Dette omfatter også personlige data som kredittkortnumre."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> kan lese innholdet på skjermen og skjerminnhold via andre apper, spore interaksjoner med apper eller maskinvaresensorer og bruke apper på vegne av deg."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Hvis du velger OK, stopper <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Tekst til tale"</string>
@@ -779,7 +777,7 @@
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Bekreft apper via USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Sjekk om det er skadelig atferd i apper som er installert via ADB/ADT"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Detaljert loggføring for wifi"</string>
-    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Slå på detaljert Wifi-loggføring"</string>
+    <string name="system_desc_wifi_verbose_logging" msgid="3537578245428327314">"Slå på detaljert wifi-loggføring"</string>
     <string name="system_show_touches" msgid="8244331695139748286">"Vis berøringer"</string>
     <string name="system_pointer_location" msgid="8724050865245555084">"Pekerplassering"</string>
     <string name="system_show_layout_bounds" msgid="8803080672553699649">"Vis layoutgrenser"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Tilkoblingen var vellykket"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Vis alle"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Søker"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Kunne ikke hente intensjonen om å legge til en konto fra autentiseringsprogrammet."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Kunne ikke legge til kontoen, eller kontotypen er ikke tilgjengelig."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanaler og innganger"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanaler, eksterne innganger"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanaler"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktiverer følgende:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Vær oppmerksom på at denne modusen kan øke strømforbruket på enheten."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Slå på «<xliff:g id="ENERGYMODENAME">%s</xliff:g>»"</string>
+    <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_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 79a120b92..9104003eb 100644
--- a/Settings/res/values-ne/energy-modes.xml
+++ b/Settings/res/values-ne/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"नेटवर्कका अत्यावश्यक सुविधाहरू"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ऊर्जाको कम प्रयोग"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"टिभी प्रयोग नगरिएका बेला नेटवर्क कनेक्सन अफ गर्नुहोस्।"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"महत्त्वपूर्ण अपडेट तथा सुविधाहरू"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"नेटवर्कका सिफारिस गरिएका सुविधाहरू"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"अप्टिमाइज गरिएको ऊर्जाको मितव्ययी प्रयोग"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"नेटवर्क (नेटवर्क स्ट्यान्डबाइ मोड) मार्फत टिभी सक्रिय गर्ने सुविधाहरू अन गर्छ।"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[सुविधा १ थप्नुहोस्]"</item>
     <item msgid="8724721267222341891">"[सुविधा २ थप्नुहोस्]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"नेटवर्कका अतिरिक्त सुविधाहरू"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ऊर्जाको बढ्दो प्रयोग"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"यो विकल्पले सिफारिस गरिएका सुविधाहरूका साथै टिभी प्रयोग नगरिएका बेला ऊर्जाको मितव्ययी प्रयोग बढाउन सक्ने अतिरिक्त सुविधाहरू अन गर्छ।"</string>
+    <string 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-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 088f61a8d..fd2ffcd0b 100644
--- a/Settings/res/values-ne/strings.xml
+++ b/Settings/res/values-ne/strings.xml
@@ -63,8 +63,9 @@
     <string name="privacy_assistant_settings_title" msgid="4524957824712623680">"Google सहायक"</string>
     <string name="privacy_purchases_settings_title" msgid="6490965297061569673">"भुक्तानी तथा खरिदहरू"</string>
     <string name="privacy_app_settings_category" msgid="858250971978879266">"एपका सेटिङहरू"</string>
-    <string name="privacy_category_summary" msgid="3534434883380511043">"स्थान, प्रयोग र निदान, विज्ञापनहरू"</string>
+    <string name="privacy_category_summary" msgid="3534434883380511043">"स्थान, प्रयोग तथा निदान, विज्ञापनहरू"</string>
     <string name="add_account" msgid="7386223854837017129">"खाता हाल्नुहोस्"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"खाता भेटिएन"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"खाता हटाउनुहोस्"</string>
     <string name="account_sync" msgid="4315295293211313989">"सिंक गरिएको एपहरू छनौट गर्नुहोस्"</string>
     <string name="sync_now" msgid="4335217984374620551">"अहिले सिंक्रोनाइजेसन गर्नुहोस्"</string>
@@ -75,7 +76,7 @@
     <string name="account_remove_failed" msgid="5654411101098531690">"खाता हटाउन सक्दैन"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
-    <string name="sync_one_time_sync" msgid="1665961083810584134">"अहिले सिंक गर्नुहोस् <xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="1665961083810584134">"अहिले नै सिंक गर्नुहोस् <xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_failed" msgid="2998289556481804047">"असफल सिंक"</string>
     <string name="sync_active" msgid="1621239982176888680">"सक्रिय सिंक"</string>
@@ -151,13 +152,13 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"ध्वनिसम्बन्धी उन्नत सेटिङ"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"गेम मोडलाई अनुमति दिनुहोस्"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"सामग्रीको डायनामिक रेन्जसँग मिल्दोजुल्दो बनाउनुहोस्"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"सामग्रीको डायनामिक रेन्जसँग मिल्दोजुल्दो बनाइयोस्"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"तपाईंले यो विकल्प अन गर्नुभयो भने सिस्टमले सामग्रीसँग मिल्दाजुल्दा परिणामहरू देखाउने प्रयोजनका लागि डायनामिक रेन्जका विभिन्न फर्म्याटहरू अदलबदल गर्ने छ। तपाईंले यो विकल्प अन गर्नुभएका खण्डमा फर्म्याट अदलबदल गर्ने क्रममा स्क्रिन कालो हुन सक्छ।\n\nडायनामिक रेन्जका थप विकल्पहरू प्राप्त गर्न \"डिस्प्लेसम्बन्धी उन्नत सेटिङ\" मा क्लिक गर्नुहोस्।"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"रोजाइको डायनामिक रेन्ज"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"सिस्टमका अनुसार फर्म्याट बदलियोस्"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"फर्म्याट रूपान्तरण गर्ने काम सिस्टमलाई जिम्मा दिइयोस्"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"फर्म्याट रूपान्तरण गर्ने काम सिस्टमलाई जिम्मा दिनुहोस्"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"यो विकल्प चयन गरिएका बेला सिस्टमले तपाईंको डिस्प्लेमा कुन डायनामिक रेन्ज पठाउन उपयुक्त हुन्छ भन्ने कुरा निर्धारण गर्छ र सामग्रीलाई आवश्यकताअनुसार रूपान्तरण गरी उक्त डायनामिक रेन्ज बनाउँछ।"</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"सधैँ सामग्रीको फर्म्याटसँग मिल्ने फर्म्याट प्रयोग गरियोस्"</string>
+    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"सधैँ सामग्रीको फर्म्याटसँग मिल्ने फर्म्याट प्रयोग गर्नुहोस्"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"जबरजस्ती रूपान्तरण गरियोस्"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"यसले चाहेको फर्म्याटमा जबरजस्ती रूपान्तरण गर्छ"</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"चाहेको फर्म्याटमा जबरजस्ती रूपान्तरण गरियोस्। जबरजस्ती रूपान्तरण गर्दा डिस्प्ले मोड वा HDR फर्म्याटका अन्य सेटिङ प्रभावित हुन सक्छन्।"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"नमुना पाठ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"भाग ११: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"डोरोथी र उनका साथीहरूले सुरक्षाका लागि आँखामा हरियो चस्मा लगाएका भए पनि त्यस अद्भुत सहरको चमक देखेर उनीहरू सुरुमा निकै आश्चर्यचकित भए। त्यस सहरका गल्लीहरूको दुवै छेउमा लस्करै हरियो मार्बलले बनेका सुन्दर घरहरू थिए र ती घरमा जताततै झिलमिलाउँदा पन्नाहरू टाँसिएका थिए। उनीहरू त्यही हरियो मार्बलको पेटीमा हिँडदै थिए, ब्लकहरूलाई आपसमा नजिक नजिक मिलाएर राखी पन्नाका रोहरूले जोडिएको थियो र त्यो सूर्यको प्रकाशमा जगमगाइरहेको थियो। झ्यालका पल्लाहरू हरियो काँचका थिए, त्यतिमात्र कहाँ हो र सहरमाथिको आकाशमा पनि हल्का हरियो रङको छाप देखिन्थ्यो र सूर्यका किरण पनि हरियो रङका नै थिए। \n\nत्यहाँ महिला, पुरुष र बालबालिकाहरू जस्ता धेरै मान्छेहरू यताउता हिँडिरहेका थिए र ती मान्छेहरूले हरियो कपडा लगाएका थिए र उनीहरूको छाला पनि हल्का हरियो खाले थियो। उनीहरूले डोरोथी तथा अनौठो विविधता भएका उनका साथीहरूलाई अचम्मको दृष्टिले हेरे र सिँहलाई देखेर सबै बालबालिकाहरू भागेर आफ्नो आमाको पछाडि लुक्न थाले तर कसैले पनि उनीहरूसँग कुरा गरेनन्। गल्लीमा थुप्रै पसलहरू थिए र डोरोथीले भने त्यहाँ भएका सबै कुराहरू हरियो रङका नै छन् भन्ने देखिन्। त्यहाँ बिक्रीका लागि हरियो क्यान्डी र मकैका फुलाका साथै हरियो रङका जुत्ता, हरियो रङका टोपी र थुप्रै प्रकारका हरियो रङका कपडाहरू राखिएका थिए। एक ठाउँमा एक जना व्यक्ति हरियो रङको कागती पानी बेच्दै थियो र डोरोथीले ती बालबालिकाहरूले त्यो किन्दा हरियो रङका सिक्काहरू दिएको देख्छिन्। \n\nत्यहाँ घोडा वा कुनै अरू जनावरहरू छैनन् जस्तो देखिन्थ्यो; त्यहाँ मान्छेहरू साना हरियो रङका गाडाहरूमा सामानहरू लिएर अगाडितिर धकेल्दै हिँड्थे। सबै जना खुसी र सन्तुष्ट तथा सम्पन्न देखिन्थे।"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"डोरोथी र उनका साथीहरूले सुरक्षाका लागि आँखामा हरियो चस्मा लगाएका भए पनि त्यस अद्भुत सहरको चमक देखेर उनीहरू सुरुमा निकै आश्चर्यचकित भए। त्यस सहरका गल्लीहरूको दुवै छेउमा लस्करै हरियो मार्बलले बनेका सुन्दर घरहरू थिए र ती घरमा जताततै झिलमिलाउँदा पन्नाहरू टाँसिएका थिए। उनीहरू त्यही हरियो मार्बलको पेटीमा हिँडदै थिए, ब्लकहरूलाई आपसमा नजिक नजिक मिलाएर राखी पन्नाका रोहरूले जोडिएको थियो र त्यो सूर्यको प्रकाशमा जगमगाइरहेको थियो। झ्यालका पल्लाहरू हरियो काँचका थिए, त्यतिमात्र कहाँ हो र सहरमाथिको आकाशमा पनि हल्का हरियो रङको छाप देखिन्थ्यो र सूर्यका किरण पनि हरियो रङका नै थिए। \n\nत्यहाँ महिला, पुरुष र बालबालिकाहरू जस्ता धेरै मान्छेहरू यताउता हिँडिरहेका थिए र ती मान्छेहरूले हरियो कपडा लगाएका थिए र उनीहरूको छाला पनि हल्का हरियो खालको थियो। उनीहरूले डोरोथी तथा अनौठो विविधता भएका उनका साथीहरूलाई अचम्मको दृष्टिले हेरे र सिँहलाई देखेर सबै बालबालिकाहरू भागेर आफ्नो आमाको पछाडि लुक्न थाले तर कसैले पनि उनीहरूसँग कुरा गरेनन्। गल्लीमा थुप्रै पसलहरू थिए र डोरोथीले भने त्यहाँ भएका सबै कुराहरू हरियो रङका नै छन् भन्ने देखिन्। त्यहाँ बिक्रीका लागि हरियो क्यान्डी र मकैका फुलाका साथै हरियो रङका जुत्ता, हरियो रङका टोपी र थुप्रै प्रकारका हरियो रङका कपडाहरू राखिएका थिए। एक ठाउँमा एक जना व्यक्ति हरियो रङको कागती पानी बेच्दै थियो र डोरोथीले ती बालबालिकाहरूले त्यो किन्दा हरियो रङका सिक्काहरू दिएको देख्छिन्। \n\nत्यहाँ घोडा वा कुनै अरू जनावरहरू छैनन् जस्तो देखिन्थ्यो; त्यहाँ मान्छेहरू साना हरियो रङका गाडाहरूमा सामानहरू लिएर अगाडितिर धकेल्दै हिँड्थे। सबै जना खुसी र सन्तुष्ट तथा सम्पन्न देखिन्थे।"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"फर्म्याट छनौट"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"स्वचालित"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"म्यानुअल"</string>
@@ -218,18 +219,17 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"रिजोल्युसन बदलेर %1$s बनाउने हो?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"अबदेखि %1$s प्रयोग गर्न \'ठिक छ\' चयन गर्नुहोस्।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s मा Dolby Vision प्रयोग गर्न मिल्दैन र Dolby Vision \"डिस्प्लेसम्बन्धी उन्नत सेटिङ\" मा अफ गरिने छ"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"यो मोडमा %1$s प्रयोग गर्न मिल्छ। केही टिभीमा तपाईंले HDR का थप फर्म्याटहरू प्रयोग गर्नका निम्ति परिष्कृत HDMI अन गर्नु पर्ने हुन सक्छ। यो फर्म्याट प्रयोग गर्न मिल्छ कि मिल्दैन भन्ने कुरा जान्न टिभीका सेटिङ जाँच्नुहोस्।"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"यो मोडमा %1$s प्रयोग गर्न सकिन्छ\nकेही टिभीमा तपाईंले HDR का थप फर्म्याटहरू प्रयोग गर्नका निम्ति परिष्कृत HDMI अन गर्नु पर्ने हुन सक्छ। यो फर्म्याट प्रयोग गर्न मिल्छ कि मिल्दैन भन्ने कुरा जान्न टिभीका सेटिङ जाँच्नुहोस्।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"रद्द गर्नुहोस्"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ठिक छ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"हर्ज"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> हर्ज)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"केस गरिएको डेटा हटाउने हो?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"यसले सबै अनुप्रयोगहरूको लागि केस गरिएको डेटा हटाउँछ।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"अतिरक्त सामानहरू थप्नुहोस्"</string>
     <string name="accessory_state_pairing" msgid="15908899628218319">"कनेक्ट गरिँदै छ..."</string>
-    <string name="accessory_state_connecting" msgid="6560241025917621212">"जडान हुँदै..."</string>
+    <string name="accessory_state_connecting" msgid="6560241025917621212">"कनेक्ट गरिँदै छ..."</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"पेयर हुन सकेन"</string>
     <string name="accessory_state_canceled" msgid="4794837663402063770">"रद्द गरियो"</string>
     <string name="accessory_state_paired" msgid="3296695242499532000">"युगल"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"कनेक्ट गरिएको छ"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"डिस्कनेक्ट भयो"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"तपाईं सँग ब्लुटुथ सेटिङहरू परिवर्तन गर्न अनुमति छैन।"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"टिभीको अडियोका लागि प्रयोग गर्नुहोस्"</string>
     <string name="send_feedback" msgid="936698637869795473">"प्रतिक्रिया पठाउनुहोस्"</string>
     <string name="launch_help" msgid="2607478763131952469">"मद्दत केन्द्र"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -297,7 +298,7 @@
     <string name="system_home_theater_control" msgid="6228949628173590310">"होम थिएटरसम्बन्धी नियन्त्रण"</string>
     <string name="system_developer_options" msgid="8480844257066475479">"विकासकर्ताका विकल्पहरू"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"कुनै पनि होइन"</string>
-    <string name="system_diagnostic" msgid="1654842813331919958">"उपयोग र निदान"</string>
+    <string name="system_diagnostic" msgid="1654842813331919958">"प्रयोग तथा निदान"</string>
     <string name="no_device_admins" msgid="4628974717150185625">"डिभाइसका एड्मिन एपहरू उपलब्ध छैनन्"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"एडमिनले अफ गरेको छ"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"उपलब्ध छैन"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"तपाईंको संगठनले यस यन्त्रलाई व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले व्यवस्थापन गर्दछ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"थप जान्नुहोस्"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{क्यामेरा एप}other{क्यामेरा एपहरू}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"पात्रो एप"</string>
@@ -420,8 +420,8 @@
     <item msgid="2713050260700175954">"राम्रो"</item>
     <item msgid="6005053494500517261">"उत्कृष्ट"</item>
   </string-array>
-    <string name="title_mac_address" msgid="7511588678922209883">"डिभाइसको MAC एड्रेस"</string>
-    <string name="title_randomized_mac_address" msgid="3359532498635833471">"क्रमरहित MAC एड्रेस"</string>
+    <string name="title_mac_address" msgid="7511588678922209883">"डिभाइसको म्याक एड्रेस"</string>
+    <string name="title_randomized_mac_address" msgid="3359532498635833471">"क्रमरहित म्याक एड्रेस"</string>
     <string name="title_signal_strength" msgid="5047116893338315998">"सिङ्केत क्षमता"</string>
     <string name="title_random_mac_settings" msgid="6685812569356353378">"गोपनीयता"</string>
   <string-array name="random_mac_settings_entries">
@@ -444,7 +444,7 @@
     <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"तपाईं छिटो कनेक्ट गर्ने सुविधाको सहायताले आफ्नो फोनमार्फत QR कोड स्क्यान गरेर सो फोन तुरुन्तै आफ्नो Wi-Fi मा कनेक्ट गर्न सक्नुहुन्छ।"</string>
     <string name="security_type" msgid="2297615092250075696">"सुरक्षाको प्रकार"</string>
     <string name="other_network" msgid="5299289104661858596">"अन्य नेटवर्क..."</string>
-    <string name="skip_network" msgid="3095529090560000692">"छोड्नुहोस्"</string>
+    <string name="skip_network" msgid="3095529090560000692">"स्किप गर्नुहोस्"</string>
     <string name="wifi_security_type_none" msgid="7001835819813531253">"कुनै पनि होइन"</string>
     <string name="wifi_security_type_wep" msgid="6407712450924151962">"डब्लुईपी"</string>
     <string name="wifi_security_type_wpa" msgid="9205358644485448199">"डब्लुपिए/डब्लुपिए२ पीएसके"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"अन गर्नुहोस्"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"कन्फिगरेसन"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g>प्रयोग गर्ने ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> ले पासवर्ड बाहेकका तपाईंले टाइप गर्ने सबै पाठ संकलन गर्न सक्छ। यसले क्रेडिट कार्ड नम्बर जस्ता व्यक्तिगत डेटा समावेस गर्दछ।"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"OK चयन गर्दा <xliff:g id="SERVICE">%1$s</xliff:g> बन्द हुनेछ ।"</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -773,7 +773,7 @@
     <string name="system_usb_debugging" msgid="2158285492172755923">"USB डिबगिङ"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"नक्कली स्थानहरूलाई अनुमति दिन"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"डिबग एप चयन गर्नुहोस्"</string>
-    <string name="system_wait_for_debugger" msgid="5715878008542589060">"डिबगरलाई पर्खौँ"</string>
+    <string name="system_wait_for_debugger" msgid="5715878008542589060">"डिबगरलाई पर्खियोस्"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"USB मा एपको पुष्टि गरियोस्"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"हानिकारक व्यवहार पत्ता लगाउन ADB/ADT बाट इन्स्टल गरिएका एपको जाँच गरियोस्"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Wi-Fi भर्वस लगिङ"</string>
@@ -906,10 +906,10 @@
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"यस एपले तपाईंको खाताहरूमा पहुँच गर्न सक्छ। <xliff:g id="APP">%1$s</xliff:g> द्वारा नियन्त्रित।"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"यो च्यानल हेर्ने पिन प्रविष्टि गर्नुहोस्"</string>
     <string name="pin_enter_unlock_program" msgid="275489015420025531">"यो कार्यक्रम हेर्न पिन प्रविष्टि गर्नुहोस्"</string>
-    <string name="pin_enter_pin" msgid="5020029261153234751">"PIN प्रविष्टि गर्नुहोस्"</string>
+    <string name="pin_enter_pin" msgid="5020029261153234751">"PIN हाल्नुहोस्"</string>
     <string name="pin_enter_new_pin" msgid="1930944619313642621">"नयाँ PIN सेट गर्नुहोस्"</string>
     <string name="pin_enter_again" msgid="7615050143778858658">"नयाँ PIN पुन: प्रविष्टि गर्नुहोस्"</string>
-    <string name="pin_enter_old_pin" msgid="5665265735227617942">"पुरानो PIN प्रविष्टि गर्नुहोस्"</string>
+    <string name="pin_enter_old_pin" msgid="5665265735227617942">"पुरानो PIN हाल्नुहोस्"</string>
     <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"तपाईँले गलत PIN ५ पटक प्रविष्टि गर्नुभयो।\n <xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> सेकेन्डमा पुनः प्रयास गर्नुहोस्।"</string>
     <string name="pin_toast_wrong" msgid="4297542365877164402">"गलत पिन, पुनः प्रयास गर्नुहोस्"</string>
     <string name="pin_toast_not_match" msgid="2439298696342975155">"पुनः प्रयास गर्नुहोस्, PIN मेल खाँदैन"</string>
@@ -1084,16 +1084,16 @@
     <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"तपाईंको प्रशासकले यस प्रयोगकर्तासँग सम्बन्धित एप तथा डेटाका साथै सेटिङ, अनुमति, संस्थागत पहुँच, नेटवर्क सम्बन्धी गतिविधि र यस यन्त्रको स्थानसम्बन्धी जानकारीको अनुगमन र व्यवस्थापन गर्न सक्छ।"</string>
     <string name="admin_device_owner_message" msgid="1935507216776040907">"तपाईंको प्रशासकले यस यन्त्रसँग सम्बन्धित एप र डेटाका साथै सेटिङ, अनुमति, संस्थागत पहुँच, नेटवर्क सम्बन्धी गतिविधि, र यस यन्त्रको स्थानसम्बन्धी जानकारीको अनुगमन र व्यवस्थापन गर्न सक्छ।"</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"कार्य प्रोफाइल हटाउनुहोस्"</string>
-    <string name="active_device_admin_msg" msgid="185537304726228624">"डिभाइसको एडमिन एप"</string>
-    <string name="remove_device_admin" msgid="2623866073546295104">"यो डिभाइसको एडमिन एप डिएक्टिभेट गर्नुहोस्"</string>
+    <string name="active_device_admin_msg" msgid="185537304726228624">"डिभाइसको एड्मिन एप"</string>
+    <string name="remove_device_admin" msgid="2623866073546295104">"यो डिभाइसको एड्मिन एप डिएक्टिभेट गर्नुहोस्"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"एपको स्थापना रद्द गर्नुहोस्"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"निष्क्रिय पार्नुहोस् तथा स्थापना रद्द गर्नुहोस्"</string>
     <string name="select_device_admin_msg" msgid="8475934459999710332">"डिभाइसका एड्मिन एपहरू"</string>
-    <string name="add_device_admin_msg" msgid="5390773166682603421">"डिभाइसको एडमिन एप एक्टिभेट गर्ने हो?"</string>
-    <string name="add_device_admin" msgid="5078281377915844544">"यो डिभाइसको एडमिन एप एक्टिभेट गर्नुहोस्"</string>
-    <string name="device_admin_warning" msgid="7399916080685200660">"तपाईंले यो एडमिन एप एक्टिभेट गर्नुभयो भने <xliff:g id="APP_NAME">%1$s</xliff:g> ले निम्न कार्य गर्ने अनुमति पाउने छ:"</string>
+    <string name="add_device_admin_msg" msgid="5390773166682603421">"डिभाइसको एड्मिन एप एक्टिभेट गर्ने हो?"</string>
+    <string name="add_device_admin" msgid="5078281377915844544">"यो डिभाइसको एड्मिन एप एक्टिभेट गर्नुहोस्"</string>
+    <string name="device_admin_warning" msgid="7399916080685200660">"तपाईंले यो एड्मिन एप एक्टिभेट गर्नुभयो भने <xliff:g id="APP_NAME">%1$s</xliff:g> ले निम्न कार्य गर्ने अनुमति पाउने छ:"</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले यस डिभाइसको व्यवस्थापन तथा अनुगमन गर्ने छ।"</string>
-    <string name="device_admin_status" msgid="5467001937240455367">"यो एडमिन एप सक्रिय छ र <xliff:g id="APP_NAME">%1$s</xliff:g> लाई  निम्न कार्यहरू गर्न दिन्छ:"</string>
+    <string name="device_admin_status" msgid="5467001937240455367">"यो एड्मिन एप सक्रिय छ र <xliff:g id="APP_NAME">%1$s</xliff:g> लाई  निम्न कार्यहरू गर्न दिन्छ:"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"अगाडि बढेर, तपाईंको प्रयोगकर्तालाई तपाईंको प्रशासकले व्यवस्थित गर्ने छ, जसले तपाईंको व्यक्तिगत डेटाका साथै सम्बन्धित डेटा समेत भण्डारण गर्न सक्छ।\n\nतपाईंको प्रशासकसँग यो प्रयोगकर्तासँग सम्बन्धित सेटिङ, पहुँच, एप, र डेटाका साथै नेटवर्क गतिविधि र तपाईंको डिभाइसका स्थानसम्बन्धी जानकारीहरूको अनुगमन र व्यवस्थापन गर्ने क्षमता छ।"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="2080017987692459555">"बग रिपोर्टलाई साझेदारी गर्ने हो?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"तपाईँको IT एडमिनले यस यन्त्रको समस्या निवारण गर्नमा मद्दत गर्न बग रिपोर्टका लागि अनुरोध गर्नुभएको छ। एप र डेटा साझेदारी हुन सक्छ।"</string>
@@ -1104,10 +1104,12 @@
     <string name="network_connection_request_dialog_title" msgid="4103963119407212989">"<xliff:g id="APPNAME">%1$s</xliff:g> प्रयोग गरिने यन्त्र"</string>
     <string name="network_connection_timeout_dialog_message" msgid="8408857135950230472">"कुनै पनि यन्त्र फेला परेन। यन्त्रहरू सक्रिय गरिएका छन् र जोड्नका लागि उपलब्ध छन् भन्ने कुरा सुनिश्चित गर्नुहोस्।"</string>
     <string name="network_connection_timeout_dialog_ok" msgid="5374522862360880609">"फेरि प्रयास गर्नुहोस्"</string>
-    <string name="network_connection_errorstate_dialog_message" msgid="3346121178275518630">"केही चिज गडबड भयो। यो एपले कुनै यन्त्र छनौट गर्नेसम्बन्धी अनुरोध रद्द गरेको छ।"</string>
+    <string name="network_connection_errorstate_dialog_message" msgid="3346121178275518630">"कुनै समस्या आयो। यो एपले कुनै यन्त्र छनौट गर्नेसम्बन्धी अनुरोध रद्द गरेको छ।"</string>
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"सफलतापूर्वक जोडियो"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"सबै देखाउनुहोस्"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"खोज्दै"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Authenticator बाट \"खाता हाल्नुहोस्\" को उद्देश्य प्राप्त गर्न सकिएन।"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"खाता हाल्न सकिएन वा यस प्रकारको खाता उपलब्ध छैन।"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"च्यानल तथा इनपुटहरू"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"च्यानलहरू, बाह्य इनपुटहरू"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"च्यानलहरू"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"निम्न सुविधाहरू सक्षम गर्छ:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"तपाईंले यो मोड प्रयोग गर्नुभयो भने तपाईंको डिभाइसले ऊर्जाको प्रयोग बढाउन सक्छ भन्ने कुरा याद राख्नुहोस्।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" अन गर्नुहोस्"</string>
+    <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_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 0de9407c6..cf86490a1 100644
--- a/Settings/res/values-nl/energy-modes.xml
+++ b/Settings/res/values-nl/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Essentiële netwerkfuncties"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Laag energieverbruik"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Zet de netwerkverbinding uit als de tv niet wordt gebruikt."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Essentiële updates en functies"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Aanbevolen netwerkfuncties"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Geoptimaliseerd energieverbruik"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Zet functies aan die de tv activeren via het netwerk (netwerk-stand-by)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Extra netwerkfuncties"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Hoger energieverbruik"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Met deze optie zet je naast aanbevolen functies ook extra functies aan als de tv niet wordt gebruikt, waardoor het energieverbruik kan toenemen."</string>
+    <string 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-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 f8853d38d..b61d71bed 100644
--- a/Settings/res/values-nl/strings.xml
+++ b/Settings/res/values-nl/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"App-instellingen"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Locatie, gebruiks- en diagnostische gegevens, advertenties"</string>
     <string name="add_account" msgid="7386223854837017129">"Account toevoegen"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Onbekend account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Account verwijderen"</string>
     <string name="account_sync" msgid="4315295293211313989">"Gesynchroniseerde apps kiezen"</string>
     <string name="sync_now" msgid="4335217984374620551">"Nu synchroniseren"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Voorbeeldtekst"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"De tovenaar van Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Hoofdstuk 11: De prachtige Smaragden Stad van Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Hoewel hun ogen werden beschermd door de groene bril, werden Dorothy en haar vrienden eerst verblind door de schittering van de prachtige Stad. Langs de straten stonden schitterende huizen van groen marmer die waren versierd met glinsterende smaragden. Ze liepen over een pad dat was geplaveid met hetzelfde groene marmer. In de voegen tussen de stenen waren dichte rijen smaragden ingelegd die fonkelden in het zonlicht. De ramen waren van groen glas en zelfs de lucht boven de Stad had een groene tint, en ook de zonnestralen waren groen. \n\nEr waren veel mensen op straat: mannen, vrouwen en kinderen. Ze droegen allemaal groene kleren en hadden een groengetinte huid. Ze keken Dorothy en haar vreemde gezelschap verbaasd aan. De kinderen verstopten zich achter hun moeders toen ze de Leeuw zagen, maar niemand sprak hen aan. Er waren veel winkels in de straat en Dorothy zag dat alles wat ze verkochten, groen was. Er waren groene snoepjes en groene popcorn te koop, maar ook groene schoenen, groene hoeden en allerlei groene kleding. Een man verkocht groene limonade, en toen kinderen die kochten, zag Dorothy dat ze ervoor betaalden met groene muntjes. \n\nEr leken geen paarden of andere dieren te zijn. De mannen vervoerden dingen in kleine groene handkarren, die ze voor zich uit duwden. Iedereen leek gelukkig, tevreden en welvarend."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Hoewel hun ogen werden beschermd door de groene bril, werden Dorothy en haar vrienden eerst verblind door de schittering van de prachtige Stad. Langs de straten stonden schitterende huizen van groen marmer die waren versierd met glinsterende smaragden. Ze liepen over een pad dat was geplaveid met hetzelfde groene marmer. In de voegen tussen de stenen waren dichte rijen smaragden ingelegd die fonkelden in het zonlicht. De ramen waren van groen glas en zelfs de lucht boven de Stad had een groene tint, en ook de zonnestralen waren groen. \n\nEr waren veel mensen op straat: mannen, vrouwen en kinderen. Ze droegen allemaal groene kleren en hadden een groengetinte huid. Ze keken Dorothy en haar vreemde gezelschap verbaasd aan. De kinderen verstopten zich achter hun moeders toen ze de Leeuw zagen, maar niemand sprak hen aan. Er waren veel winkels in de straat en Dorothy zag dat alles wat ze verkochten, groen was. Er waren groene snoepjes en groene popcorn te koop, maar ook groene schoenen, groene hoeden en allerlei groene kleding. Een man verkocht groene limonade, en toen kinderen die kochten, zag Dorothy dat ze ervoor betaalden met groene muntjes. \n\nEr leken geen paarden of andere dieren te zijn. De mannen vervoerden dingen in kleine groene handkarren, die ze voor zich uit duwden. Iedereen leek gelukkig, tevreden en welvarend."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Indelingsselectie"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatisch"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Handmatig"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Resolutie wijzigen in %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecteer OK om vanaf nu %1$s te gebruiken."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision wordt niet ondersteund op %1$s en wordt uitgezet in Geavanceerde weergave-instellingen"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Deze modus ondersteunt %1$s. Op sommige tv\'s moet je Verbeterde HDMI misschien aanzetten om meer HDR-indelingen mogelijk te maken. Check je tv-instellingen om te zien of dit wordt ondersteund."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Deze modus ondersteunt het volgende: %1$s\nOp sommige tv\'s moet je Verbeterde HDMI misschien aanzetten om meer HDR-indelingen mogelijk te maken. Check je tv-instellingen om te zien of dit wordt ondersteund."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Annuleren"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Gecachte gegevens wissen?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"De gecachte gegevens voor alle apps wissen."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Verbonden"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Verbinding verbroken"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Je hebt geen rechten om de Bluetooth-instellingen te wijzigen."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Gebruiken voor tv-audio"</string>
     <string name="send_feedback" msgid="936698637869795473">"Feedback sturen"</string>
     <string name="launch_help" msgid="2607478763131952469">"Helpcentrum"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -297,7 +298,7 @@
     <string name="system_home_theater_control" msgid="6228949628173590310">"Bediening van thuisbioscoopsysteem"</string>
     <string name="system_developer_options" msgid="8480844257066475479">"Ontwikkelaarsopties"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"Geen"</string>
-    <string name="system_diagnostic" msgid="1654842813331919958">"Gebruik en diagnostische gegevens"</string>
+    <string name="system_diagnostic" msgid="1654842813331919958">"Gebruiks- en diagnostische gegevens"</string>
     <string name="no_device_admins" msgid="4628974717150185625">"Geen apparaatbeheer-apps beschikbaar"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Uitgezet door beheerder"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Niet beschikbaar"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Dit apparaat wordt beheerd door je organisatie."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Dit apparaat wordt beheerd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Meer informatie"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera-app}other{Camera-apps}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Agenda-app"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aanzetten"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuratie"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> kan alle tekst registreren die je typt, behalve wachtwoorden. Dit omvat ook persoonsgegevens zoals creditcardnummers."</string>
+    <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>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Verbinding gemaakt"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Alles tonen"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Zoeken"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Kan intentie voor account toevoegen niet ophalen bij authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Kan het account niet toevoegen of het accounttype is niet beschikbaar."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanalen en ingangen"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanalen, externe ingangen"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanalen"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Zet het volgende aan:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Door deze stand kan het energieverbruik van het apparaat toenemen."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"<xliff:g id="ENERGYMODENAME">%s</xliff:g> aanzetten"</string>
+    <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_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 860e56917..51d41c519 100644
--- a/Settings/res/values-or/energy-modes.xml
+++ b/Settings/res/values-or/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ଜରୁରୀ ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ଏନର୍ଜିର କମ ବ୍ୟବହାର"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ନେଟୱାର୍କ କନେକ୍ସନକୁ ବନ୍ଦ କରନ୍ତୁ।"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ଅପଡେଟ ଏବଂ ଫଙ୍କସନଗୁଡ଼ିକ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ସୁପାରିଶ କରାଯାଇଥିବା ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ଏନର୍ଜିର ବ୍ୟବହାରକୁ ଅପ୍ଟିମାଇଜ କରାଯାଇଛି"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ନେଟୱାର୍କ (ଷ୍ଟାଣ୍ଡବାଏ ମୋଡରେ ରଖାଯାଇଥିବା ନେଟୱାର୍କ) ମାଧ୍ୟମରେ ଟିଭିକୁ ସକ୍ରିୟ କରୁଥିବା ଫିଚରଗୁଡ଼ିକୁ ଚାଲୁ କରେ।"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ଅତିରିକ୍ତ ନେଟୱାର୍କ ଫିଚରଗୁଡ଼ିକ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ଏନର୍ଜିର ବ୍ୟବହାର ବୃଦ୍ଧି ହୋଇଛି"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ସୁପାରିଶ କରାଯାଇଥିବା ଫିଚରଗୁଡ଼ିକ ସହିତ, ଏହି ବିକଳ୍ପ ଟିଭି ବ୍ୟବହାର କରାଯାଉନଥିବା ବେଳେ ଅତିରିକ୍ତ ଫିଚରଗୁଡ଼ିକୁ ଚାଲୁ କରେ ଯାହା ଫଳରେ ଏନର୍ଜିର ବ୍ୟବହାର ବଢ଼ିପାରେ।"</string>
+    <string 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-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 1f227aac2..5a27b513c 100644
--- a/Settings/res/values-or/strings.xml
+++ b/Settings/res/values-or/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ଆପ ସେଟିଂସ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ଲୋକେସନ୍, ବ୍ୟବହାର ଓ ଡାଏଗ୍ନୋଷ୍ଟିକ୍ସ, ବିଜ୍ଞାପନଗୁଡ଼ିକ"</string>
     <string name="add_account" msgid="7386223854837017129">"ଆକାଉଣ୍ଟ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"ଅଜଣା ଆକାଉଣ୍ଟ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ଆକାଉଣ୍ଟ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="account_sync" msgid="4315295293211313989">"ସିଙ୍କ୍‌ ହୋଇଥିବା ଆପ୍‌ ବାଛନ୍ତୁ"</string>
     <string name="sync_now" msgid="4335217984374620551">"ବର୍ତ୍ତମାନ ସିଙ୍କ କରନ୍ତୁ"</string>
@@ -107,7 +108,7 @@
     <string name="device_surround_sound" msgid="1889436002598316470">"ପରିପାର୍ଶ୍ଵର ଶଦ୍ଦ"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"ସିଷ୍ଟମ୍ ‌ସାଉଣ୍ଡ୍‌"</string>
     <string name="device_apps" msgid="2134756632245008919">"ଆପ୍ଲିକେସନ୍‌"</string>
-    <string name="device_storage" msgid="8540243547121791073">"ଷ୍ଟୋରେଜ୍"</string>
+    <string name="device_storage" msgid="8540243547121791073">"ଷ୍ଟୋରେଜ"</string>
     <string name="device_reset" msgid="6115282675800077867">"ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍ କରନ୍ତୁ"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"ବ୍ୟାକଅପ୍ ନିଅନ୍ତୁ ଏବଂ ରିଷ୍ଟୋର୍ କରନ୍ତୁ"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ଆପଣ HDR ଆଉଟପୁଟ ଲାଗୁ କରିବାକୁ ଚାହାଁନ୍ତି?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ଡିଫଲ୍ଟ ଭାବେ କନଭର୍ସନକୁ <xliff:g id="HDR_TYPE">%s</xliff:g>ରେ ଲାଗୁ କରାଯିବ।"</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ଆପଣଙ୍କ ଡିସପ୍ଲେ 1080p 60Hz ରିଜୋଲ୍ୟୁସନରେ ଚାଲିବ। 4k 60Hz ରିଜୋଲ୍ୟୁସନରେ ଚାଲିବା ସମୟରେ ଏହି ବିକଳ୍ପ ଆପଣଙ୍କ ଡିସପ୍ଲେ ସହ କମ୍ପାଟିବଲ ନୁହେଁ।"</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"ବର୍ତ୍ତମାନର ରିଜୋଲ୍ୟୁସନରେ Dolby Vision ସମର୍ଥିତ ନୁହେଁ। ଯଦି ଆପଣ Dolby Visionକୁ ମାନୁଆଲୀ ସକ୍ଷମ କରନ୍ତି, ତେବେ ଆପଣଙ୍କ ଡିସପ୍ଲେର ରିଜୋଲ୍ୟୁସନ 1080p 60Hzକୁ ପରିବର୍ତ୍ତନ ହୋଇଯିବ"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ରିଜୋଲ୍ୟୁସନକୁ 1080p 60Hzକୁ ପରିବର୍ତ୍ତନ କରିବେ?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ସର୍ବଦା Dolby Visionରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସରେ ଥିବା HDR ଫର୍ମାଟରେ ଯଦି ଡଲବି ଭିଜନକୁ ଅକ୍ଷମ କରାଯାଏ, Dolby Visionରେ କନଭର୍ସନ ଲାଗୁ କରିବା ଏହାକୁ ପୁଣି-ସକ୍ଷମ କରିବ।"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ସର୍ବଦା HDR10ରେ କନଭର୍ସନ ଲାଗୁ କରନ୍ତୁ"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ସାମ୍ପଲ୍ ଟେକ୍ସଟ୍"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ଦି ୱାଣ୍ଡରଫୁଲ୍ ୱିଜାର୍ଡ ଅଫ୍ ଓଜ୍"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ଅଧ୍ୟାୟ 11: ଦି ୱାଣ୍ଡରଫୁଲ୍ ସିଟି ଅଫ୍ ଓଜ୍"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ଆଖିରେ ସବୁଜ ଚଷମା ପିନ୍ଧିଥିଲେ ସୁଦ୍ଧା ଡୋରୋଥି ଓ ତା’ ସାଙ୍ଗମାନେ, ସହରର ସୁନ୍ଦରତା ଦେଖି ପ୍ରଥମେ ଚକିତ ହୋଇଯାଇଥିଲେ। ସବୁଜ ମାର୍ବଲରେ ଗଠିତ ସୁନ୍ଦର ଘରଗୁଡ଼ିକ ରାସ୍ତାର ଉଭୟ ପାର୍ଶ୍ୱରେ ଶୋଭା ପାଉଥିଲା ଏବଂ ଝଲସୁଥିବା ରତ୍ନ ସବୁଆଡ଼େ ଖଞ୍ଜାଯାଇଥିଲା। ସେମାନେ ସେହି ସବୁଜ ମାର୍ବଲ ରାସ୍ତାରେ ଚାଲି ଚାଲି ଆଗକୁ ବଢ଼ିଲେ ଏବଂ ଯେଉଁଠାରେ ଦୁଇଟି ଗଳି ପରସ୍ପର ସହିତ ଯୋଡ଼ି ହୋଇଥିଲା, ସେଠାରେ ପାଖାପାଖି ଖଞ୍ଜାଯାଇଥିବା ରତ୍ନଗୁଡ଼ିକର ଅନେକ ଧାଡ଼ି ଥିଲା ଓ ସେଗୁଡ଼ିକ ସୂର୍ଯ୍ୟାଲୋକ ପଡ଼ି ଝଲସୁଥିଲା। ଝରକାରେ ସବୁଜ ରଙ୍ଗର କାଚ ଲାଗିଥିଲା; ଏପରିକି ସମ୍ପୂର୍ଣ୍ଣ ସହରର ଆକାଶଟି ସବୁଜ ରଙ୍ଗରେ ଶୋଭା ପାଉଥିଲା ଏବଂ ସୂର୍ଯ୍ୟ କିରଣ ମଧ୍ୟ ସବୁଜ ରଙ୍ଗର ଥିଲା। \n\nସେଠାରେ ଅନେକ ଲୋକ ଥିଲେ, ପୁରୁଷ, ମହିଳା ଓ ପିଲାମାନେ ଯିବା ଆସିବା କରୁଥିଲେ ଏବଂ ସମସ୍ତେ ସବୁଜ ରଙ୍ଗର ପୋଷାକ ପିନ୍ଧିଥିଲେ ତଥା ସେମାନଙ୍କ ଚର୍ମର ରଙ୍ଗ ସବୁଜ ଥିଲା। ସେମାନେ ବିସ୍ମିତ ଆଖିରେ ଡୋରୋଥି ଓ ତା\'ର ଅଜବ ଦେଖାଯାଉଥିବା ସାଙ୍ଗକୁ ଚାହିଁଲେ ଏବଂ ପିଲାମାନେ ଯେତେବେଳେ ସିଂହକୁ ଦେଖିଲେ, ସେମାନେ ଭୟରେ ଦୌଡ଼ିଯାଇ ଯିଏ ଯାହାର ମା’ ପଛରେ ଲୁଚିଗଲେ; କିନ୍ତୁ କେହି ସେମାନଙ୍କ ସହ କଥା ହେଲେ ନାହିଁ। ରାସ୍ତାରେ ଅନେକ ଦୋକାନ ଥିଲା, ଆଉ ଡୋରୋଥି ଦେଖିଲା ଯେ, ସେଠାରେ ଥିବା ସବୁ ଜିନିଷ ସବୁଜ ରଙ୍ଗର ଥିଲା। ସବୁଜ ରଙ୍ଗର ଜୋତା, ସବୁଜ ରଙ୍ଗର ଟୋପି ଓ ସବୁ ପ୍ରକାରର ସବୁଜ ରଙ୍ଗର ପୋଷାକ ସମେତ ସବୁଜ ଚକୋଲେଟ ଓ ସବୁଜ ରଙ୍ଗର ପପ-କର୍ନ ମଧ୍ୟ ବିକ୍ରି ହେଉଥିଲା। ଗୋଟିଏ ସ୍ଥାନରେ ଜଣେ ବ୍ୟକ୍ତି ସବୁଜ ରଙ୍ଗର ଲେମ୍ବୁ ସରବତ ବିକ୍ରି କରୁଥିଲେ ଏବଂ ଯେତେବେଳେ ପିଲାମାନେ ଏହା କିଣିଲେ, ସେମାନେ ସେହି ଲୋକକୁ ସବୁଜ ପଇସା ଦେଉଥିବାର ଡୋରୋଥି ଦେଖିପାରିଲା। \n\nସେଠାରେ କୌଣସି ପ୍ରକାରର ଘୋଡ଼ା କିମ୍ୱା ଜୀବଜନ୍ତୁ ନଥିବା ପରି ଜଣାପଡ଼ୁଥିଲା; ଛୋଟ ସବୁଜ ରଙ୍ଗର ଗାଡ଼ିରେ ଲୋକମାନେ ସେମାନଙ୍କ ଜିନିଷପତ୍ର ରଖି ଠେଲିଠେଲି ନେବା ଆଣିବା କରୁଥିଲେ। ସମସ୍ତେ ଖୁସି, ସନ୍ତୁଷ୍ଟ ଓ ସମୃଦ୍ଧ ଥିବାପରି ଜଣାପଡ଼ୁଥିଲା।"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ଆଖିରେ ସବୁଜ ଚଷମା ପିନ୍ଧିଥିଲେ ସୁଦ୍ଧା ଡୋରୋଥି ଓ ତା’ ସାଙ୍ଗମାନେ, ଚମତ୍କାର ସହରର ସୁନ୍ଦରତା ଦେଖି ପ୍ରଥମେ ଚକିତ ହୋଇଯାଇଥିଲେ। ରାସ୍ତାର ଉଭୟ ପାର୍ଶ୍ୱରେ ସବୁଜ ମାର୍ବଲରେ ତିଆରି ସୁନ୍ଦର ଘରଗୁଡ଼ିକ ଶୋଭା ପାଉଥିଲା ଏବଂ ଝଲସୁଥିବା ରତ୍ନ ସବୁଆଡ଼େ ଖଞ୍ଜାଯାଇଥିଲା। ସେମାନେ ସେହି ସବୁଜ ମାର୍ବଲ ରାସ୍ତାରେ ଚାଲି ଚାଲି ଆଗକୁ ବଢ଼ିଲେ ଏବଂ ଯେଉଁଠାରେ ଦୁଇଟି ଗଳି ପରସ୍ପର ସହିତ ଯୋଡ଼ି ହୋଇଥିଲା, ସେଠାରେ ପାଖାପାଖି ଖଞ୍ଜାଯାଇଥିବା ରତ୍ନଗୁଡ଼ିକର ଅନେକ ଧାଡ଼ି ଥିଲା ଓ ସେଗୁଡ଼ିକ ସୂର୍ଯ୍ୟାଲୋକ ପଡ଼ି ଝଲସୁଥିଲା। ଝରକାରେ ସବୁଜ ରଙ୍ଗର କାଚ ଲାଗିଥିଲା; ଏପରିକି ସମ୍ପୂର୍ଣ୍ଣ ସହରର ଆକାଶଟି ସବୁଜ ରଙ୍ଗରେ ଶୋଭା ପାଉଥିଲା ଏବଂ ସୂର୍ଯ୍ୟକିରଣ ମଧ୍ୟ ସବୁଜ ରଙ୍ଗର ଥିଲା। \n\nସେଠାରେ ଅନେକ ଲୋକ ଥିଲେ, ପୁରୁଷ, ମହିଳା ଓ ପିଲାମାନେ ଯିବା ଆସିବା କରୁଥିଲେ ଏବଂ ସମସ୍ତେ ସବୁଜ ରଙ୍ଗର ପୋଷାକ ପିନ୍ଧିଥିଲେ ତଥା ସେମାନଙ୍କ ଚର୍ମର ରଙ୍ଗ ସବୁଜ ଥିଲା। ସେମାନେ ବିସ୍ମିତ ଆଖିରେ ଡୋରୋଥି ଓ ତା\'ର ଅଜବ ଦେଖାଯାଉଥିବା ସାଙ୍ଗମାନଙ୍କୁ ଚାହିଁଲେ ଏବଂ ପିଲାମାନେ ଯେତେବେଳେ ସିଂହକୁ ଦେଖିଲେ, ସେମାନେ ଭୟରେ ଦୌଡ଼ିଯାଇ ଯିଏ ଯାହାର ମା’ ପଛରେ ଲୁଚିଗଲେ; କିନ୍ତୁ କେହି ସେମାନଙ୍କ ସହ କଥା ହେଲେ ନାହିଁ। ରାସ୍ତାରେ ଅନେକ ଦୋକାନ ଥିଲା, ଆଉ ଡୋରୋଥି ଦେଖିଲା ଯେ, ସେଠାରେ ଥିବା ସବୁ ଜିନିଷ ସବୁଜ ରଙ୍ଗର ଥିଲା। ସବୁଜ ରଙ୍ଗର ଜୋତା, ସବୁଜ ରଙ୍ଗର ଟୋପି ଓ ସବୁ ପ୍ରକାରର ସବୁଜ ରଙ୍ଗର ପୋଷାକ ସମେତ ସବୁଜ ଚକୋଲେଟ ଓ ସବୁଜ ରଙ୍ଗର ପପ-କର୍ନ ମଧ୍ୟ ବିକ୍ରି ହେଉଥିଲା। ଗୋଟିଏ ସ୍ଥାନରେ ଜଣେ ବ୍ୟକ୍ତି ସବୁଜ ରଙ୍ଗର ଲେମ୍ବୁ ସରବତ ବିକ୍ରି କରୁଥିଲେ ଏବଂ ଯେତେବେଳେ ପିଲାମାନେ ଏହା କିଣିଲେ, ସେମାନେ ସେହି ଲୋକକୁ ସବୁଜ ପଇସା ଦେଉଥିବାର ଡୋରୋଥି ଦେଖିପାରିଲା। \n\nସେଠାରେ କୌଣସି ପ୍ରକାରର ଘୋଡ଼ା କିମ୍ୱା ଜୀବଜନ୍ତୁ ନଥିବା ପରି ଜଣାପଡ଼ୁଥିଲା; ଛୋଟ ସବୁଜ ରଙ୍ଗର ଗାଡ଼ିରେ ଲୋକମାନେ ସେମାନଙ୍କ ଜିନିଷପତ୍ର ରଖି ଠେଲିଠେଲି ନେବା ଆଣିବା କରୁଥିଲେ। ସମସ୍ତେ ଖୁସି, ସନ୍ତୁଷ୍ଟ ଓ ଆନନ୍ଦିତ ଥିବା ପରି ଜଣାପଡ଼ୁଥିଲେ।"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ଫର୍ମାଟ୍ ଚୟନ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ସ୍ୱଚାଳିତ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ମାନୁଆଲ୍"</string>
@@ -219,13 +218,12 @@
     <string name="resolution_selection_dialog_title" msgid="4029798035133645272">"ରିଜୋଲ୍ୟୁସନକୁ ପରିବର୍ତ୍ତନ କରାଯାଇଛି"</string>
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ରିଜୋଲ୍ୟୁସନକୁ %1$sକୁ ବଦଳାଇବେ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ବର୍ତ୍ତମାନଠାରୁ %1$sକୁ ବ୍ୟବହାର କରିବା ପାଇଁ \"ଠିକ୍ ଅଛି\"କୁ ଚୟନ କରନ୍ତୁ।"</string>
-    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$sରେ ସମର୍ଥିତ ନୁହେଁ ଏବଂ ଏହାକୁ \'ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସ\'ରେ ଅକ୍ଷମ କରାଯିବ"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ଏହି ମୋଡ %1$sକୁ ସମର୍ଥନ କରେ। କିଛି ଟିଭିରେ, ଅଧିକ HDR ଫର୍ମାଟ ସକ୍ଷମ କରିବାକୁ ଆପଣଙ୍କୁ ଉନ୍ନତ HDMIକୁ ଚାଲୁ କରିବା ଆବଶ୍ୟକ ହୋଇପାରେ। ଏହା ସମର୍ଥିତ ନା ନୁହେଁ ଦେଖିବାକୁ ଆପଣଙ୍କ ଟିଭି ସେଟିଂସକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"</string>
+    <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$sରେ Dolby Vision ସମର୍ଥିତ ନୁହେଁ ଏବଂ ଏହା \'ଉନ୍ନତ ଡିସପ୍ଲେ ସେଟିଂସ\'ରେ ଅକ୍ଷମ ହୋଇଯିବ"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ଏହି ମୋଡ ଏହାକୁ ସମର୍ଥନ କରେ: %1$s\nକିଛି ଟିଭିରେ, ଅଧିକ HDR ଫର୍ମାଟ ସକ୍ଷମ କରିବାକୁ ଆପଣଙ୍କୁ ଉନ୍ନତ HDMIକୁ ଚାଲୁ କରିବା ଆବଶ୍ୟକ ହୋଇପାରେ। ଏହା ସମର୍ଥିତ ନା ନୁହେଁ ଦେଖିବାକୁ ଆପଣଙ୍କ ଟିଭି ସେଟିଂସକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ବାତିଲ କରନ୍ତୁ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ଠିକ୍ ଅଛି"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"କ୍ୟାଶ୍‌ ହୋଇଥିବା ଡାଟା ଖାଲି କରିବେ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ଏହା, ସମସ୍ତ ଡାଟା ପାଇଁ କ୍ୟାଶ୍ ହୋଇଥିବା ଡାଟାକୁ ଖାଲି କରିଦେବ"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"ସଂଯୋଗ କରାଯାଇଛି"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ବ୍ଲୁଟୂଥ୍‍‌ ସେଟିଂସ ବଦଳାଇବା ପାଇଁ ଆପଣଙ୍କ ପାଖେ ଅନୁମତି ନାହିଁ।"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ଟିଭି ଅଡିଓ ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="send_feedback" msgid="936698637869795473">"ମତାମତ ପଠାନ୍ତୁ"</string>
     <string name="launch_help" msgid="2607478763131952469">"ସହାୟତା କେନ୍ଦ୍ର"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -299,7 +298,7 @@
     <string name="system_home_theater_control" msgid="6228949628173590310">"ହୋମ ଥିଏଟର ନିୟନ୍ତ୍ରଣ"</string>
     <string name="system_developer_options" msgid="8480844257066475479">"ଡେଭଲପରଙ୍କ ବିକଳ୍ପ"</string>
     <string name="accessibility_none" msgid="6355646833528306702">"କିଛିନାହିଁ"</string>
-    <string name="system_diagnostic" msgid="1654842813331919958">"ବ୍ୟବହାର ଏବଂ ଡାଇଗ୍ନୋଷ୍ଟିକ୍‌ଗୁଡ଼ିକ"</string>
+    <string name="system_diagnostic" msgid="1654842813331919958">"ବ୍ୟବହାର ଏବଂ ଡାଇଗ୍ନୋଷ୍ଟିକ୍ସ"</string>
     <string name="no_device_admins" msgid="4628974717150185625">"କୌଣସି ଡିଭାଇସ୍‌ ଆଡମିନ୍‌ ଆପ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"ଆଡମିନଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"ଉପଲବ୍ଧ ନାହିଁ"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ଏହି ଡିଭାଇସ୍‌ ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳିତ"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ଏହି ଡିଭାଇସ୍‌ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ ହେଉଛି।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{କ୍ୟାମେରା ଆପ}other{କ୍ୟାମେରା ଆପ୍ସ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"କ୍ୟାଲେଣ୍ଡର ଏପ"</string>
@@ -438,7 +436,7 @@
     <string name="connected" msgid="4981532275162345997">"କନେକ୍ଟ କରାଗଲା"</string>
     <string name="not_connected" msgid="475810896484271663">"କନେକ୍ଟ ହୋ‍ଇନାହିଁ"</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_all" msgid="5048103047976316675">"ସବୁ ଦେଖନ୍ତୁ"</string>
     <string name="wifi_setting_see_fewer" msgid="8585364493300703467">"କିଛି ଦେଖନ୍ତୁ"</string>
     <string name="wifi_setting_available_networks" msgid="2096957819727319750">"ଉପଲବ୍ଧ ଥିବା ନେଟ୍‌ୱର୍କ"</string>
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"ନୂଆ ନେଟ୍‌ୱାର୍କ ଯୋଗ କରନ୍ତୁ"</string>
@@ -534,7 +532,7 @@
     <string name="storage_music_usage" msgid="5362871290115089474">"ଅଡିଓ"</string>
     <string name="storage_media_misc_usage" msgid="3404230292054880339">"ମିଶ୍ରିତ"</string>
     <string name="storage_media_cache_usage" msgid="6397941751551207630">"କ୍ୟାସ୍‌ ହୋଇଥିବା ଡାଟା"</string>
-    <string name="storage_eject" msgid="3268870873944951902">"ବାହାର କରନ୍ତୁ"</string>
+    <string name="storage_eject" msgid="3268870873944951902">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
     <string name="storage_format" msgid="5360900929128087085">"ଲିଭାନ୍ତୁ ଏବଂ ଫର୍ମାଟ୍ କରନ୍ତୁ"</string>
     <string name="storage_format_as_private" msgid="77945551149326052">"ଡିଭାଇସ୍ ‌ଷ୍ଟୋରେଜ୍‌ଭାବରେ ଲିଭାନ୍ତୁ ଏବଂ ଫର୍ମାଟ୍‌ କର"</string>
     <string name="storage_format_as_public" msgid="6745112917895223463">"ଲିଭାଇବା ଷ୍ଟୋରେଜ୍‌ ଭାବରେ ଲାଭାନ୍ତୁ ଏବଂ ଫର୍ମାଟ୍‌ କର"</string>
@@ -598,7 +596,7 @@
     <string name="storage_new_action_browse" msgid="3355241742574072658">"ବ୍ରାଉଜ୍ କରନ୍ତୁ"</string>
     <string name="storage_new_action_adopt" msgid="6809707961170895964">"ଡିଭାଇସ୍‌ ଷ୍ଟୋରେଜ୍‌ଭାବରେ ସେଟ୍‌ ଅପ୍‌ କରନ୍ତୁ"</string>
     <string name="storage_new_action_format_public" msgid="1964662216574764811">"ରିମୁଭ୍‍ କରିହେଉଥିବା ଷ୍ଟୋରେଜ‍ଭାବରେ ସେଟ୍‍ ଅପ୍‍ କରନ୍ତୁ"</string>
-    <string name="storage_new_action_eject" msgid="919249291814300000">"ବାହାର କରନ୍ତୁ"</string>
+    <string name="storage_new_action_eject" msgid="919249291814300000">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
     <string name="storage_missing_title" msgid="9068915586235805818">"<xliff:g id="NAME">%1$s</xliff:g>କୁ କାଢ଼ି ଦିଆଗଲା"</string>
     <string name="storage_missing_description" msgid="6835620703133204249">"ଡ୍ରାଇଭ୍‍ ପୁଣି ସଂଯୋଗ ନହେବା ପର୍ଯ୍ୟନ୍ତ କିଛି ଆପ୍‍ ଉପଲବ୍ଧ ରହିବ ନାହିଁ ବା ସଠିକ୍‍ ଭାବରେ କାର୍ଯ୍ୟ କରିବ ନାହିଁ।"</string>
     <string name="insufficient_storage" msgid="4175940286022466535">"ଷ୍ଟୋରେଜ୍‌ରେ ପର୍ଯ୍ୟାପ୍ତ ସ୍ଥାନ ନାହିଁ।"</string>
@@ -635,7 +633,7 @@
     <string name="open_mic_permissions" msgid="8121871594807641073">"ଆପର ମାଇକ୍ରୋଫୋନକୁ ଆକ୍ସେସ୍"</string>
     <string name="microphone_physical_privacy_enabled_title" msgid="6135130916399886772">"ମାଇକ୍ରୋଫୋନ ଆକ୍ସେସ ବ୍ଲକ କରାଯାଇଛି"</string>
     <string name="microphone_physical_privacy_enabled_text" msgid="401238365312924088">"ଅନବ୍ଲକ କରିବା ପାଇଁ, ଆପଣଙ୍କ ଡିଭାଇସରେ ଗୋପନୀୟତା ସ୍ୱିଚକୁ \"ମାଇକ୍ରୋଫୋନ ଚାଲୁ\" ସ୍ଥିତିକୁ ମୁଭ କରି ମାଇକ୍ରୋଫୋନ ଆକ୍ସେସ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ।"</string>
-    <string name="camera" msgid="1226671478936288283">"କ୍ୟାମେରା"</string>
+    <string name="camera" msgid="1226671478936288283">"କେମେରା"</string>
     <string name="camera_toggle_title" msgid="5566469574224956142">"କ୍ୟାମେରା ଆକ୍ସେସ୍"</string>
     <string name="open_camera_permissions" msgid="301360297337141591">"ଆପର କ୍ୟାମେରାକୁ ଆକ୍ସେସ୍"</string>
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"କ୍ୟାମେରା ଆକ୍ସେସ ବ୍ଲକ କରାଯାଇଛି"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ସକ୍ଷମ"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"କନଫିଗରେସନ"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ବ୍ୟବହାର କରିବେ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g>,ପାସୱାର୍ଡ୍‌ ବ୍ୟତୀତ ଆପଣ ଟାଇପ୍‌ କରୁଥିବା ସମସ୍ତ ଟେକ୍ସଟ୍ ସଂଗ୍ରହ କରିପାରିବ। ଏଥିରେ କ୍ରେଡିଟ୍‌ କାର୍ଡ୍‌ ନମ୍ଵର୍‌ ପରି ବ୍ୟକ୍ତିଗତ ଡାଟା ମଧ୍ୟ ଅନ୍ତର୍ଭୁକ୍ତ ରହିଥାଏ।"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -790,7 +788,7 @@
     <string name="system_window_animation_scale" msgid="685477540250939659">"ୱିଣ୍ଡୋ ଆନିମେସନ୍‌ ସ୍କେଲ୍‌"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"ଟ୍ରାଞ୍ଜିସନ୍‌ ଆନିମେସନ୍‌ ସ୍କେଲ୍‌"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"ଆନିମେଟର୍‌ ଅବଧି ସ୍କେଲ୍‌"</string>
-    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"କଡ଼ା ମୋଡ୍ ସକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"ଷ୍ଟ୍ରିକ୍ଟ ମୋଡକୁ ସକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"ପ୍ରୋଫାଇଲ୍‌ GPU ରେଣ୍ଡରିଂ"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"ଟ୍ରେସ୍‌ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="system_dont_keep_activities" msgid="4641165963339846161">"କାର୍ଯ୍ୟକଳାପଗୁଡ଼ିକୁ ରଖନ୍ତୁ ନାହିଁ"</string>
@@ -943,7 +941,7 @@
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"ତୃତୀୟ-ପକ୍ଷ ସୋର୍ସ"</string>
     <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"ଅନୁମତିଗୁଡ଼ିକ"</string>
     <string name="device_apps_app_management_not_available" msgid="4198634078194500518">"ଆପ୍ଲିକେସନ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="unused_apps" msgid="5539166745483454543">"ଅବ୍ୟବହୃତ ଆପଗୁଡ଼ିକ"</string>
+    <string name="unused_apps" msgid="5539166745483454543">"ଅବ୍ୟବହୃତ ଆପ୍ସ"</string>
     <string name="settings_ok" msgid="5950888975075541964">"ଠିକ୍ ଅଛି"</string>
     <string name="settings_confirm" msgid="4489126458677153411">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
     <string name="settings_cancel" msgid="576094334743686152">"ବାତିଲ କରନ୍ତୁ"</string>
@@ -1043,7 +1041,7 @@
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"ସମସ୍ତ ଫାଇଲକୁ ପରିଚାଳନା ପାଇଁ ଆକ୍ସେସ୍ ଦିଅନ୍ତୁ"</string>
     <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"ଏହି ଡିଭାଇସ୍ କିମ୍ବା ଯେ କୌଣସି ସଂଯୁକ୍ତ ଥିବା ଷ୍ଟୋରେଜ୍ ଭଲ୍ୟୁମରେ ଥିବା ସମସ୍ତ ଫାଇଲକୁ ପଢ଼ିବା, ପରିବର୍ତ୍ତନ କରିବା ଏବଂ ଡିଲିଟ୍ କରିବା ପାଇଁ ଏହି ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଆପ୍ ଆପଣଙ୍କୁ ସ୍ପଷ୍ଟ ନକରି ଫାଇଲଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିପାରେ।"</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"ପିକଚର୍-ଇନ୍-ପିକଚର୍"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"ପିକଚର୍-ଇନ୍-ପିକଚରର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"ପିକଚର-ଇନ-ପିକଚରକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"ଛବି-ଭିତରେ-ଛବିକୁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ସପୋର୍ଟ କରୁନାହିଁ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"ଆପ୍‌ ଖୋଲା ଥିବାବେଳେ କିମ୍ୱା ଏହାକୁ ଆପଣ ଛାଡ଼ିବା ପରେ (ଉଦାହରଣସ୍ୱରୂପ, ଏକ ଭିଡିଓ ଦେଖିବା ଜାରି ରଖିବାକୁ) ଏକ ପିକଚର୍-ଇନ-ପିକଚର୍ ୱିଣ୍ଡୋ ତିଆରି କରିବା ପାଇଁ ଏହି ଆ‌ପ୍‌କୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଏହି ୱିଣ୍ଡୋ, ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେବ।"</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"ଆପଗୁଡ଼ିକୁ ଆଲାରାମ୍ ସେଟ୍ କରିବାକୁ ଏବଂ ସମୟ-ସମ୍ବେଦନଶୀଳ କାର୍ଯ୍ୟଗୁଡ଼ିକ ସିଡୁଲ୍ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଏହା ଆପଗୁଡ଼ିକୁ ପୃଷ୍ଠପଟରେ ଚାଲିବାକୁ ଦେଇଥାଏ, ଯାହା ଅଧିକ ପାୱାର୍ ବ୍ୟବହାର କରିପାରେ।\n\nଯଦି ଏହି ଅନୁମତି ବନ୍ଦ ଅଛି, ତେବେ ଏହି ଆପ୍ ଦ୍ୱାରା ସିଡୁଲ୍ କରାଯାଇଥିବା ପୂର୍ବରୁ ଥିବା ଆଲାରାମ୍ ଏବଂ ସମୟ-ଆଧାରିତ ଇଭେଣ୍ଟଗୁଡ଼ିକ କାମ କରିବ ନାହିଁ।"</string>
@@ -1093,7 +1091,7 @@
     <string name="select_device_admin_msg" msgid="8475934459999710332">"ଡିଭାଇସ୍‌ ଆଡ୍‌ମିନ୍‌ ଆପ୍‌"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"ଡିଭାଇସ୍‌ ଆଡମିନ୍‌ ଆପ୍‌ ସକ୍ରିୟ କରିବେ?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"ଏହି ଡିଭାଇସ୍ ଆଡ୍‌ମିନ୍‌ ଆପ୍‌ ସକ୍ରିୟ କରନ୍ତୁ"</string>
-    <string name="device_admin_warning" msgid="7399916080685200660">"ଏହି ଆଡମିନ୍ ଆପ୍‌କୁ ସକ୍ରିୟ କରିବା ଦ୍ୱାରା <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପ୍‌ଟି ନିମ୍ନ କାର୍ଯ୍ୟଗୁଡ଼ିକ କରିପାରିବ:"</string>
+    <string name="device_admin_warning" msgid="7399916080685200660">"ଏହି ଆଡମିନ ଆପକୁ ସକ୍ରିୟ କରିବା ଦ୍ୱାରା <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପଟି ନିମ୍ନ କାର୍ଯ୍ୟଗୁଡ଼ିକ କରିପାରିବ:"</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଏହି ଡିଭାଇସ୍‌କୁ ପରିଚାଳନା ଏବଂ ତଦାରଖ କରିବ।"</string>
     <string name="device_admin_status" msgid="5467001937240455367">"ଏହି ଆଡମିନ୍‌ ଆପ୍‌ ସକ୍ରିୟ ଅଛି ଏବଂ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପ୍‌ ଦ୍ୱାରା ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟଗୁଡ଼ିକ କରାଉଛି:"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"ଆଗକୁ ବଢ଼ିବାର ଅର୍ଥ, ଆପଣଙ୍କ ୟୁଜର ଆପଣଙ୍କ ଆଡମିନ ଦ୍ୱାରା ପରିଚାଳିତ ହେବେ ଯିଏ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟା ସହିତ, ଜଡ଼ିତ ଅନ୍ୟାନ୍ୟ ଡାଟା ମଧ୍ୟ ଷ୍ଟୋର କରିପାରିବେ।\n\nଆପଣଙ୍କ ଆଡମିନଙ୍କ ପାଖରେ ନେଟୱାର୍କ  କାର୍ଯ୍ୟକଳାପ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସ ଲୋକେସନର ସୂଚନା ସମେତ ସେଟିଂସ, ଆକ୍ସେସ, ଆପ୍ସ ଏବଂ ୟୁଜରଙ୍କ ସହ ଜଡ଼ିତ ଡାଟା ତଦାରଖ କରିବା ତଥା ପରିଚାଳନା କରିବାର କ୍ଷମତା ଅଛି।"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ସଫଳତାର ସହ ସଂଯୋଗ ହୋଇଛି"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"ସବୁ ଦେଖାନ୍ତୁ"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"ସନ୍ଧାନ କରୁଛି"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ଅଥେଣ୍ଟିକେଟରରୁ ଆକାଉଣ୍ଟ ଯୋଗ କରିବାର ଇଣ୍ଟେଣ୍ଟକୁ ରିଟ୍ରିଭ କରିବାରେ ବିଫଳ ହୋଇଛି।"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ଆକାଉଣ୍ଟ ଯୋଗ କରିବାରେ ବିଫଳ ହୋଇଛି କିମ୍ବା ଆକାଉଣ୍ଟ ପ୍ରକାର ଉପଲବ୍ଧ ନାହିଁ।"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ଚ୍ୟାନେଲ୍ ଓ ଇନପୁଟଗୁଡ଼ିକ"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ଚ୍ୟାନେଲ୍, ଏକ୍ସଟର୍ନଲ୍ ଇନପୁଟଗୁଡ଼ିକ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ଚ୍ୟାନେଲଗୁଡ଼ିକ"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ସକ୍ଷମ କରେ:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ଧ୍ଯାନ ଦିଅନ୍ତୁ ଯେ ଏହି ମୋଡ ଡିଭାଇସର ପାୱାର ବ୍ୟବହାରକୁ ବୃଦ୍ଧି କରିପାରେ।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"କୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <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_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 198b2d693..1eb755af1 100644
--- a/Settings/res/values-pa/energy-modes.xml
+++ b/Settings/res/values-pa/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ਜ਼ਰੂਰੀ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ਊਰਜਾ ਦੀ ਘੱਟ ਵਰਤੋਂ"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ਟੀਵੀ ਦੇ ਵਰਤੋਂ ਵਿੱਚ ਨਾ ਹੋਣ \'ਤੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ।"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"ਮਹੱਤਵਪੂਰਨ ਅੱਪਡੇਟ ਅਤੇ ਫੰਕਸ਼ਨ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ਸਿਫ਼ਾਰਸ਼ੀ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ਊਰਜਾ ਦੀ ਸੁਯੋਗ ਵਰਤੋਂ"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ਨੈੱਟਵਰਕ (ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਈ) \'ਤੇ ਟੀਵੀ ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ਵਧੀਕ ਨੈੱਟਵਰਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ਊਰਜਾ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਵਾਧਾ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"ਸਿਫ਼ਾਰਸ਼ ਕੀਤੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੋਂ ਇਲਾਵਾ, ਇਹ ਵਿਕਲਪ ਵਧੀਕ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕਰਦਾ ਹੈ, ਜਦੋਂ ਟੀਵੀ ਵਰਤੋਂ ਵਿੱਚ ਨਹੀਂ ਹੁੰਦਾ ਜਿਸ ਨਾਲ ਊਰਜਾ ਦੀ ਵਰਤੋਂ ਵਧ ਸਕਦੀ ਹੈ।"</string>
+    <string 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-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 731dec240..3464d0cd9 100644
--- a/Settings/res/values-pa/strings.xml
+++ b/Settings/res/values-pa/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ਟਿਕਾਣਾ, ਵਰਤੋਂ ਅਤੇ ਤਸ਼ਖੀਸਾਂ, ਵਿਗਿਆਪਨ"</string>
     <string name="add_account" msgid="7386223854837017129">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"ਅਗਿਆਤ ਖਾਤਾ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ਖਾਤਾ ਹਟਾਓ"</string>
     <string name="account_sync" msgid="4315295293211313989">"ਸਿੰਕ ਕੀਤੀਆਂ ਐਪਾਂ ਚੁਣੋ"</string>
     <string name="sync_now" msgid="4335217984374620551">"ਹੁਣੇ ਸਿੰਕ ਕਰੋ"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ਕੀ ਤੁਸੀਂ ਜ਼ਬਰਦਸਤੀ HDR ਆਊਟਪੁੱਟ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ ਸਮੱਗਰੀ ਦਾ <xliff:g id="HDR_TYPE">%s</xliff:g> ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ਤੁਹਾਡੀ ਡਿਸਪਲੇ 1080p 60Hz ਰੈਜ਼ੋਲਿਊਸ਼ਨ \'ਤੇ ਚੱਲੇਗੀ। ਤੁਹਾਡੀ ਡਿਸਪਲੇ 4k 60Hz ਰੈਜ਼ੋਲਿਊਸ਼ਨ \'ਤੇ ਚੱਲਣ \'ਤੇ ਇਹ ਵਿਕਲਪ ਤੁਹਾਡੀ ਡਿਸਪਲੇ ਦੇ ਅਨੁਰੂਪ ਨਹੀਂ ਹੁੰਦਾ ਹੈ।"</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision ਮੌਜੂਦਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ \'ਤੇ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ। ਜੇ ਤੁਸੀਂ Dolby Vision ਨੂੰ ਹੱਥੀਂ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਡਿਸਪਲੇ ਦਾ ਰੈਜ਼ੋਲਿਊਸ਼ਨ 1080p 60Hz ਵਿੱਚ ਬਦਲ ਜਾਵੇਗਾ"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ਕੀ ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਨੂੰ ਬਦਲ ਕੇ 1080p 60Hz ਕਰਨਾ ਹੈ?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"ਹਮੇਸ਼ਾਂ Dolby Vision ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"ਜੇ ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ ਵਿੱਚ Dolby Vision ਨੂੰ HDR ਫਾਰਮੈਟਾਂ ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ Dolby Vision ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰ ਕੇ ਇਸਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"ਹਮੇਸ਼ਾਂ HDR10 ਵਿੱਚ ਜ਼ਬਰਦਸਤੀ ਰੂਪਾਂਤਰਨ ਕਰੋ"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ਨਮੂਨਾ ਲਿਖਤ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਵਿਜ਼ਾਰਡ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"ਪਾਠ 11: ਔਜ਼ ਦਾ ਹੀਰਿਆਂ-ਪੰਨਿਆਂ ਵਾਲਾ ਨਿਰਾਲਾ ਸ਼ਹਿਰ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ਹਰੇ ਰੰਗ ਦੀਆਂ ਐਨਕਾਂ ਲਗਾ ਕੇ ਵੀ ਡੋਰਥੀ ਅਤੇ ਉਸ ਦੇ ਦੋਸਤ ਨਿਰਾਲੇ ਸ਼ਹਿਰ ਦੀ ਚਮਕ-ਦਮਕ ਦੇਖ ਕੇ ਹੈਰਾਨ ਸਨ। ਹਰੇ ਰੰਗ ਦੇ ਮਾਰਬਲ ਨਾਲ ਬਣੇ ਹੋਏ ਸੁੰਦਰ ਘਰ, ਗਲੀਆਂ ਵਿੱਚ ਕਤਾਰਬੱਧ ਸਨ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਚਮਕਦੇ ਪੰਨੇ ਜੜੇ ਹੋਏ ਸਨ। ਉਹ ਉਸੇ ਹਰੇ ਮਾਰਬਲ ਦੇ ਫੁੱਟਪਾਥ \'ਤੇ ਪੈਦਲ ਤੁਰ ਪਏ ਅਤੇ ਜਿੱਥੇ ਆਲੇ-ਦੁਆਲੇ ਰੱਖੇ ਹੋਏ ਮਾਰਬਲ ਪੱਥਰ ਆਪਸ ਵਿੱਚ ਜੁੜਦੇ ਸਨ ਉੱਥੇ ਨੇੜੇ-ਨੇੜੇ ਲਗਾਏ ਗਏ ਪੰਨਿਆਂ ਦੀਆਂ ਕਤਾਰਾਂ ਸਨ ਅਤੇ ਧੁੱਪ ਵਿੱਚ ਚਮਕ ਰਹੀਆਂ ਸਨ। ਖਿੜਕੀਆਂ ਦੇ ਸ਼ੀਸ਼ੇ ਹਰੇ ਰੰਗ ਦੇ ਸਨ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਹਿਰ ਦੇ ਉੱਤੇ ਅਸਮਾਨ ਵਿੱਚ ਵੀ ਹਰੇ ਰੰਗ ਦੀ ਭਾਅ ਸੀ ਅਤੇ ਸੂਰਜ ਦੀਆਂ ਕਿਰਨਾਂ ਵੀ ਹਰੇ ਰੰਗ ਦੀਆਂ ਸਨ। \n\nਉੱਥੇ ਬਹੁਤ ਸਾਰੇ ਲੋਕ, ਆਦਮੀ, ਔਰਤਾਂ ਅਤੇ ਬੱਚੇ ਘੁੰਮ ਰਹੇ ਸਨ ਅਤੇ ਉਹਨਾਂ ਨੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ ਪਾਏ ਹੋਏ ਸਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਚਮੜੀ ਦਾ ਰੰਗ ਵੀ ਹਰਾ ਹੀ ਸੀ। ਉੁਹਨਾਂ ਨੇ ਡੋਰਥੀ ਅਤੇ ਉਸਦੇ ਅਜੀਬੋ-ਗਰੀਬ ਦੋਸਤਾਂ ਵੱਲ ਹੈਰਾਨੀ ਭਰੀਆਂ ਨਜ਼ਰਾਂ ਨਾਲ ਦੇਖਿਆ ਅਤੇ ਜਦੋਂ ਬੱਚਿਆਂ ਨੇ ਸ਼ੇਰ ਨੂੰ ਦੇਖਿਆ ਤਾਂ ਸਾਰੇ ਬੱਚੇ ਭੱਜ ਗਏ ਅਤੇ ਆਪਣੀਆਂ ਮਾਵਾਂ ਦੇ ਪਿੱਛੇ ਜਾ ਕੇ ਲੁਕ ਗਏ; ਪਰ ਕਿਸੇ ਨੇ ਵੀ ਉਹਨਾਂ ਨਾਲ ਗੱਲ ਨਹੀਂ ਕੀਤੀ। ਗਲੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੀਆਂ ਦੁਕਾਨਾਂ ਸਨ ਅਤੇ ਡੋਰਥੀ ਨੇ ਦੇਖਿਆ ਕਿ ਉੱਥੇ ਸਭ ਕੁਝ ਹਰੇ ਰੰਗ ਦਾ ਹੀ ਸੀ। ਹਰੇ ਰੰਗ ਦੀਆਂ ਟੌਫੀਆਂ ਅਤੇ ਹਰੇ ਰੰਗੇ ਦੇ ਮੱਕੀ ਦੇ ਫੁੱਲੇ ਵੇਚੇ ਜਾ ਰਹੇ ਸਨ, ਹਰੇ ਰੰਗ ਦੇ ਬੂਟ ਵੀ, ਹਰੀਆਂ ਟੋਪੀਆਂ ਅਤੇ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ। ਇੱਕ ਥਾਂ \'ਤੇ ਇੱਕ ਵਿਅਕਤੀ ਹਰੇ ਰੰਗ ਦੀ ਸ਼ਕੰਜਵੀ ਵੇਚ ਰਿਹਾ ਸੀ ਅਤੇ ਜਦੋਂ ਬੱਚੇ ਸ਼ਕੰਜਵੀ ਨੂੰ ਖਰੀਦ ਰਹੇ ਸਨ ਤਾਂ ਡੋਰਥੀ ਦੇਖ ਸਕਦੀ ਸੀ ਕਿ ਉਹ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਹਰੇ ਰੰਗ ਦੀਆਂ ਪੈਨੀਆਂ (ਪੈਸੇ) ਦੇ ਰਹੇ ਸਨ। \n\nਇੰਝ ਪ੍ਰਤੀਤ ਹੁੰਦਾ ਸੀ ਕਿ ਉੱਥੇ ਘੋੜੇ ਜਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੇ ਜਾਨਵਰ ਨਹੀਂ ਸਨ: ਬੰਦੇ ਹਰੇ ਰੰਗ ਦੇ ਛੋਟੇ-ਛੋਟੇ ਗੱਡਿਆਂ ਉੱਤੇ ਚੀਜ਼ਾਂ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲੈ ਕੇ ਜਾ ਰਹੇ ਸਨ, ਜਿਨ੍ਹਾਂ ਨੂੰ ਉਹ ਆਪਣੇ ਅੱਗੇ ਧਕੇਲ ਕੇ ਲੈ ਜਾ ਰਹੇ ਸਨ। ਹਰ ਕੋਈ ਖੁਸ਼, ਸੰਤੁਸ਼ਟ ਅਤੇ ਖੁਸ਼ਹਾਲ ਪ੍ਰਤੀਤ ਹੋ ਰਿਹਾ ਸੀ।"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ਹਰੇ ਰੰਗ ਦੀਆਂ ਐਨਕਾਂ ਲਗਾ ਕੇ ਵੀ ਡੋਰਥੀ ਅਤੇ ਉਸ ਦੇ ਦੋਸਤ ਨਿਰਾਲੇ ਸ਼ਹਿਰ ਦੀ ਚਮਕ-ਦਮਕ ਦੇਖ ਕੇ ਹੈਰਾਨ ਸਨ। ਹਰੇ ਰੰਗ ਦੇ ਮਾਰਬਲ ਨਾਲ ਬਣੇ ਹੋਏ ਸੁੰਦਰ ਘਰ, ਗਲੀਆਂ ਵਿੱਚ ਕਤਾਰਬੱਧ ਸਨ ਅਤੇ ਉਨ੍ਹਾਂ ਵਿੱਚ ਚਮਕਦੇ ਪੰਨੇ ਜੜੇ ਹੋਏ ਸਨ। ਉਹ ਉਸੇ ਹਰੇ ਮਾਰਬਲ ਦੇ ਫੁੱਟਪਾਥ \'ਤੇ ਪੈਦਲ ਤੁਰ ਪਏ ਅਤੇ ਜਿੱਥੇ ਆਲੇ-ਦੁਆਲੇ ਰੱਖੇ ਹੋਏ ਮਾਰਬਲ ਪੱਥਰ ਆਪਸ ਵਿੱਚ ਜੁੜਦੇ ਸਨ ਉੱਥੇ ਨੇੜੇ-ਨੇੜੇ ਲਗਾਏ ਗਏ ਪੰਨਿਆਂ ਦੀਆਂ ਕਤਾਰਾਂ ਸਨ ਅਤੇ ਧੁੱਪ ਵਿੱਚ ਚਮਕ ਰਹੀਆਂ ਸਨ। ਖਿੜਕੀਆਂ ਦੇ ਸ਼ੀਸ਼ੇ ਹਰੇ ਰੰਗ ਦੇ ਸਨ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਹਿਰ ਦੇ ਉੱਤੇ ਅਸਮਾਨ ਵਿੱਚ ਵੀ ਹਰੇ ਰੰਗ ਦੀ ਭਾਅ ਸੀ ਅਤੇ ਸੂਰਜ ਦੀਆਂ ਕਿਰਨਾਂ ਵੀ ਹਰੇ ਰੰਗ ਦੀਆਂ ਸਨ। \n\nਉੱਥੇ ਬਹੁਤ ਸਾਰੇ ਲੋਕ, ਆਦਮੀ, ਔਰਤਾਂ ਅਤੇ ਬੱਚੇ ਘੁੰਮ ਰਹੇ ਸਨ ਅਤੇ ਉਨ੍ਹਾਂ ਨੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ ਪਾਏ ਹੋਏ ਸਨ ਅਤੇ ਉਨ੍ਹਾਂ ਦੀ ਚਮੜੀ ਦਾ ਰੰਗ ਵੀ ਹਰਾ ਹੀ ਸੀ। ਉਨ੍ਹਾਂ ਨੇ ਡੋਰਥੀ ਅਤੇ ਉਸਦੇ ਅਜੀਬੋ-ਗਰੀਬ ਦੋਸਤਾਂ ਵੱਲ ਹੈਰਾਨੀ ਭਰੀਆਂ ਨਜ਼ਰਾਂ ਨਾਲ ਦੇਖਿਆ ਅਤੇ ਜਦੋਂ ਬੱਚਿਆਂ ਨੇ ਸ਼ੇਰ ਨੂੰ ਦੇਖਿਆ ਤਾਂ ਸਾਰੇ ਬੱਚੇ ਭੱਜ ਗਏ ਅਤੇ ਆਪਣੀਆਂ ਮਾਵਾਂ ਦੇ ਪਿੱਛੇ ਜਾ ਕੇ ਲੁਕ ਗਏ; ਪਰ ਕਿਸੇ ਨੇ ਵੀ ਉਨ੍ਹਾਂ ਨਾਲ ਗੱਲ ਨਹੀਂ ਕੀਤੀ। ਗਲੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੀਆਂ ਦੁਕਾਨਾਂ ਸਨ ਅਤੇ ਡੋਰਥੀ ਨੇ ਦੇਖਿਆ ਕਿ ਉੱਥੇ ਸਭ ਕੁਝ ਹਰੇ ਰੰਗ ਦਾ ਹੀ ਸੀ। ਹਰੇ ਰੰਗ ਦੀਆਂ ਟੌਫੀਆਂ ਅਤੇ ਹਰੇ ਰੰਗ ਦੇ ਮੱਕੀ ਦੇ ਫੁੱਲੇ ਵੇਚੇ ਜਾ ਰਹੇ ਸਨ, ਹਰੇ ਰੰਗ ਦੇ ਬੂਟ ਵੀ, ਹਰੀਆਂ ਟੋਪੀਆਂ ਅਤੇ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ। ਇੱਕ ਥਾਂ \'ਤੇ ਇੱਕ ਵਿਅਕਤੀ ਹਰੇ ਰੰਗ ਦੀ ਸ਼ਕੰਜਵੀ ਵੇਚ ਰਿਹਾ ਸੀ ਅਤੇ ਜਦੋਂ ਬੱਚੇ ਸ਼ਕੰਜਵੀ ਨੂੰ ਖਰੀਦ ਰਹੇ ਸਨ ਤਾਂ ਡੋਰਥੀ ਦੇਖ ਸਕਦੀ ਸੀ ਕਿ ਉਹ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਹਰੇ ਰੰਗ ਦੀਆਂ ਪੈਨੀਆਂ (ਪੈਸੇ) ਦੇ ਰਹੇ ਸਨ। \n\nਇੰਝ ਪ੍ਰਤੀਤ ਹੁੰਦਾ ਸੀ ਕਿ ਉੱਥੇ ਘੋੜੇ ਜਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੇ ਜਾਨਵਰ ਨਹੀਂ ਸਨ; ਬੰਦੇ ਹਰੇ ਰੰਗ ਦੇ ਛੋਟੇ-ਛੋਟੇ ਗੱਡਿਆਂ ਉੱਤੇ ਚੀਜ਼ਾਂ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲੈ ਕੇ ਜਾ ਰਹੇ ਸਨ, ਜਿਨ੍ਹਾਂ ਨੂੰ ਉਹ ਆਪਣੇ ਅੱਗੇ ਧਕੇਲ ਕੇ ਲੈ ਜਾ ਰਹੇ ਸਨ। ਹਰ ਕੋਈ ਖੁਸ਼, ਸੰਤੁਸ਼ਟ ਅਤੇ ਖੁਸ਼ਹਾਲ ਪ੍ਰਤੀਤ ਹੋ ਰਿਹਾ ਸੀ।"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ਫਾਰਮੈਟ ਦੀ ਚੋਣ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ਸਵੈਚਲਿਤ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"ਹੱਥੀਂ"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ਕੀ %1$s ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਨੂੰ ਬਦਲਣਾ ਹੈ?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ਹੁਣ ਤੋਂ %1$s ਵਰਤਣ ਲਈ \'ਠੀਕ ਹੈ\' ਚੁਣੋ।"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s \'ਤੇ Dolby Vision ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ ਅਤੇ ਇਸਨੂੰ \"ਅਡਵਾਂਸ ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ\" ਵਿੱਚੋਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ਇਹ ਮੋਡ %1$s ਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ। ਕੁਝ ਟੀਵੀਆਂ \'ਤੇ, ਹੋਰ HDR ਫਾਰਮੈਟਾਂ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਵਿਸਤਰਿਤ HDMI ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ। ਇਸ ਦੇ ਸਮਰਥਿਤ ਹੋਣ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਆਪਣੀਆਂ ਟੀਵੀ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰੋ।"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ਇਹ ਮੋਡ ਇਸਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ: %1$s\nਕੁਝ ਟੀਵੀਆਂ \'ਤੇ, ਹੋਰ HDR ਫਾਰਮੈਟਾਂ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਵਿਸਤਰਿਤ HDMI ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ। ਇਸ ਦੇ ਸਮਰਥਿਤ ਹੋਣ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਆਪਣੀਆਂ ਟੀਵੀ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰੋ।"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ਰੱਦ ਕਰੋ"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ਠੀਕ ਹੈ"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ਕੀ ਕੈਸ਼ ਕੀਤਾ ਡਾਟਾ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ਇਹ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਕੈਸ਼ ਕੀਤਾ ਡਾਟਾ ਕਲੀਅਰ ਕਰ ਦੇਵੇਗਾ।"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"ਕਨੈਕਟ ਹੋ ਗਿਆ"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"ਡਿਸਕਨੈਕਟ ਹੋ ਗਿਆ"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"ਤੁਹਾਨੂੰ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ਟੀਵੀ ਆਡੀਓ ਲਈ ਵਰਤੋ"</string>
     <string name="send_feedback" msgid="936698637869795473">"ਵਿਚਾਰ ਭੇਜੋ"</string>
     <string name="launch_help" msgid="2607478763131952469">"ਮਦਦ ਕੇਂਦਰ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਸੰਗਠਨ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ਹੋਰ ਜਾਣੋ"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{ਕੈਮਰਾ ਐਪ}one{ਕੈਮਰਾ ਐਪ}other{ਕੈਮਰਾ ਐਪਾਂ}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"ਕੈਲੰਡਰ ਐਪ"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"ਸੰਰੂਪਣ"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> ਪਾਸਵਰਡਾਂ ਨੂੰ ਛੱਡ ਕੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਸਾਰੀ ਲਿਖਤ ਨੂੂੰ ਇਕੱਤਰ ਕਰ ਸਕਦੀ ਹੈ। ਇਸ ਵਿੱਚ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰਾਂ ਵਰਗਾ ਨਿੱਜੀ ਡਾਟਾ ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"ਕਨੈਕਸ਼ਨ ਸਫਲ ਰਿਹਾ"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"ਸਭ ਦਿਖਾਓ"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"ਖੋਜ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Authenticator ਤੋਂ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰਨ ਦੇ ਇੰਟੈਂਟ ਨੂੰ ਮੁੜ-ਪ੍ਰਾਪਤ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ।"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ਖਾਤੇ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ ਜਾਂ ਖਾਤੇ ਦੀ ਕਿਸਮ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ਚੈਨਲ ਅਤੇ ਇਨਪੁੱਟ"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ਚੈਨਲ, ਬਾਹਰੀ ਇਨਪੁੱਟ"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ਚੈਨਲ"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ਨੋਟ ਕਰੋ ਕਿ ਇਹ ਮੋਡ ਡੀਵਾਈਸ ਦੀ ਪਾਵਰ ਖਪਤ ਨੂੰ ਵਧਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <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_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 d93131d18..b2ed105da 100644
--- a/Settings/res/values-pl/energy-modes.xml
+++ b/Settings/res/values-pl/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Niezbędne funkcje sieciowe"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Niskie zużycie energii"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Wyłącz połączenie sieciowe, kiedy nie używasz telewizora."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kluczowe aktualizacje i funkcje"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Zalecane funkcje sieciowe"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Zoptymalizowane zużycie energii"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Włącza funkcje, które aktywują telewizor za pomocą sieci (tryb czuwania przy podłączeniu do sieci)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Wstawić funkcję 1]"</item>
     <item msgid="8724721267222341891">"[Wstawić funkcję 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatkowe funkcje sieciowe"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Zwiększone zużycie energii"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Oprócz włączenia zalecanych funkcji ta opcja powoduje też włączenie dodatkowych funkcji, kiedy telewizor nie jest używany, co może zwiększyć zużycie energii."</string>
+    <string 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-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 0a16434f2..26ba35642 100644
--- a/Settings/res/values-pl/strings.xml
+++ b/Settings/res/values-pl/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Ustawienia aplikacji"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokalizacja, użytkowanie i diagnostyka, reklamy"</string>
     <string name="add_account" msgid="7386223854837017129">"Dodaj konto"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Nieznane konto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Usuń konto"</string>
     <string name="account_sync" msgid="4315295293211313989">"Wybierz synchronizowane aplikacje"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synchronizuj teraz"</string>
@@ -156,7 +157,7 @@
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferowany zakres dynamiczny"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konwersja preferowana przez system"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Zezwalaj systemowi na zarządzanie konwersją formatu"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Po wybraniu tej opcji odpowiedni to system będzie określać zakres dynamiczny wysyłany do wyświetlacza. W razie potrzeby treść zostanie przekonwertowana na ten zakres."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Po wybraniu tej opcji to system będzie określać odpowiedni zakres dynamiczny wysyłany do wyświetlacza. W razie potrzeby treść zostanie przekonwertowana na ten zakres."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Zawsze zgodnie z formatem treści"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Wymuszaj konwersję"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Wymusza konwersję na preferowany format"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Przykładowy tekst"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Czarnoksiężnik z Krainy Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Rozdział 11: Szmaragdowe Miasto"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Mimo że Dorotka i jej przyjaciele mieli na nosach ochronne zielone okulary, odruchowo zmrużyli oczy, gdy pierwszy raz ujrzeli lśniące wspaniale Szmaragdowe Miasto. Wzdłuż ulic stały równo piękne domy z zielonego marmuru, wysadzane połyskującymi szmaragdami. Chodniki wykonane były z tego samego budulca, a w spojeniach płyt skrzyły się w słońcu całe rzędy osadzonych ciasno szmaragdów. Szyby w oknach były z zielonego szkła. Nawet niebo nad Miastem i promienie słońca miały zielonkawe zabarwienie. \n\nWokół kręciło się mnóstwo ludzi – mężczyzn, kobiet i dzieci – ubranych na zielono. Również ich skóra miała zielony odcień. Patrzyli na Dorotkę i jej barwną kompanię wielkimi, zdziwionymi oczami, a dzieci na widok Lwa uciekały i chowały się za swoimi mamami. Nikt jednak nie odezwał się do nich nawet słowem. Przy ulicy nie brakowało różnych sklepów i Dorotka zauważyła, że cały ich asortyment był zielony: zielone cukierki, zielona prażona kukurydza, zielone buty, zielone kapelusze, wszelkiego rodzaju zielone ubrania. Przy jednym ze stoisk jakiś pan sprzedawał zieloną lemoniadę, za którą dzieci płaciły – jak dostrzegła Dorotka – zielonymi monetami. \n\nNigdzie nie było widać ani koni, ani żadnych innych zwierząt. Do transportu używano zielonych wózeczków, które mieszkańcy pchali przed sobą. Wszyscy wydawali się szczęśliwi, radośni i zadowoleni z życia."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Mimo że Dorotka i jej przyjaciele mieli na nosach ochronne zielone okulary, odruchowo zmrużyli oczy, gdy pierwszy raz ujrzeli lśniące wspaniale Szmaragdowe Miasto. Wzdłuż ulic stały równo piękne domy z zielonego marmuru, wysadzane połyskującymi szmaragdami. Chodniki wykonane były z tego samego budulca, a w spojeniach płyt skrzyły się w słońcu całe rzędy osadzonych ciasno szmaragdów. Szyby w oknach były z zielonego szkła. Nawet niebo nad Miastem i promienie słońca miały zielonkawe zabarwienie. \n\nWokół kręciło się mnóstwo ludzi – mężczyzn, kobiet i dzieci – ubranych na zielono. Również ich skóra miała zielony odcień. Patrzyli na Dorotkę i jej barwną kompanię wielkimi, zdziwionymi oczami, a dzieci na widok Lwa uciekały i chowały się za swoimi mamami. Nikt jednak nie odezwał się do nich nawet słowem. Przy ulicy nie brakowało różnych sklepów i Dorotka zauważyła, że cały ich asortyment był zielony: zielone cukierki, zielona prażona kukurydza, zielone buty, zielone kapelusze, wszelkiego rodzaju zielone ubrania. Przy jednym ze stoisk jakiś pan sprzedawał zieloną lemoniadę, za którą dzieci płaciły – jak dostrzegła Dorotka – zielonymi monetami. \n\nNigdzie nie było widać ani koni, ani żadnych innych zwierząt. Do transportu używano zielonych wózeczków, które mieszkańcy pchali przed sobą. Wszyscy wydawali się szczęśliwi, radośni i zadowoleni z życia."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Wybór formatu"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatycznie"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ręcznie"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Zmienić rozdzielczość na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Kliknij OK, aby od teraz używać rozdzielczości %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Format Dolby Vision nie jest obsługiwany w trybie %1$s i zostanie wyłączony w „Zaawansowanych ustawieniach wyświetlacza”"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ten tryb obsługuje: %1$s. W niektórych telewizorach żeby korzystać z dodatkowych formatów HDR, może być konieczne włączenie rozszerzonego trybu HDMI. Sprawdź w ustawieniach telewizora, czy ta funkcja jest obsługiwana."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ten tryb obsługuje: %1$s\nNa niektórych telewizorach, żeby korzystać z dodatkowych formatów HDR, może być konieczne włączenie rozszerzonego trybu HDMI. Sprawdź w ustawieniach telewizora, czy ta funkcja jest obsługiwana."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Anuluj"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Wyczyścić dane z pamięci podręcznej?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Usuwasz dane z pamięci podr. wszystkich aplikacji."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Połączono"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Rozłączono"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Używaj do dźwięku z telewizora"</string>
     <string name="send_feedback" msgid="936698637869795473">"Prześlij opinię"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centrum pomocy"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Tym urządzeniem zarządza Twoja organizacja."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Tym urządzeniem zarządza <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">"  "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Więcej informacji"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacja aparatu}few{Aplikacje aparatu}many{Aplikacje aparatu}other{Aplikacje aparatu}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacja kalendarza"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Włącz"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguracja"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Użyć <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> może gromadzić cały wpisywany tekst z wyjątkiem haseł. Dotyczy to także danych osobistych, np. numerów kart kredytowych."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> może odczytywać zawartość ekranu, wyświetlać treść nad innymi aplikacjami, śledzić Twoje interakcje z aplikacjami lub czujnikami sprzętowymi oraz wchodzić w interakcje z aplikacjami w Twoim imieniu."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Zatrzymać <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Wybierając OK, zatrzymasz <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Przetwarzanie tekstu na mowę"</string>
@@ -759,7 +759,7 @@
     <string name="system_drawing" msgid="5802739024643871942">"Rysowanie"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Monitorowanie"</string>
     <string name="system_apps" msgid="8481888654606868074">"Aplikacje"</string>
-    <string name="system_stay_awake" msgid="5935117574414511413">"Pozostaw włączony ekran"</string>
+    <string name="system_stay_awake" msgid="5935117574414511413">"Nie usypiaj"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Ekran nigdy nie będzie usypiany"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"Sprawdzanie HDCP"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"Optymalizacja HDMI"</string>
@@ -773,7 +773,7 @@
     <string name="system_usb_debugging" msgid="2158285492172755923">"Debugowanie USB"</string>
     <string name="system_allow_mock_locations" msgid="2483106887711851466">"Pozorowanie lokalizacji"</string>
     <string name="system_select_debug_app" msgid="6200987902307533721">"Wybierz aplikację do debugowania"</string>
-    <string name="system_wait_for_debugger" msgid="5715878008542589060">"Poczekaj na debugera"</string>
+    <string name="system_wait_for_debugger" msgid="5715878008542589060">"Czekaj na debugera"</string>
     <string name="system_verify_apps_over_usb" msgid="7289212844195483932">"Weryfikuj aplikacje przez USB"</string>
     <string name="system_desc_verify_apps_over_usb" msgid="7737988681480237094">"Sprawdzaj, czy aplikacje zainstalowane przez ADB/ADT nie zachowują się w szkodliwy sposób"</string>
     <string name="system_wifi_verbose_logging" msgid="3097788974146704831">"Szczegółówe rejestrowanie Wi-Fi"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Połączono"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Pokaż wszystko"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Szukam"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nie udało się pobrać intencji dodawania konta z mechanizmu uwierzytelniającego."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Nie udało się dodać konta lub typ konta jest niedostępny."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanały i wejścia"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanały, wejścia zewnętrzne"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanały"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Włącza:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Uwaga: ten tryb może powodować większe zużycie energii na urządzeniu."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Włącz tryb „<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
+    <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_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 f526219a9..7b4ef82ac 100644
--- a/Settings/res/values-pt-rBR/energy-modes.xml
+++ b/Settings/res/values-pt-rBR/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Recursos de rede essenciais"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Baixo uso de energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desative a conexão de rede quando a TV não estiver em uso."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Atualizações e funções importantes"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recursos de rede recomendados"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Uso otimizado de energia"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Habilita recursos que ativam a TV na rede (standby em rede)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Outros recursos de rede"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior uso de energia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Além dos recursos recomendados, essa opção ativa outros recursos quando a TV não está em uso, o que pode aumentar o uso de energia."</string>
+    <string 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-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 92dd43568..49c0fca52 100644
--- a/Settings/res/values-pt-rBR/strings.xml
+++ b/Settings/res/values-pt-rBR/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Configurações do app"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Local, uso e diagnósticos, anúncios"</string>
     <string name="add_account" msgid="7386223854837017129">"Adicionar conta"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Conta desconhecida"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remover conta"</string>
     <string name="account_sync" msgid="4315295293211313989">"Escolher apps sincronizados"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizar agora"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exemplo de texto"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"O Mágico de Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítulo 11: A maravilhosa Cidade das Esmeraldas de Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Mesmo com os olhos protegidos pelos óculos verdes, Dorothy e os amigos dela foram ofuscados pelo brilho da magnífica cidade. As ruas estavam repletas de belas casas, todas feitas de mármore verde e cravejadas de esmeraldas brilhantes por toda a parte. Eles caminharam pela calçada do mesmo mármore verde, e, onde os blocos se encontravam, havia fileiras de esmeraldas bem próximas umas das outras, brilhantes à luz do sol. As janelas eram de vidro verde. Até mesmo o céu sobre a cidade era esverdeado, e os raios solares eram verdes. \n\nHavia muitas pessoas, homens, mulheres e crianças, caminhando por lá, e todos vestiam roupas verdes e tinham a pele esverdeada. Eles olharam para Dorothy e os estranhos companheiros da garota com olhos curiosos, e todas as crianças fugiram e se esconderam atrás de suas mães quando viram o Leão, mas ninguém falou com eles. Havia muitas lojas na rua, e Dorothy viu que tudo nelas era verde. Doces verdes e pipoca verde estavam à venda, assim como sapatos verdes, chapéus verdes e roupas verdes de todos os tipos. Em um lugar, um homem estava vendendo limonada verde, e quando as crianças a compravam, Dorothy viu que elas pagavam com moedas verdes. \n\nParecia não haver cavalos nem animais de qualquer espécie. Os homens carregavam as coisas em pequenos carrinhos verdes, que eles empurravam à frente. Todos pareciam felizes, satisfeitos e prósperos."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Mesmo com os olhos protegidos pelos óculos verdes, Dorothy e os amigos foram ofuscados pelo brilho da magnífica cidade. As ruas estavam repletas de belas casas, todas feitas de mármore verde e cravejadas de esmeraldas brilhantes por toda a parte. Eles caminharam pela calçada do mesmo mármore verde, e, onde os blocos se encontravam, havia fileiras de esmeraldas bem próximas umas das outras, brilhantes à luz do sol. As janelas eram de vidro verde. Até mesmo o céu sobre a cidade era esverdeado, e os raios solares eram verdes. \n\nHavia muitas pessoas, homens, mulheres e crianças, caminhando por lá, e todos vestiam roupas verdes e tinham a pele esverdeada. Eles observaram Dorothy e os estranhos companheiros da garota com olhos curiosos, e todas as crianças fugiram e se esconderam atrás de suas mães quando viram o Leão, mas ninguém falou com eles. Havia muitas lojas na rua, e Dorothy viu que tudo nelas era verde. Doces verdes e pipoca verde estavam à venda, assim como sapatos verdes, chapéus verdes e roupas verdes de todos os tipos. Em um lugar, um homem estava vendendo limonada verde, e quando as crianças a compravam, Dorothy viu que elas pagavam com moedas verdes. \n\nParecia não haver cavalos nem animais de qualquer espécie. Os homens carregavam as coisas em pequenos carrinhos verdes, que eles empurravam à frente. Todos pareciam felizes, satisfeitos e prósperos."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Seleção de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Quer mudar a resolução para %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecione \"Ok\" para usar a resolução %1$s de agora em diante."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Não há suporte a Dolby Vision no modo %1$s, e ele vai ser desativado em \"Configurações avançadas de tela\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo oferece suporte a %1$s. Em algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Esse modo está disponível para: %1$s\nEm algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Limpar os dados em cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Esta ação limpa dados em cache de todos os apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Conectado"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconectado"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Você não tem permissão para alterar as configurações de Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usar para o áudio da TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Enviar feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Central de Ajuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo é gerenciado pela sua organização."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Saiba mais"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de câmera}one{App de câmera}other{Apps de câmera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App Calendário"</string>
@@ -412,7 +412,7 @@
     <string name="terms_title" msgid="192888187310800678">"Termos e Condições"</string>
     <string name="webview_license_title" msgid="5370270485188947540">"Licença do sistema Webview"</string>
     <string name="consumer_information_title" msgid="7729729568416672733">"Informações para os consumidores"</string>
-    <string name="consumer_information_message" msgid="205236637689468764">"O conteúdo que você encontra no Android TV vem de parceiros terceirizados, como desenvolvedores de apps e estúdios de cinema, e do próprio Google. Para ver mais informações, acesse "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
+    <string name="consumer_information_message" msgid="205236637689468764">"O conteúdo que você encontra no Android TV vem de parceiros terceirizados, como desenvolvedores de apps e estúdios de cinema, e do próprio Google. Para acessar mais informações, acesse "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
     <string name="consumer_information_button_ok" msgid="6979480064600038080">"OK"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="4475363344103354364">"Insatisfatória"</item>
@@ -441,7 +441,7 @@
     <string name="wifi_setting_available_networks" msgid="2096957819727319750">"Redes disponíveis"</string>
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"Adicionar nova rede"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"Conexão rápida"</string>
-    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"A conexão rápida encontra e conecta uma rede Wi-Fi via código QR no smartphone."</string>
+    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"A conexão rápida encontra e conecta uma rede Wi-Fi via QR code no smartphone."</string>
     <string name="security_type" msgid="2297615092250075696">"Tipo de segurança"</string>
     <string name="other_network" msgid="5299289104661858596">"Outra rede..."</string>
     <string name="skip_network" msgid="3095529090560000692">"Ignorar"</string>
@@ -469,7 +469,7 @@
     <string name="title_wifi_proxy_settings_invalid" msgid="7698883245005941665">"Configurações de proxy inválidas"</string>
     <string name="title_wifi_ip_settings_invalid" msgid="7283801973512992014">"Configurações de IP inválidas"</string>
     <string name="title_wifi_known_network" msgid="6162483884727898697">"<xliff:g id="SSID">%1$s</xliff:g> é uma rede salva"</string>
-    <string name="title_wifi_scan_qr_code" msgid="7485605625055717874">"Leia o código QR para se conectar"</string>
+    <string name="title_wifi_scan_qr_code" msgid="7485605625055717874">"Leia o QR code para se conectar"</string>
     <string name="wifi_action_try_again" msgid="8920677153891141148">"Tentar novamente"</string>
     <string name="wifi_action_view_available_networks" msgid="609561604257828342">"Ver redes disponíveis"</string>
     <string name="wifi_connecting" msgid="4234341255109283018">"Conectando a <xliff:g id="SSID">%1$s</xliff:g>"</string>
@@ -477,7 +477,7 @@
     <string name="wifi_connect" msgid="2206086690065242121">"Conectar"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"Esquecer a rede"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"Esta ação limpa as informações usadas para se conectar a esta rede, incluindo uma senha salva."</string>
-    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Leia o código QR em um smartphone e siga as instruções para se conectar a uma rede Wi-Fi.\n \n Em um "<b>"smartphone Android"</b>", acesse Configurações -&gt; Rede e Internet -&gt; Wi-Fi -&gt; Selecionar Wi-Fi -&gt; Avançado -&gt; adicione o dispositivo e leia o código QR."</string>
+    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Leia o QR code em um smartphone e siga as instruções para se conectar a uma rede Wi-Fi.\n \n Em um "<b>"smartphone Android"</b>", acesse Configurações -&gt; Rede e Internet -&gt; Wi-Fi -&gt; Selecionar Wi-Fi -&gt; Avançado -&gt; adicione o dispositivo e leia o QR code."</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"Pressione o botão \"Voltar\" para cancelar"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"OK"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"Continuar"</string>
@@ -591,7 +591,7 @@
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"Não remova o drive durante a transferência.\nO<xliff:g id="APPNAME">%1$s</xliff:g> app do dispositivo fica indisponível até o final da transferência."</string>
     <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"Ignorar o armazenamento do dispositivo?"</string>
     <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"Todos os dados armazenados neste drive serão perdidos para sempre com a opção \"Ignorar\". Gostaria de prosseguir?"</string>
-    <string name="storage_wizard_forget_action" msgid="5609631662522950596">"Ignorar"</string>
+    <string name="storage_wizard_forget_action" msgid="5609631662522950596">"Esquecer"</string>
     <string name="storage_new_title" msgid="4768955281180255038">"Drive USB conectado"</string>
     <string name="storage_new_action_browse" msgid="3355241742574072658">"Procurar"</string>
     <string name="storage_new_action_adopt" msgid="6809707961170895964">"Configurar como armazenamento do dispositivo"</string>
@@ -666,7 +666,7 @@
     <string name="location_reporting" msgid="3552501333650895634">"Relatório de localização"</string>
     <string name="location_history" msgid="4055660203090513120">"Histórico de localização"</string>
     <string name="location_reporting_desc" msgid="1580018652781674608">"O Google usa este recurso em produtos como o Google Now e o Google Maps. A ativação do Relatório de localização permite que qualquer produto do Google que use este recurso armazene e use os dados de localização mais recentes de seu dispositivo em associação a sua Conta do Google."</string>
-    <string name="location_history_desc" msgid="926674012916014270">"Quando o Histórico de localização está ativado nesta conta, o Google pode armazenar os dados de localização do dispositivo para serem usados pelos apps.\n\nPor exemplo, o Google Maps pode apresentar rotas e o Google Now pode informar sobre as condições do trânsito.\n\nVocê pode desativar o Histórico de localização a qualquer momento, mas ao fazê-lo, ele não será excluído. Para ver e gerenciar seu Histórico de localização, acesse maps.google.com/locationhistory."</string>
+    <string name="location_history_desc" msgid="926674012916014270">"Quando o Histórico de localização está ativado nesta conta, o Google pode armazenar os dados de localização do dispositivo para serem usados pelos apps.\n\nPor exemplo, o Google Maps pode apresentar rotas e o Google Now pode informar sobre as condições do trânsito.\n\nVocê pode desativar o Histórico de localização a qualquer momento, mas ao fazê-lo, ele não será excluído. Para acessar e gerenciar seu Histórico de localização, acesse maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"Excluir histórico de localização"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"O histórico será excluído e alguns apps pararão de funcionar. Não é possível desfazer."</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Leitores de tela"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ativar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuração"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> pode coletar todo texto que você digita, incluindo dados pessoais como números de cartão de crédito, exceto senhas."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> poderá ler o que estiver na tela, mostrar conteúdo sobre outros apps, rastrear suas interações com sensores de hardware ou apps e interagir com apps por você."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Interromper <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ao selecionar OK, o <xliff:g id="SERVICE">%1$s</xliff:g> será interrompido."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Conversão de texto em voz"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Conexão realizada"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostrar tudo"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Pesquisando"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Falha ao recuperar a intent \"Adicionar conta\" do autenticador."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Falha ao adicionar a conta ou o tipo dela não está disponível."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canais e entradas"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canais, entradas externas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canais"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Ativa:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Esse modo pode aumentar o consumo de energia do dispositivo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 cd091603a..4019a28ef 100644
--- a/Settings/res/values-pt-rPT/energy-modes.xml
+++ b/Settings/res/values-pt-rPT/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcionalidades de rede essenciais"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Baixo consumo de energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desative a ligação de rede quando a TV não está em utilização."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Funções e atualizações críticas"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcionalidades de rede recomendadas"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consumo de energia otimizado"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ativa funcionalidades que permitem a ativação da TV através da rede (modo de espera em rede)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Introduzir funcionalidade 1]"</item>
     <item msgid="8724721267222341891">"[Introduzir funcionalidade 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcionalidades de rede adicionais"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior consumo de energia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Além das funcionalidades recomendadas, esta opção ativa funcionalidades adicionais, quando a TV não está em utilização, que podem aumentar o consumo de energia."</string>
+    <string 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-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 a63b80320..a5529cc2f 100644
--- a/Settings/res/values-pt-rPT/strings.xml
+++ b/Settings/res/values-pt-rPT/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Definições da app"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Localização, Utilização e diagnósticos, Anúncios"</string>
     <string name="add_account" msgid="7386223854837017129">"Adicionar conta"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Conta desconhecida"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remover conta"</string>
     <string name="account_sync" msgid="4315295293211313989">"Escolher apps sincronizadas"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizar agora"</string>
@@ -151,15 +152,15 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Definições de som avançadas"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Permitir modo de jogo"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Faça a correspondência com a amplitude dinâmica do conteúdo"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Fazer correspondência com amplitude dinâmica do conteúdo"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Ao ativar esta opção, o sistema vai alternar entre diferentes formatos de amplitude dinâmica para corresponder ao conteúdo. Isto pode resultar num ecrã preto durante uma mudança de formato.\n\nClique em Definições de visualização avançadas para obter mais opções de amplitude dinâmica."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Amplitude dinâmica preferida"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversão preferida do sistema"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Permite que o sistema faça a gestão da conversão do formato"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Quando esta opção está selecionada, o sistema vai determinar uma amplitude dinâmica adequada para ser enviada para o seu ecrã e converter o conteúdo nesta amplitude dinâmica conforme necessário."</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Quando esta opção está selecionada, o sistema vai determinar uma amplitude dinâmica adequada para ser enviada para o seu ecrã e converter o conteúdo para esta amplitude dinâmica conforme necessário."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Corresponde sempre ao formato do conteúdo"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Force a conversão"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força a conversão no formato preferido"</string>
+    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Forçar conversão"</string>
+    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Força a conversão para o formato preferido"</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Force a conversão no formato preferido. Forçar a conversão pode afetar outras definições no Modo de apresentação ou formato HDR."</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Sempre para SDR"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Sempre para <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exemplo de texto"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"O Maravilhoso Feiticeiro de Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítulo 11: A Maravilhosa Cidade Esmeralda de Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Mesmo com os olhos protegidos pelos óculos verdes, Dorothy e os seus amigos ficaram ofuscados pelo esplendor da maravilhosa Cidade. As ruas estavam ladeadas por casas magníficas totalmente construídas em mármore verde e cravejadas de esmeraldas brilhantes. Caminhavam por um passeio feito do mesmo mármore verde e, nos espaços onde os blocos se uniam, havia filas apertadas de esmeraldas que brilhavam sob a luz do sol. Os vidros das janelas eram verdes; até mesmo o céu sobre a Cidade tinha um tom esverdeado, e os raios do sol eram verdes. \n\nPelas ruas caminhavam várias pessoas, homens, mulheres e crianças, todos vestidos com roupas verdes e com uma pele esverdeada. Olhavam com curiosidade para Dorothy e os seus estranhos companheiros, e as crianças fugiam e escondiam-se atrás das suas mães quando viam o Leão. Contudo, ninguém falava com eles. A rua estava repleta de lojas e Dorothy viu que tudo o que nelas havia era verde. Vendiam-se doces verdes e pipocas verdes, bem como sapatos verdes, chapéus verdes e roupas verdes de todos os tipos. Por ali, um homem vendia limonada verde e Dorothy reparou que as crianças lhe pagavam com moedas verdes. \n\nParecia não haver cavalos ou animais de qualquer espécie. Os homens levavam as suas coisas em pequenos carrinhos verdes que empurravam à sua frente. Todos pareciam felizes, satisfeitos e prósperos."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Mesmo com os olhos protegidos pelos óculos verdes, Dorothy e os seus amigos ficaram ofuscados pelo esplendor da maravilhosa Cidade. As ruas estavam ladeadas por casas magníficas totalmente construídas em mármore verde e cravejadas de esmeraldas brilhantes. Caminhavam por um passeio feito do mesmo mármore verde e, nos espaços onde os blocos se uniam, havia filas apertadas de esmeraldas que brilhavam sob a luz do sol. Os vidros das janelas eram verdes; até mesmo o céu sobre a Cidade tinha um tom esverdeado, e os raios do sol eram verdes. \n\nPelas ruas caminhavam várias pessoas, homens, mulheres e crianças, todos vestidos com roupas verdes e com uma pele esverdeada. Olhavam com curiosidade para Dorothy e os seus estranhos companheiros, e as crianças fugiam e escondiam-se atrás das suas mães quando viam o Leão. Contudo, ninguém falava com eles. A rua estava repleta de lojas e Dorothy viu que tudo o que nelas havia era verde. Vendiam-se doces verdes e pipocas verdes, bem como sapatos verdes, chapéus verdes e roupas verdes de todos os tipos. Por ali, um homem vendia limonada verde e Dorothy reparou que as crianças lhe pagavam com moedas verdes. \n\nParecia não haver cavalos ou animais de qualquer espécie. Os homens levavam as suas coisas em pequenos carrinhos verdes que empurravam à sua frente. Todos pareciam felizes, satisfeitos e prósperos."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Seleção de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,13 +219,12 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Alterar resolução para %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecione OK para utilizar %1$s a partir de agora."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"O Dolby Vision não é suportado no modo %1$s e vai ser desativado nas \"Definições de visualização avançadas\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo suporta %1$s. Em algumas TVs, pode ter de ligar o HDMI melhorado para ativar mais formatos HDR. Verifique as definições da sua TV para ver se isto é suportado."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Este modo suporta: %1$s\nEm algumas TVs, pode ter de ligar o HDMI melhorado para ativar mais formatos HDR (elevada amplitude dinâmica). Verifique as definições da sua TV para ver se isto é suportado."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
-    <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Pretende limpar os dados em cache?"</string>
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
+    <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Quer limpar os dados em cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Isto limpa os dados em cache de todas as app"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"Adicionar acessório"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Ligado"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desligado"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Não tem autorização para alterar as definições de Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usar para áudio de TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Enviar feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centro de Ajuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo é gerido pela sua entidade."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Saiba mais"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de câmara}other{Apps de câmara}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicação de calendário"</string>
@@ -353,7 +353,7 @@
     <string name="default_email_app_title" msgid="3712283056326496555">"{count,plural, =1{App de cliente de email}other{Apps de cliente de email}}"</string>
     <string name="default_map_app_title" msgid="9051013257374474801">"Aplicação de mapas"</string>
     <string name="default_phone_app_title" msgid="4833449131501871644">"{count,plural, =1{App de telefone}other{Apps de telefone}}"</string>
-    <string name="default_browser_title" msgid="3612813200586492159">"App do navegador"</string>
+    <string name="default_browser_title" msgid="3612813200586492159">"App de navegador"</string>
     <string name="app_names_concatenation_template_2" msgid="5297284354915830297">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"Tutoriais"</string>
@@ -517,7 +517,7 @@
     <string name="wifi_setup_summary_title_connected" msgid="2725439590655448489">"Está ligado a <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_summary_title_connected" msgid="201105022065577659">"Rede ligada"</string>
     <string name="wifi_summary_title_not_connected" msgid="7991004795297065201">"A rede não está ligada"</string>
-    <string name="wifi_summary_description_connected_to_wifi_network" msgid="8796747274977762311">"Já está ligado(a) a <xliff:g id="SSID">%1$s</xliff:g>. Pretende ligar a uma rede diferente?"</string>
+    <string name="wifi_summary_description_connected_to_wifi_network" msgid="8796747274977762311">"Já está ligado(a) a <xliff:g id="SSID">%1$s</xliff:g>. Quer ligar a uma rede diferente?"</string>
     <string name="wifi_summary_unknown_network" msgid="8044143986439139664">"rede desconhecida"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7326314737931342236">"Não tem autorização para alterar a rede Wi‑Fi."</string>
     <string name="title_ok" msgid="6500452958848127145">"OK"</string>
@@ -550,7 +550,7 @@
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"Limpe os dados em cache"</string>
     <string name="storage_free_up_clear_cached_data_summary" msgid="3111860361699185304">"Liberte <xliff:g id="SPACE">%1$s</xliff:g>"</string>
     <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Limpa ficheiros temporários que ocupam espaço. Não afeta os dados guardados, como preferências de apps ou vídeos offline, e não precisa de iniciar sessão nas apps novamente."</string>
-    <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"Pretende limpar os dados em cache?"</string>
+    <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"Quer limpar os dados em cache?"</string>
     <string name="storage_free_up_clear_cached_data_confirm_description" msgid="4840728913914074729">"Irá limpar os dados em cache de todas as apps."</string>
     <string name="storage_free_up_uninstall_apps" msgid="7755671754934975908">"Desinstale apps"</string>
     <string name="storage_mount_success" msgid="4459298609971461753">"<xliff:g id="NAME">%1$s</xliff:g> está montado"</string>
@@ -589,8 +589,8 @@
     <string name="storage_wizard_move_app_title" msgid="6504922588346440942">"Armazenamento usado"</string>
     <string name="storage_wizard_move_app_progress_title" msgid="7058465372227392453">"A mover <xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"Não remova a unidade durante a transferência.\nA aplicação <xliff:g id="APPNAME">%1$s</xliff:g> neste dispositivo não está disponível até terminar a transferência."</string>
-    <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"Pretende esquecer o armazenamento do dispositivo?"</string>
-    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"Todos os dados armazenados nesta unidade serão eliminados ao selecionar \"Esquecer\". Pretende continuar?"</string>
+    <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"Quer esquecer o armazenamento do dispositivo?"</string>
+    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"Todos os dados armazenados nesta unidade serão eliminados ao selecionar \"Esquecer\". Quer continuar?"</string>
     <string name="storage_wizard_forget_action" msgid="5609631662522950596">"Esquecer"</string>
     <string name="storage_new_title" msgid="4768955281180255038">"Unidade USB ligada"</string>
     <string name="storage_new_action_browse" msgid="3355241742574072658">"Procurar"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ativar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuração"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"O <xliff:g id="SERVICE">%1$s</xliff:g> poderá recolher todo o texto que digita, exceto palavras-passe. Isto inclui dados pessoais como números de cartões de crédito."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"O serviço <xliff:g id="SERVICE">%1$s</xliff:g> vai poder ler o seu ecrã, apresentar conteúdo através de outras apps, monitorizar as suas interações com apps ou sensores de hardware e interagir com apps em seu nome."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ao selecionar OK, para o <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Síntese de voz"</string>
@@ -763,7 +763,7 @@
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"O ecrã nunca entrará em suspensão"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"Verificação HDCP"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"Otimização HDMI"</string>
-    <string name="system_reboot_confirm" msgid="7035370306447878560">"Pretende reiniciar agora?"</string>
+    <string name="system_reboot_confirm" msgid="7035370306447878560">"Quer reiniciar agora?"</string>
     <string name="system_desc_reboot_confirm" msgid="1567738857421128179">"Para alterar esta definição, é necessário reiniciar o dispositivo"</string>
     <string name="system_never_check" msgid="2860070727606369055">"Nunca verificar"</string>
     <string name="system_check_for_drm_content_only" msgid="6667617772587997533">"Rever apenas conteúdo DRM"</string>
@@ -996,7 +996,7 @@
     <string name="device_rename_title" msgid="9070021379000499270">"Mudar o nome deste <xliff:g id="DEVICEMODEL">%1$s</xliff:g>"</string>
     <string name="device_rename_description" msgid="1973894029492915135">"Atualmente, este <xliff:g id="DEVICEMODEL">%1$s</xliff:g> chama-se \"<xliff:g id="DEVICENAME">%2$s</xliff:g>\""</string>
     <string name="device_name_suggestion_title" msgid="3986220212759193742">"Definir o nome do dispositivo"</string>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Utilize este nome ao transmitir fotos, vídeos e muito mais a partir do telemóvel."</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Use este nome ao transmitir fotos, vídeos e muito mais a partir do telemóvel."</string>
     <string name="change_setting" msgid="7211706374208138343">"Alterar"</string>
     <string name="keep_settings" msgid="703474489210093961">"Não alterar"</string>
     <string name="apps_permissions" msgid="7876407267050498394">"Autorizações"</string>
@@ -1007,7 +1007,7 @@
     <string name="choose_application" msgid="2375936782103669988">"Escolher aplicação"</string>
     <string name="experimental_preference" msgid="3982593252210557436">"(Experimental)"</string>
     <string name="reboot_safemode_action" msgid="2862127510492131128">"Reiniciar no modo de segurança"</string>
-    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"Pretende reiniciar no modo de segurança?"</string>
+    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"Quer reiniciar no modo de segurança?"</string>
     <string name="reboot_safemode_desc" msgid="2919933461408942799">"Esta ação desativa todas as aplicações de terceiros instaladas. Estas são restauradas quando reiniciar novamente."</string>
     <string name="capturing_bugreport" msgid="832512801903486821">"A capturar o relatório de erro"</string>
     <string name="available_virtual_keyboard_category" msgid="7445262027711560629">"Teclados virtuais disponíveis"</string>
@@ -1095,7 +1095,7 @@
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"Este dispositivo será gerido e monitorizado pela aplicação <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
     <string name="device_admin_status" msgid="5467001937240455367">"Esta app de administração está ativa e permite que a app <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"Ao continuar, o utilizador será gerido pelo seu gestor, que, para além dos seus dados pessoais, também poderá armazenar dados associados.\n\nO gestor pode monitorizar e gerir as definições, o acesso, as aplicações e os dados associados a este utilizador, incluindo a atividade da rede e as informações de localização do seu dispositivo."</string>
-    <string name="share_remote_bugreport_dialog_title" msgid="2080017987692459555">"Pretende partilhar o relatório de erro?"</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="2080017987692459555">"Quer partilhar o relatório de erro?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"O seu gestor de TI solicitou um relatório de erro para ajudar na resolução de problemas deste dispositivo. As aplicações e os dados podem ser partilhados."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="4637489112422692638">"O seu gestor de TI solicitou um relatório de erro para ajudar na resolução de problemas deste dispositivo. As aplicações e os dados podem ser partilhados e o dispositivo pode tornar-se temporariamente mais lento."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="8096239263583331293">"Este relatório de erro está a ser partilhado com o seu gestor de TI. Contacte-o para obter mais detalhes."</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Ligação estabelecida com êxito"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostrar tudo"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"A pesquisar…"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Falha ao obter a intenção de adicionar conta do autenticador."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Falha ao adicionar a conta ou o tipo de conta não está disponível."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canais e entradas"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canais, entradas externas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canais"</string>
@@ -1124,5 +1126,10 @@
     <string name="energy_modes_summary" msgid="7196407759836930799">"Melhore a eficiência energética quando a TV não está em utilização"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"Ativa:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tenha em atenção que este modo pode aumentar o consumo de energia do dispositivo."</string>
-    <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativa \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 f526219a9..7b4ef82ac 100644
--- a/Settings/res/values-pt/energy-modes.xml
+++ b/Settings/res/values-pt/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Recursos de rede essenciais"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Baixo uso de energia"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Desative a conexão de rede quando a TV não estiver em uso."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Atualizações e funções importantes"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Recursos de rede recomendados"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Uso otimizado de energia"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Habilita recursos que ativam a TV na rede (standby em rede)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Outros recursos de rede"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Maior uso de energia"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Além dos recursos recomendados, essa opção ativa outros recursos quando a TV não está em uso, o que pode aumentar o uso de energia."</string>
+    <string 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-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 92dd43568..49c0fca52 100644
--- a/Settings/res/values-pt/strings.xml
+++ b/Settings/res/values-pt/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Configurações do app"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Local, uso e diagnósticos, anúncios"</string>
     <string name="add_account" msgid="7386223854837017129">"Adicionar conta"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Conta desconhecida"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Remover conta"</string>
     <string name="account_sync" msgid="4315295293211313989">"Escolher apps sincronizados"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizar agora"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exemplo de texto"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"O Mágico de Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capítulo 11: A maravilhosa Cidade das Esmeraldas de Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Mesmo com os olhos protegidos pelos óculos verdes, Dorothy e os amigos dela foram ofuscados pelo brilho da magnífica cidade. As ruas estavam repletas de belas casas, todas feitas de mármore verde e cravejadas de esmeraldas brilhantes por toda a parte. Eles caminharam pela calçada do mesmo mármore verde, e, onde os blocos se encontravam, havia fileiras de esmeraldas bem próximas umas das outras, brilhantes à luz do sol. As janelas eram de vidro verde. Até mesmo o céu sobre a cidade era esverdeado, e os raios solares eram verdes. \n\nHavia muitas pessoas, homens, mulheres e crianças, caminhando por lá, e todos vestiam roupas verdes e tinham a pele esverdeada. Eles olharam para Dorothy e os estranhos companheiros da garota com olhos curiosos, e todas as crianças fugiram e se esconderam atrás de suas mães quando viram o Leão, mas ninguém falou com eles. Havia muitas lojas na rua, e Dorothy viu que tudo nelas era verde. Doces verdes e pipoca verde estavam à venda, assim como sapatos verdes, chapéus verdes e roupas verdes de todos os tipos. Em um lugar, um homem estava vendendo limonada verde, e quando as crianças a compravam, Dorothy viu que elas pagavam com moedas verdes. \n\nParecia não haver cavalos nem animais de qualquer espécie. Os homens carregavam as coisas em pequenos carrinhos verdes, que eles empurravam à frente. Todos pareciam felizes, satisfeitos e prósperos."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Mesmo com os olhos protegidos pelos óculos verdes, Dorothy e os amigos foram ofuscados pelo brilho da magnífica cidade. As ruas estavam repletas de belas casas, todas feitas de mármore verde e cravejadas de esmeraldas brilhantes por toda a parte. Eles caminharam pela calçada do mesmo mármore verde, e, onde os blocos se encontravam, havia fileiras de esmeraldas bem próximas umas das outras, brilhantes à luz do sol. As janelas eram de vidro verde. Até mesmo o céu sobre a cidade era esverdeado, e os raios solares eram verdes. \n\nHavia muitas pessoas, homens, mulheres e crianças, caminhando por lá, e todos vestiam roupas verdes e tinham a pele esverdeada. Eles observaram Dorothy e os estranhos companheiros da garota com olhos curiosos, e todas as crianças fugiram e se esconderam atrás de suas mães quando viram o Leão, mas ninguém falou com eles. Havia muitas lojas na rua, e Dorothy viu que tudo nelas era verde. Doces verdes e pipoca verde estavam à venda, assim como sapatos verdes, chapéus verdes e roupas verdes de todos os tipos. Em um lugar, um homem estava vendendo limonada verde, e quando as crianças a compravam, Dorothy viu que elas pagavam com moedas verdes. \n\nParecia não haver cavalos nem animais de qualquer espécie. Os homens carregavam as coisas em pequenos carrinhos verdes, que eles empurravam à frente. Todos pareciam felizes, satisfeitos e prósperos."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Seleção de formato"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automático"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Quer mudar a resolução para %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selecione \"Ok\" para usar a resolução %1$s de agora em diante."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Não há suporte a Dolby Vision no modo %1$s, e ele vai ser desativado em \"Configurações avançadas de tela\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Este modo oferece suporte a %1$s. Em algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Esse modo está disponível para: %1$s\nEm algumas TVs, talvez você tenha que ativar a opção \"HDMI avançado\" para permitir mais formatos HDR. Verifique as configurações da TV para conferir se esse opção está disponível."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Cancelar"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Limpar os dados em cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Esta ação limpa dados em cache de todos os apps."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Conectado"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Desconectado"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Você não tem permissão para alterar as configurações de Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Usar para o áudio da TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Enviar feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Central de Ajuda"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Este dispositivo é gerenciado pela sua organização."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Saiba mais"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{App de câmera}one{App de câmera}other{Apps de câmera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App Calendário"</string>
@@ -412,7 +412,7 @@
     <string name="terms_title" msgid="192888187310800678">"Termos e Condições"</string>
     <string name="webview_license_title" msgid="5370270485188947540">"Licença do sistema Webview"</string>
     <string name="consumer_information_title" msgid="7729729568416672733">"Informações para os consumidores"</string>
-    <string name="consumer_information_message" msgid="205236637689468764">"O conteúdo que você encontra no Android TV vem de parceiros terceirizados, como desenvolvedores de apps e estúdios de cinema, e do próprio Google. Para ver mais informações, acesse "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
+    <string name="consumer_information_message" msgid="205236637689468764">"O conteúdo que você encontra no Android TV vem de parceiros terceirizados, como desenvolvedores de apps e estúdios de cinema, e do próprio Google. Para acessar mais informações, acesse "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
     <string name="consumer_information_button_ok" msgid="6979480064600038080">"OK"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="4475363344103354364">"Insatisfatória"</item>
@@ -441,7 +441,7 @@
     <string name="wifi_setting_available_networks" msgid="2096957819727319750">"Redes disponíveis"</string>
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"Adicionar nova rede"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"Conexão rápida"</string>
-    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"A conexão rápida encontra e conecta uma rede Wi-Fi via código QR no smartphone."</string>
+    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"A conexão rápida encontra e conecta uma rede Wi-Fi via QR code no smartphone."</string>
     <string name="security_type" msgid="2297615092250075696">"Tipo de segurança"</string>
     <string name="other_network" msgid="5299289104661858596">"Outra rede..."</string>
     <string name="skip_network" msgid="3095529090560000692">"Ignorar"</string>
@@ -469,7 +469,7 @@
     <string name="title_wifi_proxy_settings_invalid" msgid="7698883245005941665">"Configurações de proxy inválidas"</string>
     <string name="title_wifi_ip_settings_invalid" msgid="7283801973512992014">"Configurações de IP inválidas"</string>
     <string name="title_wifi_known_network" msgid="6162483884727898697">"<xliff:g id="SSID">%1$s</xliff:g> é uma rede salva"</string>
-    <string name="title_wifi_scan_qr_code" msgid="7485605625055717874">"Leia o código QR para se conectar"</string>
+    <string name="title_wifi_scan_qr_code" msgid="7485605625055717874">"Leia o QR code para se conectar"</string>
     <string name="wifi_action_try_again" msgid="8920677153891141148">"Tentar novamente"</string>
     <string name="wifi_action_view_available_networks" msgid="609561604257828342">"Ver redes disponíveis"</string>
     <string name="wifi_connecting" msgid="4234341255109283018">"Conectando a <xliff:g id="SSID">%1$s</xliff:g>"</string>
@@ -477,7 +477,7 @@
     <string name="wifi_connect" msgid="2206086690065242121">"Conectar"</string>
     <string name="wifi_forget_network" msgid="4634016112624305571">"Esquecer a rede"</string>
     <string name="wifi_forget_network_description" msgid="4146715475962713899">"Esta ação limpa as informações usadas para se conectar a esta rede, incluindo uma senha salva."</string>
-    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Leia o código QR em um smartphone e siga as instruções para se conectar a uma rede Wi-Fi.\n \n Em um "<b>"smartphone Android"</b>", acesse Configurações -&gt; Rede e Internet -&gt; Wi-Fi -&gt; Selecionar Wi-Fi -&gt; Avançado -&gt; adicione o dispositivo e leia o código QR."</string>
+    <string name="wifi_scan_qr_code_description" msgid="6620444691131671132">" Leia o QR code em um smartphone e siga as instruções para se conectar a uma rede Wi-Fi.\n \n Em um "<b>"smartphone Android"</b>", acesse Configurações -&gt; Rede e Internet -&gt; Wi-Fi -&gt; Selecionar Wi-Fi -&gt; Avançado -&gt; adicione o dispositivo e leia o QR code."</string>
     <string name="wifi_scan_qr_code_back_description" msgid="8830716278283379280">"Pressione o botão \"Voltar\" para cancelar"</string>
     <string name="wifi_action_ok" msgid="6257483288047397880">"OK"</string>
     <string name="wifi_setup_action_dont_change_network" msgid="2999582059217623090">"Continuar"</string>
@@ -591,7 +591,7 @@
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"Não remova o drive durante a transferência.\nO<xliff:g id="APPNAME">%1$s</xliff:g> app do dispositivo fica indisponível até o final da transferência."</string>
     <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"Ignorar o armazenamento do dispositivo?"</string>
     <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"Todos os dados armazenados neste drive serão perdidos para sempre com a opção \"Ignorar\". Gostaria de prosseguir?"</string>
-    <string name="storage_wizard_forget_action" msgid="5609631662522950596">"Ignorar"</string>
+    <string name="storage_wizard_forget_action" msgid="5609631662522950596">"Esquecer"</string>
     <string name="storage_new_title" msgid="4768955281180255038">"Drive USB conectado"</string>
     <string name="storage_new_action_browse" msgid="3355241742574072658">"Procurar"</string>
     <string name="storage_new_action_adopt" msgid="6809707961170895964">"Configurar como armazenamento do dispositivo"</string>
@@ -666,7 +666,7 @@
     <string name="location_reporting" msgid="3552501333650895634">"Relatório de localização"</string>
     <string name="location_history" msgid="4055660203090513120">"Histórico de localização"</string>
     <string name="location_reporting_desc" msgid="1580018652781674608">"O Google usa este recurso em produtos como o Google Now e o Google Maps. A ativação do Relatório de localização permite que qualquer produto do Google que use este recurso armazene e use os dados de localização mais recentes de seu dispositivo em associação a sua Conta do Google."</string>
-    <string name="location_history_desc" msgid="926674012916014270">"Quando o Histórico de localização está ativado nesta conta, o Google pode armazenar os dados de localização do dispositivo para serem usados pelos apps.\n\nPor exemplo, o Google Maps pode apresentar rotas e o Google Now pode informar sobre as condições do trânsito.\n\nVocê pode desativar o Histórico de localização a qualquer momento, mas ao fazê-lo, ele não será excluído. Para ver e gerenciar seu Histórico de localização, acesse maps.google.com/locationhistory."</string>
+    <string name="location_history_desc" msgid="926674012916014270">"Quando o Histórico de localização está ativado nesta conta, o Google pode armazenar os dados de localização do dispositivo para serem usados pelos apps.\n\nPor exemplo, o Google Maps pode apresentar rotas e o Google Now pode informar sobre as condições do trânsito.\n\nVocê pode desativar o Histórico de localização a qualquer momento, mas ao fazê-lo, ele não será excluído. Para acessar e gerenciar seu Histórico de localização, acesse maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"Excluir histórico de localização"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"O histórico será excluído e alguns apps pararão de funcionar. Não é possível desfazer."</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Leitores de tela"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Ativar"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuração"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> pode coletar todo texto que você digita, incluindo dados pessoais como números de cartão de crédito, exceto senhas."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> poderá ler o que estiver na tela, mostrar conteúdo sobre outros apps, rastrear suas interações com sensores de hardware ou apps e interagir com apps por você."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Interromper <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ao selecionar OK, o <xliff:g id="SERVICE">%1$s</xliff:g> será interrompido."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Conversão de texto em voz"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Conexão realizada"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Mostrar tudo"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Pesquisando"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Falha ao recuperar a intent \"Adicionar conta\" do autenticador."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Falha ao adicionar a conta ou o tipo dela não está disponível."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canais e entradas"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canais, entradas externas"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canais"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Ativa:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Esse modo pode aumentar o consumo de energia do dispositivo."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Ativar \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 859aba4e5..5adca0868 100644
--- a/Settings/res/values-ro/energy-modes.xml
+++ b/Settings/res/values-ro/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Funcții esențiale pentru rețea"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Consum de energie redus"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Dezactivează conexiunea la rețea când televizorul nu este folosit."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Actualizări și funcții esențiale"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Funcții de rețea recomandate"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Consum de energie optimizat"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Pornește funcții care activează televizorul prin rețea (standby în rețea)"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Inserează funcția 1]"</item>
     <item msgid="8724721267222341891">"[Inserează funcția 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Funcții suplimentare pentru rețea"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Consum de energie crescut"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Pe lângă funcțiile recomandate, opțiunea activează funcții suplimentare când televizorul nu este folosit, care pot mări consumul de energie"</string>
+    <string 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-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 a78c3b144..a958af369 100644
--- a/Settings/res/values-ro/strings.xml
+++ b/Settings/res/values-ro/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Setările aplicației"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Locație, Utilizare și diagnosticare, Anunțuri"</string>
     <string name="add_account" msgid="7386223854837017129">"Adaugă un cont"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Cont necunoscut"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Elimină contul"</string>
     <string name="account_sync" msgid="4315295293211313989">"Alege aplicații sincronizate"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sincronizează acum"</string>
@@ -100,7 +101,7 @@
     <string name="all_apps_installed" msgid="8217778476185598971">"Aplicații instalate"</string>
     <string name="all_apps_other" msgid="4420174882983813158">"Aplicații de sistem"</string>
     <string name="all_apps_disabled" msgid="2776041242863791053">"Aplicații dezactivate"</string>
-    <string name="device_daydream" msgid="2631191946958113220">"Economizor de ecran"</string>
+    <string name="device_daydream" msgid="2631191946958113220">"Screensaver"</string>
     <string name="device_display" msgid="244634591698925025">"Afișaj"</string>
     <string name="device_display_sound" msgid="7399153506435649193">"Afișare și sunet"</string>
     <string name="device_sound" msgid="8616320533559404963">"Sunet"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Forțezi ieșirea HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"În mod prestabilit, conversia va fi forțată să <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ecranul va folosi rezoluția de 1080p 60 Hz. Opțiunea nu este compatibilă cu ecranul când rulează la rezoluție 4k 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision nu este acceptat la rezoluția actuală. Dacă activezi manual Dolby Vision, rezoluția ecranului se va schimba la 1080p 60 Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Schimbi rezoluția la 1080p 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Forțează întotdeauna conversia la Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Dacă Dolby Vision este dezactivat în Formatele HDR din Setările de afișare avansate, forțarea conversiei la Dolby Vision îl va reactiva."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Forțează întotdeauna conversia la HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exemplu de text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Minunatul Vrăjitor din Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Capitolul 11: Minunatul Oraș de Smarald Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Deși purtau ochelarii verzi, Dorothy și prietenii ei fură la început orbiți de strălucirea minunatei cetăți. De-a lungul străzilor se înșiruiau case frumoase din marmură verde, încrustate pretutindeni cu smaralde scânteietoare. Mergeau pe un caldarâm tot din marmură verde, iar în locurile unde blocurile de marmură erau lipite laolaltă, se aflau, unul lângă altul, șiruri de smaralde care străluceau în razele soarelui. Geamurile erau din sticlă verde. Chiar și cerul de deasupra Cetății avea o nuanță verde, iar razele soarelui erau verzui. \n\nPe străzi se plimba multă lume – bărbați, femei și copii – și cu toții erau îmbrăcați în verde și aveau pielea verzuie. Se uitau uimiți la Dorothy și la neobișnuita ei ceată, iar copiii fugeau în toate părțile când îl vedeau pe Leu și se ascundeau în spatele mamelor lor. Însă nimeni nu vorbea cu ei. Pe străzi erau multe dughene, iar Dorothy observă că în ele totul era verde. Se vindeau bomboane verzi și floricele de porumb verde, pantofi verzi, pălării verzi și haine verzi de tot soiul. Într-un loc, cineva vindea limonadă verde, iar niște copii tocmai cumpărau și Dorothy văzu că plăteau cu bănuți verzi. \n\nNu păreau să existe nici cai, nici alte animale. În schimb, oamenii își cărau lucrurile în niște cărucioare verzi, pe care tot ei le împingeau. Cu toții păreau să emane o stare de fericire, de mulțumire și bunăstare."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Deși purtau ochelarii verzi, Dorothy și prietenii ei fură la început orbiți de strălucirea minunatei cetăți. De-a lungul străzilor se înșiruiau case frumoase din marmură verde, încrustate pretutindeni cu smaralde scânteietoare. Mergeau pe un caldarâm tot din marmură verde, iar în locurile unde blocurile de marmură erau lipite laolaltă, se aflau, unul lângă altul, șiruri de smaralde care străluceau în razele soarelui. Geamurile erau din sticlă verde. Chiar și cerul de deasupra Cetății avea o nuanță verde, iar razele soarelui erau verzui. \n\nPe străzi se plimba multă lume – bărbați, femei și copii – și cu toții erau îmbrăcați în verde și aveau pielea verzuie. Se uitau uimiți la Dorothy și la neobișnuita ei ceată, iar copiii fugeau în toate părțile când îl vedeau pe Leu și se ascundeau în spatele mamelor lor. Însă nimeni nu vorbea cu ei. Pe străzi erau multe dughene, iar Dorothy observă că în ele totul era verde. Se vindeau bomboane verzi și floricele de porumb verde, pantofi verzi, pălării verzi și haine verzi de tot soiul. Într-un loc, cineva vindea limonadă verde, iar niște copii tocmai cumpărau și Dorothy văzu că plăteau cu bănuți verzi. \n\nNu păreau să existe nici cai, nici alte animale. În schimb, oamenii își cărau lucrurile în niște cărucioare verzi, pe care tot ei le împingeau. Cu toții păreau să emane o stare de fericire, de mulțumire și bunăstare."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Selectarea formatului"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automată"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuală"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Schimbi rezoluția la %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Selectează OK pentru a folosi %1$s de acum înainte"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nu este acceptat la %1$s și va fi dezactivat în Setări de afișare avansate"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Acest mod acceptă %1$s. Pe unele televizoare poate fi nevoie să activezi HDMI îmbunătățit ca să accepte mai multe formate HDR. Verifică setările televizorului ca să vezi dacă opțiunea este acceptată."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Acest mod acceptă: %1$s\nPe unele televizoare poate fi nevoie să activezi HDMI îmbunătățit ca să accepte mai multe formate HDR. Verifică setările televizorului ca să vezi dacă opțiunea este acceptată."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Anulează"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ștergi datele memorate în cache?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Datele din cache ale aplicațiilor vor fi șterse."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Conectat"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Deconectat"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nu ai permisiunea de a modifica setările Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Folosește pentru conținut audio de la TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Trimite feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centrul de ajutor"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Acest dispozitiv este gestionat de organizația ta."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Acest dispozitiv este gestionat de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" U+2060"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Află mai multe"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplicația Cameră foto}few{Aplicațiile Cameră foto}other{Aplicațiile Cameră foto}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplicația Calendar"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Activează"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configurare"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Utilizezi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> poate culege tot textul pe care îl introduci, cu excepția parolelor. Aceasta include date personale, cum ar fi numerele cardurilor de credit."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> va putea să citească ce este pe ecran, să afișeze conținut peste alte aplicații, să urmărească interacțiunile tale cu aplicațiile sau senzorii hardware și să interacționeze cu aplicațiile în numele tău."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Oprești <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Selectând OK vei opri <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Transformarea textului în vorbire"</string>
@@ -950,7 +948,7 @@
     <string name="settings_on" msgid="7734010120323404333">"Activat"</string>
     <string name="settings_off" msgid="4060451657850476369">"Dezactivat"</string>
     <string name="device_daydreams_none" msgid="3405655350757277348">"Dezactivează ecranul"</string>
-    <string name="device_daydreams_select" msgid="7203264446482623438">"Economizor de ecran"</string>
+    <string name="device_daydreams_select" msgid="7203264446482623438">"Screensaver"</string>
     <string name="device_daydreams_test" msgid="7828275397550076567">"Începe acum"</string>
     <string name="device_daydreams_sleep" msgid="6847770718407377357">"Când pornește"</string>
     <string name="device_daydreams_sleep_description" msgid="6237610484915504587">"Economizorul de ecran începe după această perioadă de inactivitate. Dacă nu este selectat niciun economizor de ecran, ecranul se va dezactiva."</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Conectare reușită"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Afișează-le pe toate"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Se caută"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nu s-a putut prelua intenția de adăugare a contului de la instrumentul de autentificare."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Nu s-a putut adăuga contul sau tipul de cont nu este disponibil."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Canale și intrări"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Canale, intrări externe"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Canale"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Activează:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Reține că acest mod poate mări consumul de energie al dispozitivului."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Activează <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 656cc5578..87f465f2c 100644
--- a/Settings/res/values-ru/energy-modes.xml
+++ b/Settings/res/values-ru/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основные сетевые функции"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Низкое энергопотребление"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Когда телевизор не используется, режим приостанавливает сетевое подключение."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Важные обновления и функции"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Рекомендуемые сетевые функции"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизированное энергопотребление"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Режим включит функции, которые по сети выводят телевизор из режима ожидания."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Дополнительные сетевые функции"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Повышенное энергопотребление"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Когда телевизор не используется, режим включает не только рекомендуемые, но и дополнительные функции, которые могут увеличить потребление электроэнергии."</string>
+    <string 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-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 35c45e32d..2793deaeb 100644
--- a/Settings/res/values-ru/strings.xml
+++ b/Settings/res/values-ru/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Настройки приложений"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Местоположение, использование и диагностика, реклама"</string>
     <string name="add_account" msgid="7386223854837017129">"Добавить аккаунт"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Неизвестный аккаунт"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Удалить аккаунт"</string>
     <string name="account_sync" msgid="4315295293211313989">"Выбрать приложения"</string>
     <string name="sync_now" msgid="4335217984374620551">"Синхронизировать"</string>
@@ -151,25 +152,23 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Расширенные настройки звука"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Разрешить игровой режим"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Приводить в соответствие с динамическим диапазоном контента"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Если включить этот параметр, устройство будет переключаться на формат динамического диапазона, который используется в контенте. Во время смены формата экран может погаснуть.\n\nДополнительные параметры динамического диапазона находятся в разделе \"Расширенные настройки экрана\"."</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Использовать динамический диапазон контента"</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Если включить этот параметр, устройство будет переключаться на формат динамического диапазона, который используется в контенте. Во время смены формата экран может погаснуть.\n\nЧтобы настроить дополнительные параметры динамического диапазона, выберите \"Расширенные настройки экрана\"."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Предпочтительный динамический диапазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Автоматическая настройка формата"</string>
+    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Преобразовывать по выбору системы"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Формат автоматически выбирается системой"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Если включить этот параметр, то при необходимости система будет определять динамический диапазон, подходящий для вашего экрана, и выводить контент в этом диапазоне."</string>
-    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Выбор формата по параметрам контента"</string>
-    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Принудительное изменение формата"</string>
-    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Принудительно устанавливается предпочтительный формат"</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Если выбрать этот вариант, система будет определять динамический диапазон, подходящий для вашего экрана, и при необходимости преобразовывать в него контент."</string>
+    <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Контент показывается в исходном формате"</string>
+    <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Преобразовывать принудительно"</string>
+    <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"Контент всегда преобразуется в предпочитаемый формат"</string>
     <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"Принудительно устанавливается предпочтительный формат. Это может повлиять на другие настройки в режиме отображения или при использовании формата HDR."</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"Всегда в формате SDR"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"Всегда в формате <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Выводить контент принудительно в формате HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Формат контента будет принудительно меняться на <xliff:g id="HDR_TYPE">%s</xliff:g> по умолчанию."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Разрешение вашего экрана составит 1080 пкс, а частота обновления – 60 Гц. Эта функция не поддерживается на устройствах с разрешением 4K и частотой обновления 60 ГЦ."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision не поддерживается для текущего разрешения. Если включить Dolby Vision вручную, разрешение экрана изменится на 1080p (60 Гц)."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Изменить разрешение на 1080p (60 Гц)?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Принудительно конвертировать в формат Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Если формат Dolby Vision был выключен в расширенных настройках экрана, принудительная конвертация повторно активирует его"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Принудительно конвертировать в формат HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Пример текста"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Удивительный волшебник из страны Оз"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Глава 11. Изумрудный Город Страны Оз"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Даже надев зеленые очки, Дороти и ее друзья были ошеломлены сверканием этого удивительного города. По улицам стояли прекрасные дома из зеленого мрамора, украшенные блестящими изумрудами. Путники шли по тротуару из того же зеленого мрамора, а щели между плитами были заполнены изумрудами, сиявшими под лучами солнца. Окна домов были из зеленого стекла. Даже небо над Изумрудным Городом было зеленое, и зеленое солнце посылало жаркие зеленые лучи.\n\nВокруг сновали мужчины, женщины, дети, и все они носили зеленую одежду, и кожа у них была зеленоватого оттенка. Они с удивлением смотрели на Дороти и ее странных спутников. Завидев большого Льва, дети прятались за спины родителей, и никто не осмеливался задавать вопросы чужестранцам. В магазинах продавались товары зеленого цвета – зеленые конфеты и зеленая жареная кукуруза, зеленые башмаки и шляпы, зеленые платья и сюртуки всех фасонов и размеров. На одном из лотков продавец торговал зеленым лимонадом, и обступившие его дети расплачивались зелеными монетками.\n\nНа улицах Изумрудного Города не было ни лошадей, ни других животных. Мужчины возили поклажу в маленьких тачках на колесиках. У жителей Изумрудного Города был веселый и довольный вид."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Даже надев зеленые очки, Дороти и ее друзья были сначала ошеломлены сверканием этого удивительного города. По улицам рядами стояли красивые дома из зеленого мрамора, усыпанные блестящими изумрудами. Путники шли по тротуару из того же зеленого мрамора – щели между плитами также заполняли изумруды, сиявшие под лучами солнца. В домах стояли окна из зеленого стекла. И даже небо над Изумрудным городом было зеленое, а на нем зеленое солнце посылало жаркие зеленые лучи.\n\nВокруг сновали мужчины, женщины, дети, и все они носили зеленую одежду, и кожа у них была зеленоватого оттенка. Они с удивлением смотрели на Дороти и ее странных спутников. Увидев большого Льва, дети прятались за спины матерей, и никто не осмеливался задавать вопросы путникам. Вокруг стояло много магазинов. В них продавались товары только зеленого цвета – зеленые конфеты и зеленый попкорн, зеленые башмаки и шляпы, зеленые платья и сюртуки всех фасонов и размеров. В одном из лотков продавец торговал зеленым лимонадом, и подходившие к нему дети расплачивались зелеными монетками.\n\nНа улицах Изумрудного города не было ни лошадей, ни других животных, и мужчины возили свои вещи в маленьких зеленых тачках, толкая их перед собой. Жители выглядели веселыми и довольными."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Выбор формата"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автоматически"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Вручную"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Изменить разрешение на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Нажмите ОК, чтобы использовать разрешение %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Формат Dolby Vision не поддерживается в режиме %1$s и будет отключен в расширенных настройках экрана."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Этот режим поддерживает %1$s. На некоторых телевизорах нужно включить расширенный формат HDMI, чтобы поддерживалось больше форматов HDR. Проверьте наличие этой функции в настройках телевизора."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Этот режим поддерживает: %1$s\nЧтобы поддерживалось больше форматов HDR, на некоторых телевизорах нужно включить расширенный формат HDMI. Проверьте наличие этой функции в настройках телевизора."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Отмена"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ОК"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Очистить кеш?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Будут удалены данные всех приложений."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Подключено"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Отключено"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"У вас нет разрешения на смену настроек Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Выводить звук с телевизора"</string>
     <string name="send_feedback" msgid="936698637869795473">"Отправить отзыв"</string>
     <string name="launch_help" msgid="2607478763131952469">"Справка"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Этим устройством управляет ваша организация."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Этим устройством управляет <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Подробнее"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Приложение камеры}one{Приложения камеры}few{Приложения камеры}many{Приложения камеры}other{Приложения камеры}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Календарь"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Включить"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурация"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Служба <xliff:g id="SERVICE">%1$s</xliff:g> может сохранять любой вводимый текст, кроме паролей. В частности, сохраняются личные данные, например номера кредитных карт."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -998,7 +996,7 @@
     <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>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Используйте это название, чтобы транслировать фотографии, видео и другой контент с телефона."</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"Это название будет использоваться при трансляции фотографий, видео и другого контента с телефона"</string>
     <string name="change_setting" msgid="7211706374208138343">"Изменить"</string>
     <string name="keep_settings" msgid="703474489210093961">"Не изменять"</string>
     <string name="apps_permissions" msgid="7876407267050498394">"Разрешения"</string>
@@ -1049,7 +1047,7 @@
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"Вы можете разрешить приложениям устанавливать будильники и планировать запуск действий в определенное время. В этом случае они будут работать в фоновом режиме и быстрее расходовать заряд батареи.\n\nЕсли отключить это разрешение, текущие будильники и созданные приложениями события перестанут запускаться."</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"Включение экрана"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"Разрешить приложению включать экран"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Приложение сможет в любое время включать экран без явного согласия с вашей стороны"</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"Приложение сможет в любое время включать экран без явного намерения с вашей стороны"</string>
     <string name="special_access" msgid="21806055758289916">"Специальный доступ"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>, <xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"Аудио"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Подключение установлено."</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Показать все"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Поиск…"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Не удалось получить намерение о добавлении аккаунта от программы для аутентификации."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Не удалось добавить аккаунт или тип аккаунта недоступен."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Каналы и входы"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Каналы, внешние входы"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Каналы"</string>
@@ -1123,8 +1123,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_mode_enables" msgid="357960364751477627">"Функции, которые будут включены:"</string>
+    <string name="energy_modes_summary" msgid="7196407759836930799">"Выберите режим энергоэффективности телевизора в те моменты, когда он не используется."</string>
+    <string name="energy_mode_enables" msgid="357960364751477627">"Будут включены:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Обратите внимание, что этот режим может увеличить энергопотребление устройства."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Включить режим \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"?"</string>
+    <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_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 43977cb91..c68a918e3 100644
--- a/Settings/res/values-si/energy-modes.xml
+++ b/Settings/res/values-si/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"අත්‍යවශ්‍යාංග ජාල විශේෂාංග"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"අඩු බලශක්ති භාවිතය"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"රූපවාහිනිය භාවිතයේ නොමැති විට ජාල සබැඳුම ක්‍රියා විරහිත කරන්න."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"තීරණාත්මක යාවත්කාලීන සහ කාර්යයන්"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"නිර්දේශිත ජාල විශේෂාංග"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ප්‍රශස්ත බලශක්ති භාවිතය"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"ජාලය හරහා රූපවාහිනිය අවදි කරන විශේෂාංග ක්‍රියාත්මක කරයි (ජාලගත පොරොත්තුවෙන්)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[විශේෂාංගය 1 ඇතුළත් කරන්න]"</item>
     <item msgid="8724721267222341891">"[විශේෂාංගය 2 ඇතුළත් කරන්න]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"අතිරේක ජාල විශේෂාංග"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"වැඩි වූ බලශක්ති පරිභෝජනය"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"නිර්දේශිත විශේෂාංගවලට අමතරව, මෙම විකල්පය රූපවාහිනිය භාවිතයේ නොමැති විට බලශක්ති භාවිතය වැඩි කළ හැකි අතිරේක විශේෂාංග ක්‍රියාත්මක කරයි."</string>
+    <string 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-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 fcb99fa39..8c9a2d9f5 100644
--- a/Settings/res/values-si/strings.xml
+++ b/Settings/res/values-si/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"යෙදුම් සැකසීම්"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ස්ථානය, භාවිතය හා දෝෂ විනිශ්චය, දැන්වීම්"</string>
     <string name="add_account" msgid="7386223854837017129">"ගිණුම එක් කරන්න"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"නොදන්නා ගිණුම"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ගිණුම ඉවත් කරන්න"</string>
     <string name="account_sync" msgid="4315295293211313989">"සමමුහුර්ත කළ යෙදුම් තෝරන්න"</string>
     <string name="sync_now" msgid="4335217984374620551">"දැන් සමමුහුර්ත කරන්න"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"ඔබට HDR ප්‍රතිදානය බල කිරීමට අවශ්‍ය ද?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"පෙරනිමියෙන් පරිවර්තනය <xliff:g id="HDR_TYPE">%s</xliff:g> වෙතට බල කෙරෙනු ඇත."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"ඔබේ සංදර්ශකය 1080p 60Hz විභේදනයකින් ධාවනය වනු ඇත. 4k 60Hz විභේදනයෙන් ධාවනය වන විට මෙම විකල්පය ඔබේ සංදර්ශකය සමග නොගැළපෙයි."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision වත්මන් විභේදනයේ දී සහාය නොදක්වයි. ඔබ Dolby Vision හස්තීයව සබල කරන්නේ නම්, ඔබේ සංදර්ශකයෙහි විභේදනය 1080p 60Hz ලෙස වෙනස් වනු ඇත."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"විභේදනය 1080p 60Hz වෙත වෙනස් කරන්න ද?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"සෑම විටම Dolby Vision වෙත පරිවර්තනයට බල කරන්න"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"උසස් සංදර්ශක සැකසීම් තුළ HDR ආකෘතිවලින් Dolby Vision අබල කර ඇත්නම්, Dolby Vision වෙත බලෙන් පරිවර්තනය කිරීම එය යළි සබල කරනු ඇත."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"සෑම විටම HDR10 වෙත පරිවර්තනයට බල කරන්න"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ආදර්ශ පෙළ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11වන පරිච්ඡේදය: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"ඩොරති සහ ඇගේ මිතුරන්ගේ දෙනෙත් හරිත වර්ණ කණ්ණාඩිවලින් ආරක්ෂා කර තිබියදී පවා නගරයේ චමත්කාරයෙන් මුල් වරට නිලංකාර විය. හරිත වර්ණ කිරිගරුඬවලින් සාදා සැම තැනම දිදුලන මරකත මැණික් එබ්බවූ අලංකාර නිවාස වීථියේ එක පෙළට විය. ඔවුන් එම කිරිගරුඬවලින්ම සාදන ලද පදික වේදිකාවේ ඇවිද ගිය අතර එහි එක් එක් කොටස සමීපව සකසන ලද මරකත මැණික් පේළිවලින් එක් කොට තිබූ අතර, ඒවා සූර්යයාගේ දීප්තියෙන් දිදුලමින් තිබිණි. කවුළු පියන්පත් හරිත වර්ණයෙන් යුතු විය; නගරයෙහි ඉහළ අහස පවා හරිත වර්ණයෙන් අඳුරුව තිබූ අතර, සූර්යයාගේ කිරණ හරිත වර්ණයෙන් යුතු විය. \n\nපිරිමින්, ගැහැණුන් සහ ළමයින් බොහෝ දෙනෙකු, ඇවිදිමින් සිටි අතර, ඔවුන් සියලු දෙනා හරිත වර්ණ ඇඳුම් ඇඳි හරිත වර්ණ සමක් ඇති අය වූහ. ඔවුන් ඩොරති සහ ඇයගේ අමුතු ආකාරයක් ඇති සගයන් දෙස විස්මිත දෙනෙතින් බැලූ අතර, ළමයින් සියලු දෙනා සිංහයා දුටු විට ඉවතට දුවගොස් ඔවුන්ගේ මව්වරුන්ට මුවා වූහ; නමුත් කිසිවෙක් ඔවුන් සමග කථා නොකළේය. වීථියේ බොහෝ කඩසාප්පු තිබූ අතර, ඒවායෙහි ඇති සියලු දේ හරිත වර්ණයෙන් යුතු බව ඩොරති දුටුවාය. හරිත වර්ණ සපත්තු, හරිත වර්ණ තොප්පි සහ සියලු ආකාරයේ හරිත වර්ණ ඇඳුම් මෙන්ම, හරිත වර්ණ රසකැවිලි සහ හරිත වර්ණ පොරි විකිණීමට තබා තිබිණි. එක් ස්ථානයක මිනිසෙක් හරිත වර්ණ ලෙමනේඩ් විකුණමින් සිටි අතර , ඒවා මිලට ගත් ළමයින් ඒවාට හරිත වර්ණ පැන්සවලින් ගෙවනු ඩොරතිට දැකිය හැකි විය. \n\nඅශ්වයන් හෝ කිසිදු වර්ගයක සතුන් සිටි බවක් නොපෙනිණි; මිනිසුන් තල්ලු කරගෙන යන කරත්ත තුළ දමා බඩු ගෙන ගියේය. සියලු දෙනා ප්‍රීතිමත්ව, තෘප්තිමත්ව සහ සමෘද්ධිමත්ව සිටින බවක් දක්නට ලැබිණි."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"ඩොරති සහ ඇගේ මිතුරන්ගේ දෙනෙත් හරිත වර්ණ කණ්ණාඩිවලින් ආරක්ෂා කර තිබිය දී පවා නගරයේ චමත්කාරයෙන් මුල් වරට නිලංකාර විය. හරිත වර්ණ කිරිගරුඬවලින් සාදා සැම තැනම දිදුලන මරකත මැණික් එබ්බවූ අලංකාර නිවාස වීථියේ එක පෙළට විය. ඔවුන් එම කිරිගරුඬවලින්ම සාදන ලද පදික වේදිකාවේ ඇවිද ගිය අතර එහි එක් එක් කොටස සමීපව සකසන ලද මරකත මැණික් පේළිවලින් එක් කොට තිබූ අතර, ඒවා සූර්යයාගේ දීප්තියෙන් දිදුලමින් තිබිණි. කවුළු පියන්පත් හරිත වර්ණයෙන් යුතු විය; නගරයෙහි ඉහළ අහස පවා හරිත වර්ණයෙන් අඳුරුව තිබූ අතර, සූර්යයාගේ කිරණ හරිත වර්ණයෙන් යුතු විය. \n\nපිරිමින්, ගැහැණුන් සහ ළමයින් බොහෝ දෙනෙකු, ඇවිදිමින් සිටි අතර, ඔවුන් සියලු දෙනා හරිත වර්ණ ඇඳුම් ඇඳි හරිත වර්ණ සමක් ඇති අය වූහ. ඔවුන් ඩොරති සහ ඇයගේ අමුතු ආකාරයක් ඇති සගයන් දෙස විස්මිත දෙනෙතින් බැලූ අතර, ළමයින් සියලු දෙනා සිංහයා දුටු විට ඉවතට දුවගොස් ඔවුන්ගේ මව්වරුන්ට මුවා වූහ; නමුත් කිසිවෙක් ඔවුන් සමග කථා නොකළේ ය. වීථියේ බොහෝ කඩසාප්පු තිබූ අතර, ඒවායෙහි ඇති සියලු දේ හරිත වර්ණයෙන් යුතු බව ඩොරති දුටුවා ය. හරිත වර්ණ සපත්තු, හරිත වර්ණ තොප්පි සහ සියලු ආකාරයේ හරිත වර්ණ ඇඳුම් මෙන්ම, හරිත වර්ණ රසකැවිලි සහ හරිත වර්ණ පොරි විකිණීමට තබා තිබිණි. එක් ස්ථානයක මිනිසෙක් හරිත වර්ණ ලෙමනේඩ් විකුණමින් සිටි අතර , ඒවා මිලට ගත් ළමයින් ඒවාට හරිත වර්ණ පැන්සවලින් ගෙවනු ඩොරතිට දැකිය හැකි විය. \n\nඅශ්වයන් හෝ කිසිදු වර්ගයක සතුන් සිටි බවක් නොපෙනිණි; මිනිසුන් තල්ලු කරගෙන යන කරත්ත තුළ දමා බඩු ගෙන ගියේ ය. සියලු දෙනා ප්‍රීතිමත්ව, තෘප්තිමත්ව සහ සමෘද්ධිමත්ව සිටින බවක් දක්නට ලැබිණි."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ආකෘතිය තේරීම"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ස්වයංක්‍රිය"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"හස්තීය"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"විභේදනය %1$s ලෙස මාරු කරන්නද?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"දැන් සිට %1$s භාවිත කිරීමට හරි තෝරන්න."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s තුළ Dolby Vision හට සහය නොදැක්වේ, එය \"උසස් සංදර්ශන සැකසීම්\" තුළ අබල කරනු ලැබේ"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"මෙම ප්‍රකාරය %1$s හට සහය දක්වයි. සමහර රූපවාහිනිවල, තවත් HDR ආකෘති සබල කිරීමට ඔබට වැඩිදියුණු කළ HDMI සක්‍රීය කිරීමට අවශ්‍ය වේවි. මෙයට සහය දැක්වෙන්නේද යන්න බැලීමට ඔබේ රූපවාහිනී සැකසීම් පරීක්‍ෂා කරන්න."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"මෙම ප්‍රකාරය සහාය දක්වයි: %1$s\nසමහර රූපවාහිනීවල, තවත් HDR ආකෘති සබල කිරීමට ඔබට ඉහළ නැංවූ HDMI ක්‍රියාත්මක කිරීමට අවශ්‍ය වේවි. මෙයට සහාය දැක්වෙන්නේ ද යන්න බැලීමට ඔබේ රූපවාහිනී සැකසීම් පරීක්ෂා කරන්න."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"අවලංගු කරන්න"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"හරි"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"හැඹිලිගත කළ දත්ත හිස් කරන්න ද?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"මෙය සියලුම යෙදුම් සඳහා හැඹිලිගත කළ දත්ත හිස් කරනු ඇත."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"සම්බන්ධිතයි"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"විසන්ධි විය"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"බ්ලූටූත් සැකසීම් වෙනස් කිරීමට ඔබට අවසර නැත."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"රූපවාහිනී ශ්‍රව්‍ය සඳහා භාවිතා කරන්න"</string>
     <string name="send_feedback" msgid="936698637869795473">"ප්‍රතිපෝෂණය යවන්න"</string>
     <string name="launch_help" msgid="2607478763131952469">"උදවු මධ්‍යස්ථානය"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"මෙම උපාංගය ඔබගේ සංවිධානය විසින් කළමනාකරණය කරනු ලැබේ."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"තව දැන ගන්න"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{කැමරා යෙදුම}one{කැමරා යෙදුම්}other{කැමරා යෙදුම්}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"දින දර්ශන යෙදුම"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"සබල කරන්න"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"වින්‍යාසය"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> භාවිත කරන්න ද?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"මුරපද හැර, සියලුම වර්ග වල පෙළ <xliff:g id="SERVICE">%1$s</xliff:g> ට එකතු කළ හැක. ණයවර පත් අංක වැනි පුද්ගලික දත්ත මෙහි අඩංගු විය හැක."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"සම්බන්ධතාව සාර්ථකයි"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"සියල්ල පෙන්වන්න"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"සොයමින්"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"සත්‍යාපකය වෙතින් ගිණුම් එක් කිරීමේ අභිප්‍රාය ලබා ගැනීමට අසමත් විය."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ගිණුම එක් කිරීමට අසමත් විය හෝ ගිණුම් වර්ගය නොමැත."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"නාලිකා සහ ආදාන"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"නාලිකා, බාහිර ආදාන"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"නාලිකා"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"සබල කරයි:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"මෙම ප්‍රකාරය උපාංගයෙහි බලශක්ති පරිභෝජනය වැඩි කළ හැකි බව සලකන්න."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" සබල කරන්න"</string>
+    <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_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 9dfc67c4e..048324ebe 100644
--- a/Settings/res/values-sk/energy-modes.xml
+++ b/Settings/res/values-sk/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Základné funkcie siete"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Nízka spotreba energie"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Vypnite pripojenie k sieti, keď sa televízor nepoužíva."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Dôležité aktualizácie a funkcie"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Odporúčané funkcie siete"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimalizovaná spotreba energie"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Cez sieť zapne funkcie, ktoré televízor prebudia (pohotovostný režim siete)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ďalšie funkcie siete"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Zvýšená spotreba energie"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Okrem odporúčaných funkcií zapne toto nastavenie aj ďalšie funkcie, keď sa televízor nebude používať, čím sa môže zvýšiť spotreba energie."</string>
+    <string 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-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 d7c19bbf0..a32419e48 100644
--- a/Settings/res/values-sk/strings.xml
+++ b/Settings/res/values-sk/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Nastavenia aplikácie"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Poloha, využitie a diagnostika, reklamy"</string>
     <string name="add_account" msgid="7386223854837017129">"Pridať účet"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Neznámy účet"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Odstrániť účet"</string>
     <string name="account_sync" msgid="4315295293211313989">"Vyberte synch. aplikácie"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synchronizovať"</string>
@@ -147,15 +148,15 @@
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"Ak chcete aktivovať, zmeňte výber formátu za manuálny."</string>
     <string name="surround_sound_enabled_format_info_clicked" msgid="4003154853054756792">"Ak chcete deaktivovať, zmeňte výber formátu za manuálny."</string>
     <string name="display_category_title" msgid="247804007525046312">"Zobrazenie"</string>
-    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Rozšírenie nastavenia zobrazenia"</string>
+    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Rozšírené nastavenia zobrazenia"</string>
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Rozšírené nastavenia zvuku"</string>
-    <string name="game_mode_title" msgid="7280816243531315755">"Povolenie herného režimu"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Dynamický rozsah relevantného obsahu"</string>
+    <string name="game_mode_title" msgid="7280816243531315755">"Povoliť herný režim"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Zladiť dynamický rozsah obsahu"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Keď je táto možnosť zapnutá, systém prepína medzi rôznymi formátmi dynamického rozsahu, aby zodpovedal obsahu. Počas prepínania formátu sa môže obrazovka stmaviť.\n\nAk si chcete zobraziť ďalšie možnosti dynamického rozsahu, kliknite na rozšírené nastavenia zobrazenia."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Preferovaný dynamický rozsah"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Konverzia určovaná systémom"</string>
-    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Povoľte systému spravovať konverziu formátu"</string>
+    <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Nechá konverziu formátu na systém"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Keď je vybraná táto možnosť, systém bude určovať vhodný dynamický rozsah obrazovky a podľa potreby doň konvertovať obsah."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Vždy bude zodpovedať formátu obsahu"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"Vynucovať konverziu"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Ukážka textu"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Čarodejník z krajiny Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. kapitola: Nádherné smaragdové mesto"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Lesk tohto nádherného mesta Dorotku a jej priateľov najskôr oslepoval, hoci mali na očiach zelené okuliare. Ulice lemovali nádherné domy zo zeleného mramoru, husto osadené trblietajúcimi sa smaragdmi. Kráčali po chodníku z takého istého zeleného mramoru. Na miestach, kde sa spájali dlaždice, sa ligotali v odraze slnka husté rady smaragdov. Obločné tabule boli zo zeleného skla. Dokonca aj obloha nad mestom bola zafarbená dozelena a slnečné lúče boli tiež zelené. \n\nV uliciach bolo veľa ľudí. Muži, ženy i deti si vykračovali oblečení v zelených šatách a všetci mali zelenkavú pokožku. Zvedavo si obzerali Dorotku a jej prazvláštnu spoločnosť. Keď deti zbadali leva, rýchlo utiekli a skryli sa za matkin chrbát. Nik sa však Dorotke a jej spoločníkom neprihovoril. Na ulici bolo mnoho rozličných obchodov. Dorotkinmu zraku neušlo, že všetok tovar bol zelený. Zelené cukríky, zelené pukance, zelené topánky, zelené klobúky a všelijaké zelené šaty – to všetko tu bolo na predaj. Jeden obchodník predával zelenú limonádu. Keď si ju deti kupovali, Dorotka zbadala, že platia zelenými mincami. \n\nZdalo sa, že sa v meste nenachádzajú žiadne kone ani iné zvieratá. Muži tlačili pred sebou malé zelené vozíky, v ktorých prevážali veci, kam bolo treba. Všetci vyzerali šťastní, spokojní a prekvitajúci."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Lesk tohto nádherného mesta Dorotku a jej priateľov najskôr oslepoval, hoci mali na očiach zelené okuliare. Ulice lemovali nádherné domy zo zeleného mramoru, husto posiate trblietajúcimi sa smaragdmi. Kráčali po chodníku z takého istého zeleného mramoru a na miestach, kde sa spájali dlaždice, sa ligotali v odraze slnka husté rady smaragdov. Tabule oblokov boli zo zeleného skla. Dokonca aj obloha nad mestom bola zafarbená dozelena a slnečné lúče boli tiež zelené. \n\nNa uliciach bolo veľa ľudí. Muži, ženy i deti si vykračovali oblečení v zelených šatách a všetci mali nazelenalú pleť. Zvedavo si obzerali Dorotku a jej prazvláštnu spoločnosť. Keď deti zbadali leva, rýchlo utiekli a skryli sa za chrbty matiek. Nik sa však Dorotke ani jej spoločníkom neprihovoril. Na ulici bolo mnoho rôznych obchodov a Dorotke neušlo, že všetok tovar bol zelený. Na predaj boli zelené cukríky, zelené pukance, zelené topánky, zelené klobúky a všelijaké zelené šaty. Jeden obchodník predával zelenú limonádu a keď si ju deti kupovali, Dorotka si všimla, že platia zelenými mincami. \n\nZdalo sa, že v meste nie sú žiadne kone ani iné zvieratá. Muži tlačili pred sebou malé zelené vozíky, v ktorých prevážali rôzne veci. Všetci vyzerali šťastní, spokojní a prosperujúci."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Výber formátu"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automaticky"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuálne"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Chcete zmeniť rozlíšenie na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Ak chcete odteraz používať rozlíšenie %1$s, vyberte OK."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Technológia Dolby Vision nie je podporovaná pri rozlíšení %1$s a bude deaktivovaná v rozšírených nastaveniach zobrazenia"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Tento režim podporuje %1$s. Ak chcete povoliť ďalšie formáty HDR, v niektorých televízoroch zrejme budete musieť zapnúť Rozšírené HDMI. Skontrolujte v nastaveniach televízora, či je to podporované."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Tento režim podporuje: %1$s\nAk budete chcieť v niektorých televízoroch povoliť ďalšie formáty HDR, zrejme budete musieť zapnúť rozšírené HDMI. V nastaveniach televízora skontrolujte, či je to podporované."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Zrušiť"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vymazať údaje vo vyrovnávacej pamäti?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Vymažú sa údaje v pamäti pre všetky aplikácie"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Pripojené"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Odpojené"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nemáte povolenie na zmenu nastavení Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Používa sa pre zvuk televízora"</string>
     <string name="send_feedback" msgid="936698637869795473">"Spätná väzba"</string>
     <string name="launch_help" msgid="2607478763131952469">"Centrum pomoci"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Toto zariadenie spravuje vaša organizácia."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Toto zariadenie spravuje organizácia <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">"  "</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Ďalšie informácie"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikácia kamery}few{Aplikácie kamery}many{Aplikácie kamery}other{Aplikácie kamery}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikácia Kalendár"</string>
@@ -653,7 +653,7 @@
     <string name="system_network_location_confirm" msgid="7128162421781085332">"Súhlas so zhromažďovaním údajov o polohe"</string>
     <string name="location_mode_title" msgid="728244518174115443">"Režim"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"Nedávne žiadosti o polohu"</string>
-    <string name="location_no_recent_apps" msgid="7033474075806435793">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
+    <string name="location_no_recent_apps" msgid="7033474075806435793">"V poslednom čase nepožiadali o polohu žiadne aplikácie"</string>
     <string name="location_high_battery_use" msgid="5325556609027887602">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Nízka spotreba batérie"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Odhadovať polohu pomocou Wi‑Fi"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Zapnúť"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurácia"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Používať službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> zaznamenáva všetok text, ktorý napíšete, okrem hesiel. To zahŕňa osobné údaje, ako sú čísla kreditných kariet."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> bude môcť čítať vašu obrazovku, zobrazovať obsah cez iné aplikácie, sledovať vaše interakcie s aplikáciami alebo hardvérovými senzormi a interagovať s aplikáciami vo vašom mene."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Zastaviť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Výberom možnosti OK zastavíte službu <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Prevod textu na reč"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Pripojenie je úspešné"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Zobraziť všetko"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Hľadá sa"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Nepodarilo sa načítať intenciu pridania účtu z overovateľa."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Účet sa nepodarilo pridať alebo typ účtu nie je k dispozícii."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanály a vstupy"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanály, externé vstupy"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanály"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Povolí:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Upozorňujeme, že tento režim môže zvýšiť spotrebu energie zariadením."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Povolenie režimu <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 96d4efca3..b11b231ca 100644
--- a/Settings/res/values-sl/energy-modes.xml
+++ b/Settings/res/values-sl/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Temeljne omrežne funkcije"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Nizka poraba energije"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Izklopite omrežno povezavo, ko televizor ni v uporabi."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Nujne posodobitve in funkcije"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Priporočene omrežne funkcije"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimizirana poraba energije"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Vklopi funkcije, ki preklopijo televizor iz stanja pripravljenosti prek omrežja (omrežno stanje pripravljenosti)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Vstavi funkcijo 1]"</item>
     <item msgid="8724721267222341891">"[Vstavi funkcijo 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Dodatne omrežne funkcije"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Povečana poraba energije"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Poleg priporočenih funkcij ta možnost vklopi dodatne funkcije, ki morda povečajo porabo energije, ko televizor ni v uporabi."</string>
+    <string 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-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 58bb98631..ced1f4b14 100644
--- a/Settings/res/values-sl/strings.xml
+++ b/Settings/res/values-sl/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Nastavitve aplikacije"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokacija, podatki o uporabi in diagnostični podatki, oglasi"</string>
     <string name="add_account" msgid="7386223854837017129">"Dodajanje računa"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Neznan račun"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Odstrani račun"</string>
     <string name="account_sync" msgid="4315295293211313989">"Izberite sinhronizirane aplikacije"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinhroniziraj"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Ali želite vsiliti prikaz HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Pretvorba bo privzeto vsiljeno nastavljena na <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Zaslon bo v ločljivosti 1080p 60 Hz. Ta možnost ni združljiva z vašim zaslonom, če je nastavljen na ločljivost 4k 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision pri trenutni ločljivosti ni podprt. Če Dolby Vision omogočite ročno, bo ločljivost zaslona spremenjena na 1080p s frekvenco 60 Hz."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Želite spremeniti ločljivost na 1080p s frekvenco 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Pretvorba v Dolby Vision se vedno vsili"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Če je v dodatnih nastavitvah prikaza Dolby Vision onemogočen pri oblikah HDR-ja, ga z vsiljeno pretvorbo v Dolby Vision znova omogočite."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Pretvorba v HDR10 se vedno vsili"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Vzorčno besedilo"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Čudoviti čarovnik iz Oza"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. poglavje: Čudovito Smaragdno mesto"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Četudi so jim oči varovala zelena očala, je Dorotejo in prijatelje sprva zaslepil sij čudovitega Smaragdnega mesta. Na ulicah so se vrstile prekrasne hiše iz zelenega marmorja, na vseh koncih podprte s sijočimi smaragdi. Hodili so po pločniku iz plošč iz enakega zelenega marmorja, katerih stike so krasile vrste tesno položenih in v soncu lesketajočih se smaragdov. Okenske šipe so bile iz zelenega stekla; celo nebo nad Smaragdnim mestom je bilo obarvano zelenkasto in sončni žarki so bili zelene barve. \n\nPo ulicah se je sprehajalo veliko ljudi, moški, ženske in otroci. Vsi so nosili zelena oblačila in imeli so zelenkasto polt. Dorotejo in njeno nenavadno spremstvo so gledali z začudenimi očmi – vsi otroci so stekli proč in se skrili za svoje mame, ko so zagledali Leva –, ampak spregovoril ni z njimi nihče niti besede. Na ulici so stale številne prodajalne in Doroteja je opazila, da je bilo v njih vse zeleno. Naprodaj so imele zelene sladkarije in zeleno pokovko, pa zelene čevlje, zelene klobuke in zelena oblačila vseh vrst prav tako. V eni od njih je možak prodajal zeleno limonado in Doroteja je videla, da so otroci plačevali zanjo z zelenimi novci. \n\nNi bilo videti konjev ali živali drugih vrst; ljudje so prenašali stvari naokrog v majhnih zelenih vozičkih, ki so jih potiskali pred seboj. Vsi so se zdeli veseli, zadovoljni in uspešni."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Četudi so jim oči varovala zelena očala, je Dorotejo in prijatelje sprva zaslepil sij čudovitega Smaragdnega mesta. Na ulicah so se vrstile prekrasne hiše iz zelenega marmorja, na vseh koncih podprte s sijočimi smaragdi. Hodili so po pločniku iz plošč iz enakega zelenega marmorja, katerih stike so krasile vrste tesno položenih in v soncu lesketajočih se smaragdov. Okenske šipe so bile iz zelenega stekla; celo nebo nad Smaragdnim mestom je bilo obarvano zelenkasto in sončni žarki so bili zelene barve. \n\nPo ulicah se je sprehajalo veliko ljudi, moški, ženske in otroci. Vsi so nosili zelena oblačila in imeli so zelenkasto polt. Dorotejo in njeno nenavadno spremstvo so gledali z začudenimi očmi – vsi otroci so stekli proč in se skrili za svoje mame, ko so zagledali Leva –, ampak spregovoril ni z njimi nihče niti besede. Na ulici so stale številne prodajalne in Doroteja je opazila, da je bilo v njih vse zeleno. Naprodaj so imele zelene sladkarije in zeleno pokovko, pa zelene čevlje, zelene klobuke in zelena oblačila vseh vrst prav tako. V eni od njih je možak prodajal zeleno limonado in Doroteja je videla, da so otroci plačevali zanjo z zelenimi novci. \n\nNi bilo videti konjev ali živali drugih vrst; ljudje so prenašali stvari naokrog v majhnih zelenih vozičkih, ki so jih potiskali pred seboj. Vsi so se zdeli veseli, zadovoljni in uspešni."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Izbor oblike"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Samodejno"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ročno"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Želite spremeniti ločljivost na %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Izberite »V redu«, če želite od zdaj naprej uporabljati %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision pri ločljivosti %1$s ni podprt in bo v možnosti »Dodatne nastavitve slike« onemogočen."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ta način podpira %1$s. V nekaterih televizorjih morate morda vklopiti izboljšan HDMI, če želite omogočiti več oblik HDR-ja. V nastavitvah televizorja si oglejte, ali je to podprto."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ta način podpira: %1$s\nV nekaterih televizorjih morate morda vklopiti izboljšan HDMI, če želite omogočiti več oblik HDR-ja. V nastavitvah televizorja si oglejte, ali je to podprto."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Prekliči"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"V redu"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Želite izbrisati predpomnjene podatke?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Izbrisali boste predpomn. pod. vseh aplikacij."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Povezava je vzpostavljena"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Povezava je prekinjena"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nimate dovoljenja za spreminjanje nastavitev za Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Uporabi za zvok televizorja"</string>
     <string name="send_feedback" msgid="936698637869795473">"Pošiljanje povratnih informacij"</string>
     <string name="launch_help" msgid="2607478763131952469">"Center za pomoč"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"To napravo upravlja vaša organizacija."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"To napravo upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Več o tem"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Fotografska aplikacija}one{Fotografske aplikacije}two{Fotografske aplikacije}few{Fotografske aplikacije}other{Fotografske aplikacije}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacija za koledar"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Omogoči"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguracija"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Želite uporabiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> lahko zbere vse besedilo, ki ga vnesete, razen gesel. To obsega tudi osebne podatke, na primer številke kreditnih kartic."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> bo lahko brala vsebino zaslona, prikazovala vsebino prek drugih aplikacij, spremljala vašo uporabo aplikacij ali tipal strojne opreme in komunicirala z aplikacijami v vašem imenu."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Želite izklopiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Če izberete »V redu«, izklopite storitev <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Pretvorba besedila v govor"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Uspešna vzpostavitev povezave"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Pokaži vse"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Iskanje"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Ni bilo mogoče dobiti namena za dodajanje računa od overitelja."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Ni bilo mogoče dodati računa ali pa vrsta računa ni na voljo."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanali in vhodi"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanali, zunanji vhodi"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanali"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Omogoča:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Upoštevajte, da lahko ta način poveča porabo energije naprave."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Omogočite »<xliff:g id="ENERGYMODENAME">%s</xliff:g>«"</string>
+    <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_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 eaaab025e..da241677a 100644
--- a/Settings/res/values-sq/energy-modes.xml
+++ b/Settings/res/values-sq/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Veçori thelbësore të rrjetit"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Përdorim i ulët i energjisë"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Çaktivizo lidhjen e rrjetit kur TV nuk është në përdorim."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Përditësime dhe funksione kritike"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Veçoritë e rekomanduara të rrjetit"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Përdorim i optimizuar i energjisë"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Aktivizon veçoritë që zgjojnë TV nëpërmjet rrjetit (modaliteti i gatishmërisë së rrjetit)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Fut veçorinë 1]"</item>
     <item msgid="8724721267222341891">"[Fut veçorinë 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Veçori shtesë të rrjetit"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Përdorim i rritur i energjisë"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Përveç veçorive të rekomanduara, ky opsion aktivizon veçoritë shtesë kur TV nuk është në përdorim, që mund të rrisë përdorimin e energjisë."</string>
+    <string 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-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 001ac0689..7c29ee8d9 100644
--- a/Settings/res/values-sq/strings.xml
+++ b/Settings/res/values-sq/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Cilësimet e aplikacionit"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Vendndodhja, përdorimi dhe diagnostikimi, reklamat"</string>
     <string name="add_account" msgid="7386223854837017129">"Shto një llogari"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Llogari e panjohur"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Hiq llogarinë"</string>
     <string name="account_sync" msgid="4315295293211313989">"Zgjidh aplikacionet e sinkronizuara"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sinkronizo tani"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Teksti shembull"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Magjistari i mrekullueshëm i Ozit"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kapitulli 11: Qyteti i mrekullueshëm i smeraldtë i Ozit"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Edhe me sytë e mbrojtur nga syzet e gjelbra, Doroti dhe shokët e saj u dalldisën në fillim nga shkëlqimi i Qytetit të mrekullueshëm. Rrugët ishin të mbushura me shtëpi të bukura të gjitha të ndërtuara me mermer të gjelbër dhe kudo shkëlqenin prej tyre smeralde. Ata shëtitën në një trotuar me po të njëjtin mermer të gjelbër dhe aty ku blloqet bashkoheshin kishte radhë të tjera smeraldi, ngjitur me njëra-tjetrën, dhe që shkëlqenin nën ndriçimin e diellit. Dritaret ishin me xhama të gjelbër; edhe qielli mbi Qytet kishte një nuancë të gjelbër, dhe rrezet e diellit ishin të gjelbra. \n\nKishte shumë njerëz, burra, gra dhe fëmijë që shëtisnin dhe të gjithë ishin të veshur me rroba të gjelbra dhe kishin lëkurë të gjelbër. Ata e shikonin Dorotin dhe shoqëruesit e saj të çuditshëm me sy të habitur, dhe fëmijët të gjithë u trembën dhe u fshehën pas nënave kur panë Luanin, por askush nuk u foli. Në rrugë kishte shumë dyqane dhe Doroti pa se gjithçka brenda tyre ishte e gjelbër. Shiteshin karamele të gjelbra dhe kokoshka të gjelbra, si dhe këpucë të gjelbra, kapele të gjelbra dhe rroba të gjelbra të të gjitha llojeve. Në një vend dikush shiste limonadë të gjelbër dhe kur fëmijët blinin, Doroti pa se ata paguanin me monedha të gjelbra. \n\nDukej sikur nuk kishte kuaj apo kafshë të ndonjë lloji; burrat i transportonin sendet me karroca të vogla të gjelbra, të cilat i shtynin përpara. Të gjithë dukeshin të kënaqur, të lumtur dhe të begatë."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Edhe me sytë e mbrojtur nga syzet e gjelbra, Doroti dhe shokët e saj u dalldisën në fillim nga shkëlqimi i Qytetit të mrekullueshëm. Rrugët ishin të mbushura me shtëpi të bukura të gjitha të ndërtuara me mermer të gjelbër dhe kudo shkëlqenin prej tyre smeralde. Ata shëtitën në një trotuar me po të njëjtin mermer të gjelbër dhe aty ku blloqet bashkoheshin kishte radhë të tjera smeraldi, ngjitur me njëra-tjetrën, dhe që shkëlqenin nën ndriçimin e diellit. Dritaret ishin me xhama të gjelbër; edhe qielli mbi Qytet kishte një nuancë të gjelbër, dhe rrezet e diellit ishin të gjelbra. \n\nKishte shumë njerëz, burra, gra dhe fëmijë që shëtisnin dhe të gjithë ishin të veshur me rroba të gjelbra dhe kishin lëkurë të gjelbër. Ata e shikonin Dorotin dhe shoqëruesit e saj të çuditshëm me sy të habitur, dhe fëmijët të gjithë u trembën dhe u fshehën pas nënave kur panë Luanin, por askush nuk u foli. Në rrugë kishte shumë dyqane dhe Doroti pa se gjithçka brenda tyre ishte e gjelbër. Shiteshin karamele të gjelbra dhe kokoshka të gjelbra, si dhe këpucë të gjelbra, kapele të gjelbra dhe rroba të gjelbra të të gjitha llojeve. Në një vend dikush shiste limonadë të gjelbër dhe kur fëmijët blinin, Doroti pa se ata paguanin me monedha të gjelbra. \n\nDukej sikur nuk kishte kuaj apo kafshë të ndonjë lloji; burrat i transportonin sendet me karroca të vogla të gjelbra, të cilat i shtynin përpara. Të gjithë dukeshin të kënaqur, të lumtur dhe të begatë."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Zgjedhja e formatit"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatik"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuale"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Të ndryshohet rezolucioni në %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Zgjidh \"Në rregull\" për të përdorur %1$s nga tani e tutje."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision nuk mbështetet në %1$s dhe do të çaktivizohet te \"Cilësimet e përparuara të ekranit\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Ky modalitet mbështet %1$s. Në disa televizorë mund të duhet të aktivizosh lidhjen HDMI të përparuar për të aktivizuar formate të tjera HDR. Kontrollo cilësimet e televizorit për të parë nëse kjo mbështetet."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Ky modalitet mbështet: %1$s\nNë disa televizorë mund të duhet të aktivizosh lidhjen HDMI të përparuar për të aktivizuar formate të tjera HDR. Kontrollo cilësimet e televizorit për të parë nëse kjo mbështetet."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Anulo"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Në rregull"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Të pastrohen të dhënat e memories specifike?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Kjo do të pastrojë të dhënat e memories specifike për të gjitha aplikacionet."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Lidhur"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Shkëputur"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Nuk ke leje për të ndryshuar cilësimet e \"Bluetooth-it\"."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Përdor për audion e televizorit"</string>
     <string name="send_feedback" msgid="936698637869795473">"Dërgo koment"</string>
     <string name="launch_help" msgid="2607478763131952469">"Qendra e ndihmës"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Kjo pajisje menaxhohet nga organizata jote."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Kjo pajisje menaxhohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Mëso më shumë"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Aplikacioni i kamerës}other{Aplikacionet e kamerës}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Aplikacioni i kalendarit"</string>
@@ -549,7 +549,7 @@
     <string name="storage_free_up" msgid="5719667150891467122">"Liro hapësirën ruajtëse"</string>
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"Pastro të dhënat e memories specifike"</string>
     <string name="storage_free_up_clear_cached_data_summary" msgid="3111860361699185304">"Liro <xliff:g id="SPACE">%1$s</xliff:g>"</string>
-    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Pastron skedarët e përkohshëm që zënë hapësirë. Të dhënat e ruajtura si preferencat e aplikacioneve apo videot jashtë linje nuk do të ndikohen dhe nuk do të të duhet të identifikohesh më në aplikacione."</string>
+    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Pastron skedarët e përkohshëm që zënë hapësirë. Të dhënat e ruajtura si preferencat e aplikacioneve apo videot offline nuk do të ndikohen dhe nuk do të të duhet të identifikohesh më në aplikacione."</string>
     <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"Të pastrohen të dhënat e memories specifike?"</string>
     <string name="storage_free_up_clear_cached_data_confirm_description" msgid="4840728913914074729">"Pastron memorien specifike për aplikacionet."</string>
     <string name="storage_free_up_uninstall_apps" msgid="7755671754934975908">"Çinstalo aplikacione"</string>
@@ -666,7 +666,7 @@
     <string name="location_reporting" msgid="3552501333650895634">"Raportimi i vendndodhjes"</string>
     <string name="location_history" msgid="4055660203090513120">"Historiku i vendndodhjeve"</string>
     <string name="location_reporting_desc" msgid="1580018652781674608">"Google e përdor këtë funksion në produkte si \"Google Tani\" dhe Google Maps. Aktivizimi i \"Raportimit të vendndodhjes\" lejon që çdo produkt i Google që përdor këtë funksion të ruajë dhe të përdorë të dhënat më të fundit të vendndodhjes të pajisjes tënde në lidhje me llogarinë tënde të Google."</string>
-    <string name="location_history_desc" msgid="926674012916014270">"Kur \"Historiku i vendndodhjeve\" është i aktivizuar për këtë llogari, Google mund të ruajë të dhënat e vendndodhjes së pajisjes tënde për përdorim nga aplikacionet e tua.\n\nPër shembull, Google Maps mund të të japin udhëzime dhe \"Google Tani\" mund të të informojë për trafikun për udhëtimet e përditshme.\n\nMund ta çaktivizosh \"Historikun e vendndodhjeve\" në çdo kohë, por ky veprim nuk e fshin atë. Për të parë dhe menaxhuar \"Historikun e vendndodhjeve\", vizito maps.google.com/locationhistory."</string>
+    <string name="location_history_desc" msgid="926674012916014270">"Kur \"Historiku i vendndodhjeve\" është i aktivizuar për këtë llogari, Google mund të ruajë të dhënat e vendndodhjes së pajisjes sate për përdorim nga aplikacionet e tua.\n\nPër shembull, Google Maps mund të të japë udhëzime dhe \"Google Tani\" mund të të informojë për trafikun për udhëtimin ditor.\n\nMund ta çaktivizosh \"Historikun e vendndodhjeve\" në çdo kohë, por ky veprim nuk e fshin atë. Për të parë dhe menaxhuar \"Historikun e vendndodhjeve\", vizito maps.google.com/locationhistory."</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"Fshi historikun e vendndodhjeve"</string>
     <string name="delete_location_history_desc" msgid="4035229731487113147">"Kjo do të fshijë të gjithë \"Historikun e vendndodhjeve\" të ruajtur nga kjo pajisje për këtë llogari të Google. Këtë fshirje nuk mund ta zhbësh. Disa aplikacione, duke përfshirë \"Google Tani\", nuk do të funksionojnë më."</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"Lexuesit e ekranit"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktivizo"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfigurimi"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Të përdoret <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> mund të mbledhë të gjitha tekstet që shkruan, përveç fjalëkalimeve. Kjo përfshin të dhënat personale si p.sh. numrat e kartës së kreditit."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> do të jetë në gjendje të të lexojë ekranin, të shfaqë përmbajtjen mbi aplikacione të tjera, të gjurmojë ndërveprimet e tua me aplikacionet ose sensorët e harduerit dhe të ndërveprojë me aplikacionet në emrin tënd."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Të ndalohet <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Zgjedhja e \"Në rregull\" do të ndalojë shërbimin <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Tekst në ligjërim"</string>
@@ -1091,7 +1091,7 @@
     <string name="select_device_admin_msg" msgid="8475934459999710332">"Apl. e admin. të pajisjes"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"Të aktivizohet apl. i admin. të pajisjes?"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"Aktivizo këtë aplikacion të administrimit të pajisjes"</string>
-    <string name="device_admin_warning" msgid="7399916080685200660">"Aktivizimi i këtij aplikacioni të administrimit do të lejojë që aplikacioni <xliff:g id="APP_NAME">%1$s</xliff:g> të kryejë veprimet e mëposhtme:"</string>
+    <string name="device_admin_warning" msgid="7399916080685200660">"Aktivizimi i këtij aplikacioni të administrimit do të lejojë që aplikacioni \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" të kryejë veprimet e mëposhtme:"</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"Kjo pajisje do të menaxhohet dhe do të monitorohet nga <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
     <string name="device_admin_status" msgid="5467001937240455367">"Ky aplikacion administrimi është aktiv dhe lejon apl. <xliff:g id="APP_NAME">%1$s</xliff:g> të kryejë veprimet e mëposhtme:"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"Duke vazhduar, profili yt si \"përdorues\" do të menaxhohet nga administratori yt, i cili mund të ruajë të dhënat e lidhura, përveç të dhënave të tua personale.\n\nAdministratori yt ka aftësinë që të monitorojë dhe të menaxhojë cilësimet, qasjen, aplikacionet dhe të dhënat e lidhura me këtë përdorues, duke përfshirë aktivitetin e rrjetit dhe informacionet e vendndodhjes së pajisjes tënde."</string>
@@ -1099,7 +1099,7 @@
     <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"Administratori i teknologjisë së informacionit kërkoi një raport të defekteve në kod për të ndihmuar me zgjidhjen e problemeve. Aplikacioni dhe të dhënat mund të ndahen."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="4637489112422692638">"Administratori i teknologjisë së informacionit kërkoi një raport të defekteve në kod për të ndihmuar me zgjidhjen e problemeve. Aplikacioni dhe të dhënat mund të ndahen dhe kjo mund të ngadalësojë përkohësisht pajisjen tënde."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="8096239263583331293">"Ky raport i defektit në kod po ndahet me administratorin tënd të IT-së. Kontaktoje atë për më shumë detaje."</string>
-    <string name="share_remote_bugreport_action" msgid="6760197666368262892">"Shpërndaj"</string>
+    <string name="share_remote_bugreport_action" msgid="6760197666368262892">"Ndaj"</string>
     <string name="decline_remote_bugreport_action" msgid="2130779396296090961">"Refuzo"</string>
     <string name="network_connection_request_dialog_title" msgid="4103963119407212989">"Pajisja që do të përdoret me <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
     <string name="network_connection_timeout_dialog_message" msgid="8408857135950230472">"Nuk u gjet asnjë pajisje. Sigurohu që pajisjet të jenë të ndezura dhe të gatshme për t\'u lidhur."</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Lidhja ishte e suksesshme"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Shfaq të gjitha"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Po kërkon"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Synimi i llogarisë së reklamës nuk u mor nga vërtetuesi."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Llogaria nuk u shtua ose lloji i llogarisë nuk ofrohet."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanalet dhe hyrjet"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanalet, hyrjet e jashtme"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanale"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktivizon:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Ki parasysh se ky modalitet mund të rrisë konsumimin e energjisë së pajisjes."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivizo \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 97fdd8607..3f7bacc93 100644
--- a/Settings/res/values-sr/energy-modes.xml
+++ b/Settings/res/values-sr/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основне мрежне функције"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Мала потрошња енергије"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Искључите мрежну везу када се ТВ не користи."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Важна ажурирања и функције"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Препоручене мрежне функције"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимизована потрошња енергије"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Укључује функције које буде ТВ преко мреже (режим мировања на мрежи)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Уметните функцију 1]"</item>
     <item msgid="8724721267222341891">"[Уметните функцију 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Додатне мрежне функције"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Повећана потрошња енергије"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Поред препоручених функција, ова опција укључује додатне функције када се ТВ не користи које могу да повећају потрошњу енергије."</string>
+    <string 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-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 60b8f4610..058a85173 100644
--- a/Settings/res/values-sr/strings.xml
+++ b/Settings/res/values-sr/strings.xml
@@ -65,9 +65,10 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Подешавања апликације"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Локација, коришћење и дијагностика, огласи"</string>
     <string name="add_account" msgid="7386223854837017129">"Додај налог"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Непознат налог"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Уклањање налога"</string>
     <string name="account_sync" msgid="4315295293211313989">"Изаберите синхронизоване апликације"</string>
-    <string name="sync_now" msgid="4335217984374620551">"Синхронизуј одмах"</string>
+    <string name="sync_now" msgid="4335217984374620551">"Синхронизуј"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Синхронизовање…"</string>
     <string name="last_synced" msgid="8371967816955123864">"Последњи пут синхронизовано <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Онемогућено је"</string>
@@ -75,7 +76,7 @@
     <string name="account_remove_failed" msgid="5654411101098531690">"Није могуће уклонити налог"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
-    <string name="sync_one_time_sync" msgid="1665961083810584134">"Синхронизуј одмах<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="1665961083810584134">"Синхронизуј<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_failed" msgid="2998289556481804047">"Синхронизација није успела"</string>
     <string name="sync_active" msgid="1621239982176888680">"Синхронизација је активна"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Пример текста"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Чаробњак из Оза"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Поглавље 11: Чудесни Смарагдни град Оза"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"И поред тога што су им очи биле заштићене зеленим наочарима, Дороти и њени пријатељи су у првом тренутку били заслепљени сјајем чудесног града. Улице су биле пуне прелепих кућа саграђених од зеленог мермера и украшених светлуцавим смарагдима. Ходали су плочником од истог зеленог мермера, а на местима на којима су се плоче спајале налазили су се густо поређани смарагди који су се пресијавали на сунцу. Чак је и небо изнад града било зелене боје, као и сунчеви зраци. \n\nНа улицама је било много људи. Мушкарци, жене и деца су шетали, при чему су сви носили зелена одела и имали зеленкасту кожу. Посматрали су Дороти и њено необично друштво са чуђењем, а деца су бежала и крила се иза својих мајки кад би видела Лава. Међутим, нико им се није обраћао. У улици је било много радњи, а Дороти је приметила да је у њима све било зелено. Продавале су се зелене бомбоне и кокице, зелене ципеле, зелени шешири и зелена одећа свих врста. На једном месту је неки човек продавао зелену лимунаду, а Дороти је приметила да су је деца плаћала зеленим новчићима. \n\nЧинило се да нема коња нити било каквих других животиња. Људи су ствари носили у малим зеленим колицима која су гурали испред себе. Сви су изгледали срећно, задовољно и успешно."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"И поред тога што су им очи биле заштићене зеленим наочарима, Дороти и њени пријатељи су у првом тренутку били заслепљени сјајем чудесног града. Улице су биле пуне прелепих кућа саграђених од зеленог мермера и украшених светлуцавим смарагдима. Ходали су плочником од истог зеленог мермера, а на местима на којима су се плоче спајале налазили су се густо поређани смарагди који су се пресијавали на сунцу. Чак је и небо изнад града било зелене боје, као и сунчеви зраци. \n\nНа улицама је било много људи. Мушкарци, жене и деца су шетали, при чему су сви носили зелена одела и имали зеленкасту кожу. Посматрали су Дороти и њено необично друштво са чуђењем, а деца су бежала и крила се иза својих мајки кад би видела Лава. Међутим, нико им се није обраћао. У улици је било много радњи, а Дороти је приметила да је у њима све било зелено. Продавале су се зелене бомбоне и кокице, зелене ципеле, зелени шешири и зелена одећа свих врста. На једном месту је неки човек продавао зелену лимунаду, а Дороти је приметила да су је деца плаћала зеленим новчићима. \n\nЧинило се да нема коња нити било каквих других животиња. Људи су ствари носили у малим зеленим колицима која су гурали испред себе. Сви су изгледали срећно, задовољно и успешно."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Избор формата"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Аутоматски"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Ручно"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Желите да промените резолуцију у %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Изаберите Потврди да бисте користили %1$s од сада."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolbi Vision није подржан на %1$s и биће онемогућен у „Напредним подешавањима приказа“"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Овај режим подржава %1$s. На неким телевизорима ћете можда морати да укључите побољшан HDMI да бисте омогућили више HDR формата. Проверите подешавања ТВ-а да бисте видели да ли је то подржано."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Овај режим подржава: %1$s\nНа неким телевизорима ћете можда морати да укључите побољшан HDMI да бисте омогућили више HDR формата. Проверите подешавања ТВ-а да бисте видели да ли је то подржано."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Откажи"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Потврди"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Желите ли да обришете кеширане податке?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Биће обрисани кеширани подаци за све апликације."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Повезано"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Веза је прекинута"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Немате дозволу за промену подешавања Bluetooth-а."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Користи за звук ТВ-а"</string>
     <string name="send_feedback" msgid="936698637869795473">"Пошаљите повратне информације"</string>
     <string name="launch_help" msgid="2607478763131952469">"Центар за помоћ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Овим уређајем управља организација."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Овим уређајем управља <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Сазнајте више"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Апликација за камеру}one{Апликације за камеру}few{Апликације за камеру}other{Апликације за камеру}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Апликација Календар"</string>
@@ -549,7 +549,7 @@
     <string name="storage_free_up" msgid="5719667150891467122">"Ослободите меморијски простор"</string>
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"Обришите кеширане податке"</string>
     <string name="storage_free_up_clear_cached_data_summary" msgid="3111860361699185304">"Ослободите <xliff:g id="SPACE">%1$s</xliff:g>"</string>
-    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Брише привремене фајлове који заузимају простор. Не утиче на сачуване податке, попут подешавања апликације или офлајн видео снимака и нећете морати да се поново пријављујете у апликације"</string>
+    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"Брише привремене фајлове који заузимају простор. Не утиче на сачуване податке, попут подешавања апликације или офлајн видеа и нећете морати да се поново пријављујете у апликације"</string>
     <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"Желите ли да обришете кеширане податке?"</string>
     <string name="storage_free_up_clear_cached_data_confirm_description" msgid="4840728913914074729">"Биће обрисани кеширани подаци за све апликације."</string>
     <string name="storage_free_up_uninstall_apps" msgid="7755671754934975908">"Деинсталирај апликације"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Омогући"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфигурација"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> може да прикупља сав текст који унесете, изузев лозинки. То подразумева личне податке, као што су бројеви кредитних картица."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -759,7 +759,7 @@
     <string name="system_drawing" msgid="5802739024643871942">"Цртање"</string>
     <string name="system_monitoring" msgid="7997260748312620855">"Надгледање"</string>
     <string name="system_apps" msgid="8481888654606868074">"Апликације"</string>
-    <string name="system_stay_awake" msgid="5935117574414511413">"Не закључавај"</string>
+    <string name="system_stay_awake" msgid="5935117574414511413">"Не гаси екран"</string>
     <string name="keep_screen_on_summary" msgid="4680661166009970792">"Екран никада неће бити у режиму спавања"</string>
     <string name="system_hdcp_checking" msgid="3757586362130048838">"HDCP провера"</string>
     <string name="system_hdmi_optimization" msgid="4122753440620724144">"HDMI оптимизација"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Повезано је"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Прикажи све"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Претражује се"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Преузимање намере за додавање налога из потврђивача идентитета није успело."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Додавање налога није успело или тип налога није доступан."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Канали и улази"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Канали, спољни улази"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Канали"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Омогућава:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Имајте на уму да овај режим може да повећа потрошњу енергије на уређају."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Омогућите режим <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 479d273b6..b94153c57 100644
--- a/Settings/res/values-sv/energy-modes.xml
+++ b/Settings/res/values-sv/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Viktiga nätverksfunktioner"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Låg energiförbrukningen"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Inaktivera nätverksanslutningen när tv:n inte används."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Viktiga uppdateringar och funktioner"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Rekommenderade nätverksfunktioner"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimerad energiförbrukning"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Inaktiverar funktioner som väcker tv:n via nätverket (nätverksanslutet standbyläge)"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ytterligare nätverksfunktioner"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Ökad energiförbrukning"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Utöver de rekommenderade funktionerna aktiverar det här alternativet ytterligare funktioner när tv:n inte används som kan öka energiförbrukningen."</string>
+    <string 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-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 533609b5a..40f9d5214 100644
--- a/Settings/res/values-sv/strings.xml
+++ b/Settings/res/values-sv/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Appinställningar"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Plats, användning och diagnostik, annonser"</string>
     <string name="add_account" msgid="7386223854837017129">"Lägg till konto"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Okänt konto"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Ta bort konto"</string>
     <string name="account_sync" msgid="4315295293211313989">"Välj synkroniserade appar"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synkronisera nu"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Vill du tvångskonvertera HDR-utmatningen?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Som standard tvångskonverteras den till <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Din skärm kommer att köras med upplösningen 1080p 60 Hz. Det här alternativet är inte kompatibelt med din skärm när den körs med upplösningen 4K 60 Hz."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision stöds inte för den aktuella upplösningen. Om du aktiverar Dolby Vision manuellt ändras skärmens upplösning till 1080p 60 Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Vill du ändra upplösningen till 1080p 60 Hz?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Tvångskonvertera alltid till Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Om du tvångskonverterar till Dolby Vision när det är inaktiverat i HDR Formats i avancerade skärminställningar återaktiveras Dolby Vision."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Tvångskonvertera alltid till HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Exempeltext"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Den fantastiska trollkarlen från Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kapitel 11: Den underbara Smaragdstaden i Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Trots att deras ögon skyddades av de gröna glasögonen blev Dorothy och hennes vänner först bländade av den underbara stadens glans. Gatorna kantades av underbara hus som alla var byggda av grön marmor och översållade med gnistrande smaragder. De gick på stenläggning av samma slags gröna marmor och där stenarna gränsade till varandra fanns rader av smaragder som låg tätt tillsammans och blixtrade i solskenet. Fönsterrutorna var av grönt glas, till och med himlen över staden var grönaktig och solstrålarna var gröna. \n\nMånga män, kvinnor och barn promenerade omkring, och alla var klädda i gröna kläder och hade grönaktig hy. De såg förundrat på Dorothy och hennes egendomliga följeslagare, och alla barnen sprang bort och gömde sig bakom sina mammor när de såg Lejonet; men ingen talade till dem. Det fanns många affärer längs gatan, och Dorothy såg att allt i dem var grönt. Där såldes grön kola och gröna popcorn liksom gröna skor, gröna hattar och gröna kläder av alla slag. På en plats sålde en man grön saft och när barnen köpte den såg Dorothy att de betalade för den med gröna slantar. \n\nDet tycktes inte finnas några hästar eller några slags djur; männen drog omkring saker i små gröna vagnar. Alla tycktes vara lyckliga och belåtna och välmående."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Trots att deras ögon skyddades av de gröna glasögonen blev Dorothy och hennes vänner först bländade av den underbara stadens glans. Gatorna kantades av underbara hus som alla var byggda av grön marmor och översållade med gnistrande smaragder. De gick på stenläggning av samma slags gröna marmor och där stenarna gränsade till varandra fanns rader av smaragder som låg tätt tillsammans och blixtrade i solskenet. Fönsterrutorna var av grönt glas, till och med himlen över staden var grönaktig och solstrålarna var gröna. \n\nMånga män, kvinnor och barn promenerade omkring, och alla var klädda i gröna kläder och hade grönaktig hy. De såg förundrat på Dorothy och hennes egendomliga följeslagare, och alla barnen sprang bort och gömde sig bakom sina mammor när de såg Lejonet; men ingen talade till dem. Det fanns många affärer längs gatan, och Dorothy såg att allt i dem var grönt. Där såldes grön kola och gröna popcorn liksom gröna skor, gröna hattar och gröna kläder av alla slag. På en plats sålde en man grön saft och när barnen köpte den såg Dorothy att de betalade för den med gröna slantar. \n\nDet tycktes inte finnas några hästar eller några slags djur; männen drog omkring saker i små gröna vagnar. Alla tycktes vara lyckliga och belåtna och välmående."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Formatval"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Automatiskt"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuellt"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Vill du byta upplösning till %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Välj OK om du vill använda %1$s i fortsättningen."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision stöds inte för %1$s och inaktiveras i de avancerade skärminställningarna"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Det här läget stödjer %1$s. På en del tv:ar kan du behöva aktivera Utökad HDMI för att aktivera fler HDR-format. Du kan se om detta stöds i tv-inställningarna."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Det här läget har stöd för: %1$s\nPå en del tv:ar kan du behöva aktivera utökad HDMI för att få tillgång till fler HDR-format. Du kan se om detta stöds i tv-inställningarna."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Avbryt"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Vill du ta bort cachelagrad data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Cachelagrad data tas bort i alla appar."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Ansluten"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Frånkopplad"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Du saknar behörighet att ändra Bluetooth-inställningarna."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Använd för tv-ljud"</string>
     <string name="send_feedback" msgid="936698637869795473">"Skicka feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Hjälpcenter"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Den här enheten hanteras av organisationen."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Den här enheten hanteras av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Läs mer"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kameraapp}other{Kameraappar}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Kalenderapp"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Aktivera"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> kan samla in all text som du skriver, förutom lösenord. Detta gäller till exempel personliga uppgifter som kreditkortsnummer."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> kan läsa din skärm, visa innehåll över andra appar, spåra dina interaktioner med appar eller maskinvarusensorer och interagera med appar å dina vägnar."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Vill du avbryta <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Om du väljer OK avbryts <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text-till-tal"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Anslutningen har upprättats"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Visa alla"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Söker"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Det gick inte att hämta Add account intent från verifieraren."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Det gick inte att lägga till kontot eller så är kontotypen inte tillgänglig."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanaler och ingångar"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanaler, externa ingångar"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanaler"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Aktiverar följande:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tänk på att det här läget kan öka enhetens energiförbrukning."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Aktivera <xliff:g id="ENERGYMODENAME">%s</xliff:g>"</string>
+    <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_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 cabc7c247..debdbb2b2 100644
--- a/Settings/res/values-sw/energy-modes.xml
+++ b/Settings/res/values-sw/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Vipengele muhimu vya mtandao"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Utumiaji mdogo wa nishati"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Zima muunganisho wa mtandao wakati TV haitumiki."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Masasisho na utendaji muhimu"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Vipengele vya mtandao vinavyopendekezwa"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Utumiaji wa nishati ulioboreshwa"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Huwasha vipengele vinavyowasha skrini ya TV kwenye mtandao (hali tuli ya mtandao)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Vipengele vya mtandao vya ziada"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Utumiaji wa nishati umeongezeka"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Mbali na vipengele vinavyopendekezwa, chaguo hili huwasha vipengele vya ziada wakati TV haitumiki, hali inayoweza kuongeza utumiaji wa nishati."</string>
+    <string 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-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 ba7b1e48d..9760baca2 100644
--- a/Settings/res/values-sw/strings.xml
+++ b/Settings/res/values-sw/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Mipangilio ya Programu"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Mahali, Matumizi na Uchunguzi, Matangazo"</string>
     <string name="add_account" msgid="7386223854837017129">"Ongeza akaunti"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Akaunti Isiyojulikana"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Ondoa akaunti"</string>
     <string name="account_sync" msgid="4315295293211313989">"Chagua programu zilizosawazishwa"</string>
     <string name="sync_now" msgid="4335217984374620551">"Sawazisha sasa"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Sampuli ya maandishi"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Wachawi wa Ajabu kutoka Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Sura ya 11: Mji wa Ajabu wa Johari wa Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Hata baada ya kulinda macho yao kwa miwani ya kijani, Amina na marafiki zake walishangazwa na mwangaza wa Mji wa ajabu. Mitaa ilikuwa na nyumba maridadi zilizotengenezwa kwa marumaru za kijani na kila mahali kulikuwa na johari zilizong\'aa. Walitembea kwenye njia ya marumaru, na matofali yalipokuwa yameuganishwa, kulikuwa na safu za johari zilizong\'aa kama jua. Madirisha yalitengezwa kwa vioo vya kijani. Anga la Mji na miale ya jua pia ilikuwa ya kijani. \n\nKulikuwa na watu wengi (wanaume, wanawake na watoto) ambao walikuwa wakitembea na wote walikuwa wamevalia nguo za kijani na ngozi yao ilikuwa ya kijani. Watu hawa walimtazama Amina na marafiki zake kwa mshangao. Watoto nao walitoroka na kujificha nyuma ya mama zao walipoona Simba; lakini hakuna aliyewazungumzia. Kulikuwa na maduka mengi mtaani na Amina aliona kuwa bidhaa zilizokuwemo zilikuwa za kijani. Peremende, bisi, viatu, kofia na nguo za aina zote zilikuwa za kijani. Katika sehemu fulani, mtu mmoja alikuwa akiuza juisi ya limau ya kijani, na watoto walilipa sarafu za kijani ili kuinunua. \n\nIlionekana kuwa mji huo haukuwa na farasi wala wanyama wa aina yoyote; watu walibeba bidhaa katika vikapu vya kijani. Kila mtu alionekana mchangamfu na aliyeridhika."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Amina na marafiki zake walishangazwa na mng\'aro wa Mji wa ajabu licha ya kuvaa miwani ya kijani. Mitaa ilikuwa na nyumba maridadi zilizotengezwa kwa marumaru za kijani na kila mahali kulikuwa na johari zilizong\'aa. Walitembea kwenye njia ya marumaru, na matofali yalipokuwa yameuganishwa, kulikuwa na safu za johari zilizong\'aa kama jua. Madirisha yalitengezwa kwa vioo vya kijani. Anga la Mji na miale ya jua ilikuwa ya kijani. \n\nKulikuwa na watu wengi (wanaume, wanawake na watoto) ambao walikuwa wakitembea na wote walikuwa wamevalia nguo za kijani na ngozi yao ilikuwa ya kijani. Watu hawa walimtazama Amina na marafiki zake kwa mshangao. Watoto nao walitoroka na kujificha nyuma ya mama zao walipoona Simba; hakuna aliyewazungumzia. Kulikuwa na maduka mengi mtaani na Amina aliona kuwa bidhaa zilizokuwemo zilikuwa za kijani. Peremende, bisi, viatu, kofia na nguo za aina zote zilikuwa za kijani. Katika sehemu fulani, mtu mmoja alikuwa akiuza sharubati ya kijani, na watoto walilipa sarafu za kijani ili kuinunua.\n\nIlionekana kuwa mji huo haukuwa na farasi wala wanyama wa aina yoyote; watu walibeba bidhaa katika vikapu vya kijani. Kila mtu alionekana mchangamfu na aliyeridhika."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Uteuzi wa muundo"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Otomatiki"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Teua mwenyewe"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Ungependa kubadilisha ubora uwe %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Chagua Sawa ili utumie %1$s kuanzia sasa."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Kipengele cha Dolby Vision hakitumiki kwenye %1$s na kitazimwa kwenye \"Mipangilio ya Kina ya Skrini\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Hali hii inatumia %1$s. Kwenye baadhi ya TV, huenda ukahitaji kuwasha HDMI Iliyoboreshwa ili kuwasha miundo zaidi ya HDR. Angalia mipangilio ya TV yako ili uone ikiwa hali hii inatumika."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Hali hii inatumia: %1$s\nKwenye baadhi ya TV, huenda ukahitaji kuwasha HDMI Iliyoboreshwa ili uruhusu miundo zaidi ya HDR Angalia mipangilio ya TV yako ili uone ikiwa hali hii inatumika."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Ghairi"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Sawa"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (Hz <xliff:g id="REFRESH_RATE">%2$s</xliff:g>)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Ungependa kufuta data iliyo kwenye akiba?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Hii itafuta data iliyo kwenye akiba ya programu zote."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Imeunganishwa"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Imetenganishwa"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Huna ruhusa ya kubadilisha mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Tumia kwa maudhui ya sauti kwenye TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Tuma maoni"</string>
     <string name="launch_help" msgid="2607478763131952469">"Kituo cha Usaidizi"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Kifaa hiki kinadhibitiwa na shirika lako."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Kifaa hiki kinasimamiwa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Pata maelezo zaidi"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Programu ya kamera}other{Programu za kamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Programu ya kalenda"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Washa"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Kuweka mipangilio"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g>: iwashwe?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Huduma ya <xliff:g id="SERVICE">%1$s</xliff:g> inaweza kukusanya maandishi yote unayochapa, isipokuwa manenosiri. Hii ni pamoja na data ya kibinafsi kama nambari za kadi ya mkopo."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> itaweza kusoma skrini yako, kuonyesha maudhui juu ya programu zingine, kufuatilia matumizi yako ya programu au vitambuzi vya maunzi na kutumia programu kwa niaba yako."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g>: isimamishwe?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Kuchagua sawa kutasimamisha <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Kusoma maandishi kwa sauti"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Imeunganisha"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Onyesha yote"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Inatafuta"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Imeshindwa kurejesha utaratibu wa kuweka akaunti kutoka kwenye kithibitishaji."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Imeshindwa kuweka akaunti au aina ya akaunti haipatikani."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Vituo na Vyanzo"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Vituo, vyanzo vya nje"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Vituo"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Huwasha:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Kumbuka kuwa hali hii inaweza kuongeza utumiaji wa nishati kwenye kifaa."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Washa \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 c6b05b85d..451000646 100644
--- a/Settings/res/values-ta/energy-modes.xml
+++ b/Settings/res/values-ta/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"அத்தியாவசிய நெட்வொர்க் அம்சங்கள்"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"குறைவான மின்சார உபயோகம்"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"டிவி உபயோகத்தில் இல்லாதபோது நெட்வொர்க் இணைப்பை முடக்கும்."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"முக்கிய அறிவிப்புகளும் செயல்பாடுகளும்"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"பரிந்துரைக்கப்படும் நெட்வொர்க் அம்சங்கள்"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"மேம்படுத்தப்பட்ட மின்சார உபயோகம்"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"நெட்வொர்க் வழியாக டிவியை எழுப்பும் அம்சங்களை இயக்கும் (நெட்வொர்க் மின்சாரச் சேமிப்பு)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"கூடுதல் நெட்வொர்க் அம்சங்கள்"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"அதிக மின்சார உபயோகம்"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"பரிந்துரைக்கப்படும் அம்சங்கள் மட்டுமின்றி, டிவி உபயோகத்தில் இல்லாதபோது கூடுதல் அம்சங்களை இந்த விருப்பத்தேர்வு இயக்கும். இது மின்சார உபயோகத்தை அதிகரிக்கக்கூடும்."</string>
+    <string 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-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 2764fde16..eb9e071e3 100644
--- a/Settings/res/values-ta/strings.xml
+++ b/Settings/res/values-ta/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ஆப்ஸ் அமைப்புகள்"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"இருப்பிடம், உபயோகம் &amp; பிழை கண்டறிதல், விளம்பரங்கள்"</string>
     <string name="add_account" msgid="7386223854837017129">"கணக்கைச் சேர்"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"அறியப்படாத கணக்கு"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"கணக்கை அகற்று"</string>
     <string name="account_sync" msgid="4315295293211313989">"ஒத்திசைத்த ஆப்ஸைத் தேர்ந்தெடு"</string>
     <string name="sync_now" msgid="4335217984374620551">"இப்போது ஒத்திசை"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"மாதிரி உரை"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"தி வொண்டர்ஃபுல் விசார்டு ஆஃப் ஓஸ்"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"அத்தியாயம் 11: தி வொண்டர்ஃபுல் எமரால்டு சிட்டி ஆஃப் ஓஸ்"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"டோரத்தியும் அவளின் நண்பர்களும் பச்சை நிறக் கண்ணாடிகளை அணிந்திருந்தபோதும், முதல் பார்வையிலேயே எழில்கொஞ்சும் நகரத்தின் அழகில் மயங்கினர். பச்சை நிறச் சலவைக் கற்களால் கட்டப்பட்ட அழகிய வீடுகள் தெருக்களில் அணிவகுத்து நின்றன. அத்துடன் திரும்பும் இடமெல்லாம் மின்னும் மரகதக் கற்களால் அலங்கரிக்கப்பட்டிருந்தன. அவர்கள் அதே பச்சை நிறச் சலவைக் கல்லால் அமைக்கப்பட்டிருந்த நடைபாதையில் நடந்து சென்றனர். அதில் இணைக்கப்பட்டிருந்த தடுப்புகள் மரகதக் கற்களைக் கொண்டு நெருக்கமாகக் கட்டப்பட்டிருந்தன. அவை சூரியனின் ஒளிக்கதிர்களால் பளபளத்தன. ஜன்னல் கண்ணாடிகள் பச்சை நிறக் கண்ணாடியால் கட்டப்பட்டிருந்தன. நகரத்தின் மேலே உள்ள வானமும் பச்சை நிறச் சாயலில் இருந்தது, அத்துடன் சூரியனும் பச்சை நிற ஒளிக்கதிர்களை வீசியது. \n\nஅங்கே நிறைய மனிதர்கள் இருந்தனர். ஆண்கள், பெண்கள், குழந்தைகள் என அனைவரும் நடந்து கொண்டிருந்தனர். அவர்கள் பச்சை நிற ஆடைகளை அணிந்திருந்தனர், அவர்களின் சருமமும் பச்சை நிறத்தில் இருந்தது. டோரத்தியையும் அவளுடன் இருந்த விசித்திரமான நண்பர்களையும் அவர்கள் பிரமிப்புடன் பார்த்தனர். சிங்கத்தைப் பார்த்தவுடன் குழந்தைகள் அனைவரும் ஓடிச்சென்று தங்கள் அம்மாக்களின் பின்னால் ஒளிந்துகொண்டனர். ஆனால் யாரும் அவர்களுடன் பேசவில்லை. அந்தத் தெருவில் நிறைய கடைகள் இருந்தன. அந்தக் கடைகளில் எல்லாமே பச்சை நிறத்தில் இருப்பதை டோரத்தி பார்த்தாள். பச்சை நிற மிட்டாய், பச்சை நிறப் பாப்கார்ன், பச்சை நிறக் காலணிகள், பச்சை நிறத் தொப்பிகள், அனைத்து விதமான பச்சை நிற உடைகள் ஆகியவை விற்பனைக்கு வைக்கப்பட்டிருந்தன. அங்கே ஒருவன் பச்சை நிற எலுமிச்சை ஜூஸ் விற்றுக் கொண்டிருந்தான். அதைப் பச்சை நிற நாணயங்களைக் கொடுத்து குழந்தைகள் வாங்கிச் செல்வதை டோரத்தி பார்த்தாள். \n\nஅங்கே குதிரைகளோ எந்த விதமான விலங்குகளோ இல்லை. முன்புறமாகத் தள்ளிச்செல்லக்கூடிய பச்சை நிறக் கூடைகளில் இவற்றை மனிதர்களே சுமந்து சென்றனர். அனைவரும் மகிழ்ச்சியாகவும் திருப்தியாகவும் செழிப்பாகவும் இருந்தனர்."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"டோரத்தியும் அவளின் நண்பர்களும் பச்சை நிறக் கண்ணாடிகளை அணிந்திருந்தபோதும், முதல் பார்வையிலேயே எழில்கொஞ்சும் நகரத்தின் அழகில் மயங்கினர். பச்சை நிறச் சலவைக் கற்களால் கட்டப்பட்ட அழகிய வீடுகள் தெருக்களில் அணிவகுத்து நின்றன. அத்துடன் திரும்பும் இடமெல்லாம் மின்னும் மரகதக் கற்களால் அலங்கரிக்கப்பட்டிருந்தன. அவர்கள் அதே பச்சை நிறச் சலவைக் கல்லால் அமைக்கப்பட்டிருந்த நடைபாதையில் நடந்து சென்றனர். அதில் இணைக்கப்பட்டிருந்த தடுப்புகள் மரகதக் கற்களைக் கொண்டு நெருக்கமாகக் கட்டப்பட்டிருந்தன. அவை சூரியனின் ஒளிக்கதிர்களால் பளபளத்தன. ஜன்னல் கண்ணாடிகள் பச்சை நிறக் கண்ணாடியால் கட்டப்பட்டிருந்தன. நகரத்தின் மேலே உள்ள வானமும் பச்சை நிறச் சாயலில் இருந்தது, அத்துடன் சூரியனும் பச்சை நிற ஒளிக்கதிர்களை வீசியது. \n\nஅங்கே நிறைய மனிதர்கள் இருந்தனர். ஆண்கள், பெண்கள், குழந்தைகள் என அனைவரும் நடந்து கொண்டிருந்தனர். அவர்கள் பச்சை நிற ஆடைகளை அணிந்திருந்தனர், அவர்களின் சருமமும் பச்சை நிறத்தில் இருந்தது. டோரத்தியையும் அவளுடன் இருந்த விசித்திரமான நண்பர்களையும் அவர்கள் பிரமிப்புடன் பார்த்தனர். சிங்கத்தைப் பார்த்தவுடன் குழந்தைகள் அனைவரும் ஓடிச்சென்று தங்கள் அம்மாக்களின் பின்னால் ஒளிந்துகொண்டனர். ஆனால் யாரும் அவர்களுடன் பேசவில்லை. அந்தத் தெருவில் நிறைய கடைகள் இருந்தன. அந்தக் கடைகளில் எல்லாமே பச்சை நிறத்தில் இருப்பதை டோரத்தி பார்த்தாள். பச்சை நிற மிட்டாய், பச்சை நிறப் பாப்கார்ன், பச்சை நிறக் காலணிகள், பச்சை நிறத் தொப்பிகள், அனைத்து விதமான பச்சை நிற உடைகள் ஆகியவை விற்பனைக்கு வைக்கப்பட்டிருந்தன. அங்கே ஒருவன் பச்சை நிற எலுமிச்சை ஜூஸ் விற்றுக் கொண்டிருந்தான். அதைப் பச்சை நிற நாணயங்களைக் கொடுத்து குழந்தைகள் வாங்கிச் செல்வதை டோரத்தி பார்த்தாள். \n\nஅங்கே குதிரைகளோ எந்த விதமான விலங்குகளோ இல்லை. முன்புறமாகத் தள்ளிச்செல்லக்கூடிய பச்சை நிறக் கூடைகளில் இவற்றை மனிதர்களே சுமந்து சென்றனர். அனைவரும் மகிழ்ச்சியாகவும் திருப்தியாகவும் செழிப்பாகவும் இருந்தனர்."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"வடிவத்தைத் தேர்ந்தெடுத்தல்"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"தானியங்கு"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"கைமுறை"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"தெளிவுத்திறனை %1$sக்கு மாற்றவா?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"இப்போதிலிருந்து %1$s தெளிவுத்திறனைப் பயன்படுத்த \"சரி\" என்பதைத் தேர்ந்தெடுக்கவும்."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s பயன்முறையில் Dolby Vision ஆதரிக்கப்படவில்லை, எனவே \"மேம்பட்ட காட்சி அமைப்புகளில்\" இது முடக்கப்படும்"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"%1$s வகையை இந்தப் பயன்முறை ஆதரிக்கும். சில டிவிகளில், கூடுதல் HDR வடிவமைப்புகளை இயக்க மேம்படுத்தப்பட்ட HDMIயை இயக்க வேண்டியிருக்கலாம். இது ஆதரிக்கப்படுகிறதா என்று பார்க்க உங்கள் TV அமைப்புகளைச் சரிபார்க்கவும்."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"இந்தப் பயன்முறையை இதில் பயன்படுத்தலாம்: %1$s\nசில டிவிகளில், கூடுதல் HDR வடிவமைப்புகளை இயக்க மேம்படுத்தப்பட்ட HDMIயை இயக்க வேண்டியிருக்கலாம். இதைப் பயன்படுத்த முடிகிறதா என்பதைத் தெரிந்துகொள்ள உங்கள் TV அமைப்புகளைப் பார்க்கவும்."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ரத்துசெய்"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"சரி"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"தற்காலிகச் சேமிப்பு தரவை அழிக்கவா?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"இது, எல்லா ஆப்ஸின் தற்காலிகச் சேமிப்பு தரவை அழிக்கும்."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"இணைக்கப்பட்டது"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"துண்டிக்கப்பட்டது"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"புளுடூத் அமைப்புகளை மாற்ற உங்களுக்கு அனுமதியில்லை."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"டிவி ஆடியோவிற்குப் பயன்படுத்து"</string>
     <string name="send_feedback" msgid="936698637869795473">"கருத்து தெரிவி"</string>
     <string name="launch_help" msgid="2607478763131952469">"உதவி மையம்"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"இந்தச் சாதனத்தை உங்கள் நிறுவனம் நிர்வகிக்கிறது."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"இந்தச் சாதனத்தை நிர்வகிப்பது: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" U+0020"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"மேலும் அறிக"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{கேமரா ஆப்ஸ்}other{கேமரா ஆப்ஸ்}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"கேலெண்டர் ஆப்ஸ்"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"இயக்கு"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"உள்ளமைவு"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> ஐப் பயன்படுத்தவா?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"கடவுச்சொற்கள் தவிர நீங்கள் உள்ளிடும் எல்லா உரையையும் <xliff:g id="SERVICE">%1$s</xliff:g> ஆல் சேகரிக்க முடியும். கிரெடிட் கார்டு எண்கள் போன்ற தனிப்பட்டத் தரவும் இதில் அடங்கும்."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -853,7 +853,7 @@
     <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;இந்த ஆப்ஸை நம்புகிறீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும்&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Password service&gt;%1$s&lt;/xliff:g&gt; ஆனது, உங்கள் திரையில் இருப்பதைப் பயன்படுத்தி, எவற்றையெல்லாம் தன்னிரப்ப முடியும் என்பதைத் தீர்மானிக்கும்."</string>
     <string name="computing_size" msgid="8623916230485437579">"கணக்கிடுகிறது..."</string>
     <string name="title_select_wifi_network" msgid="935820896444071617">"உங்கள் வைஃபை நெட்வொர்க்கைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="accessories_wifi_display_rename_device" msgid="8803397194143132061">"மறுபெயரிடு"</string>
+    <string name="accessories_wifi_display_rename_device" msgid="8803397194143132061">"பெயர் மாற்று"</string>
     <string name="accessories_wifi_display_enable" msgid="2385467074170316302">"வைஃபை காட்சி"</string>
     <string name="accessories_wifi_display_pin_required" msgid="5434960694140426664">"PIN தேவை"</string>
     <string name="whichApplication" msgid="4510042089342879264">"இதைப் பயன்படுத்தி செயலை முடி"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"இணைப்பு வெற்றியடைந்தது"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"அனைத்தையும் காட்டு"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"தேடுகிறது"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"கணக்கைச் சேர்ப்பதற்கென அங்கீகரிப்பாளரின் நோக்கத்தை மீட்டெடுக்க முடியவில்லை."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"கணக்கைச் சேர்க்க முடியவில்லை அல்லது கணக்கு வகை கிடைக்கவில்லை."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"சேனல்கள் &amp; உள்ளீடுகள்"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"சேனல்கள், வெளிப்புற உள்ளீடுகள்"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"சேனல்கள்"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"இவற்றை இயக்கும்:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"இந்தப் பயன்முறை சாதனத்தின் மின்சார உபயோகத்தை அதிகரிக்கக்கூடும் என்பதை நினைவில் கொள்ளுங்கள்."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" பயன்முறையை இயக்குதல்"</string>
+    <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_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 494e7b2d3..0cb6a1ffb 100644
--- a/Settings/res/values-te/energy-modes.xml
+++ b/Settings/res/values-te/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"అవసరమైన నెట్‌వర్క్ ఫీచర్స్"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"తగ్గిన ఎనర్జీ వినియోగం"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"టీవీ ఉపయోగంలో లేనప్పుడు నెట్‌వర్క్ కనెక్షన్‌ను ఆఫ్ చేయండి."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"క్లిష్టమైన అప్‌డేట్‌లు, ఫంక్షన్‌లు"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"సిఫార్సు చేసిన నెట్‌వర్క్ ఫీచర్‌లు"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ఆప్టిమైజ్ చేసిన శక్తి వినియోగం"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"నెట్‌వర్క్ (నెట్‌వర్క్ గల స్టాండ్‌బై)లో టీవీని మేల్కొలిపే ఫీచర్‌లను ఆన్ చేస్తుంది."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"అదనపు నెట్‌వర్క్ ఫీచర్స్"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"పెరిగిన ఎనర్జీ వినియోగం"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"సిఫార్సు చేసిన ఫీచర్‌లకు అదనంగా, టీవీ వినియోగంలో లేనప్పుడు ఈ ఆప్షన్ అదనపు ఫీచర్‌లను ఆన్ చేస్తుంది, అది శక్తి వినియోగాన్ని పెంచుతుంది."</string>
+    <string 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-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 e3f9732df..b41fe23c0 100644
--- a/Settings/res/values-te/strings.xml
+++ b/Settings/res/values-te/strings.xml
@@ -54,7 +54,7 @@
     <string name="applications_category_title" msgid="7112019490898586223">"యాప్‌లు"</string>
     <string name="device_pref_category_title" msgid="8292572846154873762">"పరికర ప్రాధాన్యతలు"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"యాక్సెసిబిలిటీ"</string>
-    <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"రిమోట్‌లు &amp; ఉపకరణాలు"</string>
+    <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"రిమోట్‌లు &amp; యాక్సెసరీలు"</string>
     <string name="display_and_sound_category_title" msgid="9203309625380755860">"డిస్‌ప్లే &amp; సౌండ్"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"సహాయం &amp; ఫీడ్‌బ్యాక్"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"గోప్యత"</string>
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"యాప్ సెట్టింగ్‌లు"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"లొకేషన్, వినియోగం &amp; సమస్య విశ్లేషణ, యాడ్‌లు"</string>
     <string name="add_account" msgid="7386223854837017129">"ఖాతాను జోడించండి"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"తెలియని ఖాతా"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"ఖాతాను తీసివేయండి"</string>
     <string name="account_sync" msgid="4315295293211313989">"సింక్ అయిన యాప్‌లను ఎంచుకోండి"</string>
     <string name="sync_now" msgid="4335217984374620551">"ఇప్పుడే సింక్ చేయి"</string>
@@ -108,7 +109,7 @@
     <string name="device_sound_effects" msgid="2000295001122684957">"సిస్టమ్ ధ్వనులు"</string>
     <string name="device_apps" msgid="2134756632245008919">"అప్లికేషన్‌లు"</string>
     <string name="device_storage" msgid="8540243547121791073">"స్టోరేజ్"</string>
-    <string name="device_reset" msgid="6115282675800077867">"ఫ్యాక్టరీ రీసెట్ చేయి"</string>
+    <string name="device_reset" msgid="6115282675800077867">"ఫ్యాక్టరీ రీసెట్ చేయండి"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"బ్యాకప్ &amp; రీస్టోర్"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"ఫ్యాక్టరీ డేటా రీసెట్"</string>
     <string name="device_calibration" msgid="2907914144048739705">"క్రమాంకనం"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"శాంపిల్ టెక్స్ట్"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"ది వండర్‌ఫుల్ విజర్డ్ ఆఫ్ ఆజ్"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"చాప్టర్ 11: ది వండర్‌ఫుల్ ఎమరాల్డ్ సిటీ ఆఫ్ ఆజ్"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"డొరోతీ అలాగే ఆమె స్నేహితులు కళ్లకు పచ్చని అద్దాలతో సంరక్షించబడినా, అద్భుతమైన మిరిమిట్లుగొలిపే నగర ప్రకాశాన్ని సందర్శిస్తున్నారు. ప్రతీచోటా మెరిసే పచ్చని రాళ్లతో పొదగబడి ఉన్న ఆకుపచ్చటి పాలరాతితో నిర్మించబడిన అందమైన ఇళ్లతో వీధులు తీర్చిదిద్దబడ్డాయి. వాళ్లు సూర్యకాంతికి మెరుస్తున్న, దగ్గరగా నిర్మితమై ఉన్న, పచ్చల రాళ్లు అన్నీ కలిసి ఉన్న అదే ఆకు పచ్చని పాలరాతిపై నడుస్తున్నారు. కిటికీ అద్దాలు ఆకుపచ్చగా ఉన్నాయి; నగరం పైన ఆకాశం కూడా ఆకుపచ్చ రంగులో ఉంది, సూర్య కిరణాలు కూడా ఆకుపచ్చగా ఉన్నాయి. \n\nఅక్కడ చాలా మంది ఆకు పచ్చని చర్మంతో గల స్త్రీలు, పురుషులు అలాగే పిల్లలు ఆకు పచ్చని దుస్తులతో నడుస్తున్నారు. వాళ్లు డొరోతీని, ఆమె ఇతర స్నేహితులను వింతగా ఆశ్చర్యంగా చూశారు. సింహాన్ని చూసినప్పుడు పిల్లలందరూ పారిపోయి, వారి తల్లిదండ్రుల వెనుక దాగిన విధంగా, కానీ వారితో ఎవరూ మాట్లాడలేదు, వీధిలో చాలా దుకాణాలు ఉన్నాయి. డొరోతీకి అక్కడ ఉన్న అంశాలన్నీ పచ్చగా కనిపించాయి పచ్చని మిఠాయిలు అలాగే పచ్చని పాప్-కార్న్ అమ్మబడుతున్నాయి, అలాగే పచ్చని చెప్పులు, పచ్చని టోపీలు, పచ్చని దుస్తులు కనిపిస్తున్నాయి. ఒక చోట ఒక వ్యక్తి పచ్చని నిమ్మరసాన్ని అమ్ముతుండటం, పిల్లలు వాటి కోసం పచ్చని నాణేలను ఇవ్వడాన్ని డోరోతీ చూస్తోంది. \n\nఅక్కడ ఎటువంటి గుర్రాలు అలాగే ఎటువంటి జంతువులూ లేవు; వ్యక్తులే వస్తువులను పచ్చని బండ్లతో లాగుతున్నారు. ప్రతి ఒక్కరూ చాలా ఆనందంగా, సంతృప్తిగా ఉన్నారు."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"డొరోతీ అలాగే ఆమె స్నేహితులు కళ్లకు పచ్చని అద్దాలతో సంరక్షించబడినా, అద్భుతమైన మిరిమిట్లుగొలిపే నగర ప్రకాశాన్ని సందర్శిస్తున్నారు. ప్రతిచోటా మెరిసే పచ్చని రాళ్లతో పొదగబడి ఉన్న ఆకుపచ్చటి పాలరాతితో నిర్మించబడిన అందమైన ఇళ్లతో వీధులు తీర్చిదిద్దబడ్డాయి. వాళ్లు సూర్యకాంతికి మెరుస్తున్న, దగ్గరగా నిర్మితమై ఉన్న, పచ్చల రాళ్లు అన్నీ కలిసి ఉన్న అదే ఆకు పచ్చని పాలరాతిపై నడుస్తున్నారు. కిటికీ అద్దాలు ఆకుపచ్చగా ఉన్నాయి; నగరం పైన ఆకాశం కూడా ఆకుపచ్చ రంగులో ఉంది, సూర్య కిరణాలు కూడా ఆకుపచ్చగా ఉన్నాయి. \n\nఅక్కడ చాలా మంది ఆకు పచ్చని చర్మంతో గల స్త్రీలు, పురుషులు అలాగే పిల్లలు ఆకు పచ్చని దుస్తులతో నడుస్తున్నారు. వాళ్లు డొరోతీని, ఆమె ఇతర స్నేహితులను వింతగా ఆశ్చర్యంగా చూశారు. సింహాన్ని చూసినప్పుడు పిల్లలందరూ పారిపోయి, వారి తల్లిదండ్రుల వెనుక దాగిన విధంగా, కానీ వారితో ఎవరూ మాట్లాడలేదు, వీధిలో చాలా దుకాణాలు ఉన్నాయి; డొరోతీకి అక్కడ ఉన్న అంశాలన్నీ పచ్చగా కనిపించాయి పచ్చని మిఠాయిలు అలాగే పచ్చని పాప్-కార్న్ అమ్మబడుతున్నాయి, అలాగే పచ్చని చెప్పులు, పచ్చని టోపీలు, పచ్చని దుస్తులు కనిపిస్తున్నాయి. ఒక చోట ఒక వ్యక్తి పచ్చని నిమ్మరసాన్ని అమ్ముతుండటం, పిల్లలు వాటి కోసం పచ్చని నాణేలను ఇవ్వడాన్ని డోరోతీ చూస్తోంది. \n\nఅక్కడ ఎటువంటి గుర్రాలు అలాగే ఎటువంటి జంతువులూ లేవు; వ్యక్తులే వస్తువులను పచ్చని బండ్లతో లాగుతున్నారు. అందరూ చాలా ఆనందంగా, సంతృప్తిగా ఉన్నారు."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"ఫార్మాట్ ఎంపిక"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"ఆటోమేటిక్"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"మాన్యువల్"</string>
@@ -218,16 +219,15 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"రిజల్యూషన్‌ను %1$s‌కు మార్చాలా?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"ఇప్పటి నుండి %1$s రిజల్యూషన్‌ను ఉపయోగించడానికి \'సరే\'ను ఎంచుకోండి."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s‌లో Dolby Vision సపోర్ట్ చేయదు, \"అధునాతన డిస్‌ప్లే సెట్టింగ్‌ల\"లో అది డిజేబుల్ చేయబడుతుంది"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"ఈ మోడ్ %1$s‌ను సపోర్ట్ చేస్తోంది. కొన్ని టీవీలలో, మరిన్ని HDR ఫార్మాట్‌లను ఎనేబుల్ చేయడానికి, మీరు మెరుగుపరిచిన HDMIని ఆన్ చేయవలసి రావచ్చు. ఇది సపోర్ట్ చేస్తుందో, లేదో చూడటానికి మీ టీవీ సెట్టింగ్‌లను చెక్ చేయండి."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"ఈ మోడ్ ఈ కింది వాటికి సపోర్ట్ చేస్తుంది: %1$s\nకొన్ని టీవీలలో, మరిన్ని HDR ఫార్మాట్‌లను ఎనేబుల్ చేయడానికి, మీరు మెరుగుపరిచిన HDMIని ఆన్ చేయవలసి రావచ్చు. ఇది సపోర్ట్ చేస్తుందో, లేదో చూడటానికి మీ టీవీ సెట్టింగ్‌లను చెక్ చేయండి."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"రద్దు చేయండి"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"సరే"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"కాష్ చేసిన డేటాను తీసివేయాలా?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"ఇది అన్ని అను. కాష్ చేసిన డేటాను తీసివేస్తుంది."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
-    <string name="accessories_add" msgid="413764175035531452">"ఉపకరణాన్ని జోడించండి"</string>
+    <string name="accessories_add" msgid="413764175035531452">"యాక్సెసరీని జోడించండి"</string>
     <string name="accessory_state_pairing" msgid="15908899628218319">"జత చేస్తోంది..."</string>
     <string name="accessory_state_connecting" msgid="6560241025917621212">"కనెక్ట్ అవుతోంది…"</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"జత చేయడం సాధ్యపడలేదు"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"కనెక్ట్ చేయబడింది"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"డిస్‌కనెక్ట్ అయింది"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"మీకు బ్లూటూత్ సెట్టింగ్‌లను మార్చడానికి అనుమతి లేదు."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"టీవీ ఆడియో కోసం ఉపయోగించండి"</string>
     <string name="send_feedback" msgid="936698637869795473">"ఫీడ్‌బ్యాక్ పంపండి"</string>
     <string name="launch_help" msgid="2607478763131952469">"సహాయ కేంద్రం"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"ఈ పరికరాన్ని మీ సంస్థ నిర్వహిస్తోంది."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా నిర్వహించబడుతోంది."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"మరింత తెలుసుకోండి"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{కెమెరా యాప్}other{కెమెరా యాప్‌లు}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"క్యాలెండర్ యాప్"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"ఎనేబుల్ చేయండి"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"కాన్ఫిగరేషన్"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\'ను ఉపయోగించాలా?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> పాస్‌వర్డ్‌లు మినహా మీరు టైప్ చేసిన మొత్తం వచనాన్ని సేకరించగలదు. ఇందులో క్రెడిట్ కార్డ్ నంబర్‌ల వంటి వ్యక్తిగత డేటా ఉంటుంది."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -834,10 +834,10 @@
     <string name="track_frame_time_bars" msgid="5841531515222229632">"స్క్రీన్‌లో బార్‌ల రూపంలో"</string>
     <string name="app_process_limit_standard" msgid="6069948528843313888">"స్టాండర్డ్ పరిమితి"</string>
     <string name="app_process_limit_zero" msgid="4094665021909774994">"నేపథ్య ప్రాసెస్‌లు లేవు"</string>
-    <string name="app_process_limit_one" msgid="4509089015775863726">"గరిష్టంగా 1 ప్రాసెస్"</string>
-    <string name="app_process_limit_two" msgid="368216781690488529">"గరిష్టంగా 2 ప్రాసెస్‌లు"</string>
-    <string name="app_process_limit_three" msgid="2191860654645796987">"గరిష్టంగా 3 ప్రాసెస్‌లు"</string>
-    <string name="app_process_limit_four" msgid="9186705437061005461">"గరిష్టంగా 4 ప్రాసెస్‌లు"</string>
+    <string name="app_process_limit_one" msgid="4509089015775863726">"గరిష్ఠంగా 1 ప్రాసెస్"</string>
+    <string name="app_process_limit_two" msgid="368216781690488529">"గరిష్ఠంగా 2 ప్రాసెస్‌లు"</string>
+    <string name="app_process_limit_three" msgid="2191860654645796987">"గరిష్ఠంగా 3 ప్రాసెస్‌లు"</string>
+    <string name="app_process_limit_four" msgid="9186705437061005461">"గరిష్ఠంగా 4 ప్రాసెస్‌లు"</string>
     <string name="tts_rate_very_slow" msgid="1927454053669655117">"చాలా నెమ్మది"</string>
     <string name="tts_rate_slow" msgid="7668484707347561166">"నెమ్మది"</string>
     <string name="tts_rate_normal" msgid="3631458247079252628">"సాధారణం"</string>
@@ -910,9 +910,9 @@
     <string name="pin_enter_new_pin" msgid="1930944619313642621">"కొత్త పిన్‌ని సెట్ చేయండి"</string>
     <string name="pin_enter_again" msgid="7615050143778858658">"కొత్త పిన్‌ని మళ్లీ నమోదు చేయండి"</string>
     <string name="pin_enter_old_pin" msgid="5665265735227617942">"పాత పిన్‌ని నమోదు చేయండి"</string>
-    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"మీరు 5 సార్లు తప్పు PIN నమోదు చేశారు.\n<xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> సెకన్లలో మళ్లీ ప్రయత్నించండి."</string>
-    <string name="pin_toast_wrong" msgid="4297542365877164402">"తప్పు పిన్, మళ్లీ ప్రయత్నించండి"</string>
-    <string name="pin_toast_not_match" msgid="2439298696342975155">"మళ్లీ ప్రయత్నించండి, పిన్ సరిపోలలేదు"</string>
+    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"మీరు 5 సార్లు తప్పు PIN నమోదు చేశారు.\n<xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> సెకన్లలో మళ్లీ ట్రై చేయండి."</string>
+    <string name="pin_toast_wrong" msgid="4297542365877164402">"తప్పు పిన్, మళ్లీ ట్రై చేయండి"</string>
+    <string name="pin_toast_not_match" msgid="2439298696342975155">"మళ్లీ ట్రై చేయండి, పిన్ సరిపోలలేదు"</string>
     <string name="wifi_setup_input_password" msgid="8510003548463241234">"<xliff:g id="SSID">%1$s</xliff:g> కోసం పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
     <string name="wifi_setup_description" msgid="6843574399437584520">"కొనసాగించడానికి, <xliff:g id="WIFI_SUBMIT_ICON">%1$s</xliff:g>ను ఎంచుకోండి."</string>
     <string name="label_done_key" msgid="8576286462300373440">"పూర్తయింది"</string>
@@ -978,7 +978,7 @@
     <string name="privacy_backup_data" msgid="3604057980102997914">"నా డేటాను బ్యాకప్ చేయి"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"బ్యాకప్ చేయాల్సిన ఖాతా"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"ఆటోమేటిక్ పున‌రుద్ధ‌ర‌ణ‌"</string>
-    <string name="factory_reset_device" msgid="6509900821515094361">"పరికరాన్ని రీసెట్ చేయి"</string>
+    <string name="factory_reset_device" msgid="6509900821515094361">"పరికరాన్ని రీసెట్ చేయండి"</string>
     <string name="factory_reset_description" msgid="6697396335158766785">"ఇది మీ పరికరాన్ని ఆటోమేటిక్‌గా సెట్ చేయబడి ఉండే సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది, అలాగే డేటా, ఖాతాలు, ఫైళ్లు, డౌన్‌లోడ్ చేయబడిన యాప్‌లు అన్నిటినీ తొలగిస్తుంది."</string>
     <string name="factory_reset_info_description" msgid="5098454670833183487">"ఇది మీ పరికరాన్ని ఆటోమేటిక్‌గా సెట్ చేయబడి ఉండే సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది, అలాగే డేటా, ఖాతాలు, ఫైళ్లు, డౌన్‌లోడ్ చేయబడిన యాప్‌లు అన్నిటినీ తొలగిస్తుంది."</string>
     <string name="factory_reset_content_description" msgid="1677022688420116803">"ఫ్యాక్టరీ రీసెట్, ఇది మీ పరికరాన్ని ఆటోమేటిక్‌గా సెట్ చేయబడి ఉండే సెట్టింగ్‌లకు రీస్టోర్ చేస్తుంది, అలాగే డేటా, ఖాతాలు, ఫైళ్లు, డౌన్‌లోడ్ చేయబడిన యాప్‌లు అన్నిటినీ తొలగిస్తుంది."</string>
@@ -1083,7 +1083,7 @@
     <string name="admin_profile_owner_message" msgid="5729169873349157622">"సెట్టింగ్‌లు, అనుమతులు, కార్పొరేట్ యాక్సెస్, నెట్‌వర్క్ యాక్టివిటీ మరియు పరికరం యొక్క లొకేషన్ సమాచారంతో పాటు మీ కార్యాలయ ప్రొఫైల్‌కి అనుబంధితంగా ఉన్న యాప్‌లు మరియు డేటాను మీ అడ్మిన్ పర్యవేక్షించగలరు, మేనేజ్ చేయగలరు."</string>
     <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"సెట్టింగ్‌లు, అనుమతులు, కార్పొరేట్ యాక్సెస్, నెట్‌వర్క్ యాక్టివిటీ మరియు పరికరపు లొకేషన్ సమాచారంతో పాటు ఈ యూజర్‌కు అనుబంధితంగా ఉన్న యాప్‌లు ఇంకా డేటాను మీ అడ్మిన్ పర్యవేక్షించగలరు, మేనేజ్ చేయగలరు."</string>
     <string name="admin_device_owner_message" msgid="1935507216776040907">"సెట్టింగ్‌లు, అనుమతులు, కార్పొరేట్ యాక్సెస్, నెట్‌వర్క్ యాక్టివిటీ మరియు పరికరం  యొక్క లొకేషన్ సమాచారంతో పాటు ఈ పరికరానికి అనుబంధితంగా ఉన్న యాప్‌లు మరియు డేటాను మీ అడ్మిన్లు పర్యవేక్షించగలరు, మేనేజ్ చేయగలరు."</string>
-    <string name="remove_managed_profile_label" msgid="8950011141359605612">"ఆఫీస్ ప్రొఫైల్‌ను తీసివేయండి"</string>
+    <string name="remove_managed_profile_label" msgid="8950011141359605612">"వర్క్ ప్రొఫైల్‌ను తీసివేయండి"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"డివైజ్ నిర్వాహకుల యాప్"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"ఈ పరికర అడ్మిన్ యాప్‌ను డీయాక్టివేట్ చేయి"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"యాప్‌ను అన్‌ఇన్‌స్టాల్ చేయి"</string>
@@ -1108,10 +1108,12 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"విజయవంతంగా కనెక్ట్ చేయబడింది"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"అన్నీ చూపించు"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"వెతుకుతోంది"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"ఆథెంటికేటర్ నుండి ఖాతాను జోడించే ఉద్దేశాన్ని తిరిగి పొందడం విఫలమైంది."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"ఖాతాను జోడించడం విఫలమైంది లేదా ఖాతా రకం అందుబాటులో లేదు."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ఛానెళ్లు &amp; ఇన్‌పుట్‌లు"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ఛానెళ్లు, బాహ్య ఇన్‌పుట్‌లు"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ఛానెళ్లు"</string>
-    <string name="external_inputs_settings_title" msgid="8937038060355986380">"బాహ్య ఇన్‌పుట్‌లు"</string>
+    <string name="external_inputs_settings_title" msgid="8937038060355986380">"ఎక్స్‌టర్నల్ ఇన్‌పుట్‌లు"</string>
     <string name="display_and_sound_vendor_summary" msgid="7661072343315403110">"పిక్చర్, స్క్రీన్, సౌండ్"</string>
     <string name="picture_settings_title" msgid="7643193630924322697">"పిక్చర్"</string>
     <string name="screen_settings_title" msgid="7806908869190824434">"స్క్రీన్"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ఎనేబుల్ చేయబడినవి:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"ఈ మోడ్ పరికరం తాలూకు విద్యుత్ వినియోగాన్ని పెంచుతుందని గమనించండి."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\"ను ఎనేబుల్ చేయండి"</string>
+    <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_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 a8b5a4811..c48614c56 100644
--- a/Settings/res/values-th/energy-modes.xml
+++ b/Settings/res/values-th/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"ฟีเจอร์ที่สำคัญของเครือข่าย"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"ใช้พลังงานลดลง"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"ปิดการเชื่อมต่อเครือข่ายเมื่อไม่ได้ใช้งานทีวี"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"การอัปเดตและฟังก์ชันที่สำคัญ"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"ฟีเจอร์ที่แนะนำของเครือข่าย"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"ใช้พลังงานเหมาะสม"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"เปิดฟีเจอร์ที่ปลุกระบบทีวีผ่านเครือข่าย (โหมดสแตนด์บายที่เชื่อมต่อเครือข่าย)"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[ใส่ฟีเจอร์ 1]"</item>
     <item msgid="8724721267222341891">"[ใส่ฟีเจอร์ 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"ฟีเจอร์เพิ่มเติมของเครือข่าย"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"ใช้พลังงานมากขึ้น"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"นอกจากฟีเจอร์ที่แนะนำแล้ว ตัวเลือกนี้จะเปิดฟีเจอร์เพิ่มเติมเมื่อไม่ได้ใช้งานทีวีด้วย ซึ่งอาจทำให้ใช้พลังงานมากขึ้น"</string>
+    <string 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-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 aa92c35b6..3b58b1978 100644
--- a/Settings/res/values-th/strings.xml
+++ b/Settings/res/values-th/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"การตั้งค่าแอป"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"ตำแหน่ง, การใช้งานและการวินิจฉัย, โฆษณา"</string>
     <string name="add_account" msgid="7386223854837017129">"เพิ่มบัญชี"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"บัญชีที่ไม่รู้จัก"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"นำบัญชีออก"</string>
     <string name="account_sync" msgid="4315295293211313989">"เลือกแอปที่ซิงค์"</string>
     <string name="sync_now" msgid="4335217984374620551">"ซิงค์เลย"</string>
@@ -152,7 +153,7 @@
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"การตั้งค่าเสียงขั้นสูง"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"อนุญาตโหมดเกม"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"จับคู่ช่วงไดนามิกของเนื้อหา"</string>
-    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"เมื่อเปิดใช้ตัวเลือกนี้ ระบบจะสลับเปลี่ยนระหว่างรูปแบบช่วงไดนามิกเพื่อให้ตรงตามเนื้อหา ซึ่งอาจจะทำให้จอดำได้ในระหว่างที่เปลี่ยน\n\nคลิกที่การตั้งค่า \"การแสดงผลขั้นสูง\" เพื่อดูช่วงไดนามิกอื่นๆ เพิ่ม"</string>
+    <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"เมื่อเปิดใช้ตัวเลือกนี้ ระบบจะสลับเปลี่ยนรูปแบบช่วงไดนามิกต่างๆ ให้ตรงตามเนื้อหา ซึ่งอาจจะทำให้จอดำได้ในระหว่างที่เปลี่ยน\n\nคลิกที่การตั้งค่า \"การแสดงผลขั้นสูง\" เพื่อดูตัวเลือกช่วงไดนามิกอื่นๆ เพิ่มเติม"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ช่วงไดนามิกที่ต้องการ"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"การแปลงตามที่ระบบต้องการ"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"ให้ระบบจัดการการแปลงรูปแบบ"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ข้อความตัวอย่าง"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"พ่อมดมหัศจรรย์แห่งออซ"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"บทที่ 11: เมืองมรกตมหัศจรรย์แห่งออซ"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"แม้ว่าจะสวมแว่นสีเขียวเพื่อปกป้องสายตาไว้แล้ว แต่โดโรธีและผองเพื่อนก็อดไม่ได้ที่จะตกตะลึงกับความงดงามเมื่อแรกเห็นของเมืองอันน่าอัศจรรย์นี้ ท้องถนนมีบ้านเรือนที่สวยงามสร้างจากหินอ่อนสีเขียวประดับด้วยมรกตแวววาวเป็นประกายเต็มไปหมด เธอและเพื่อนๆ เดินไปบนทางเท้าทำจากหินอ่อนสีเขียวเหมือนกัน ร่องระหว่างหินอ่อนแต่ละก้อนโรยด้วยมรกตเรียงเบียดกันเป็นแถว ส่องประกายวาววับเมื่อจับต้องกับแสงแดด บานหน้าต่างทำจากกระจกสีเขียว แม้แต่ท้องฟ้าที่ปกคลุมเมืองนี้ยังมีสีอมเขียวอ่อนๆ แสงอาทิตย์ที่ส่องลงมาก็เป็นสีเขียวเช่นกัน \n\nมีผู้คนเดินไปมาอยู่มากมาย ทั้งผู้ชาย ผู้หญิง และเด็ก ทุกคนล้วนแต่งตัวด้วยเสื้อผ้าสีเขียวและมีผิวพรรณออกสีเขียวๆ ผู้คนต่างพากันจ้องมองมาที่โดโรธีและผองเพื่อนหลากหลายเผ่าพันธุ์ด้วยสายตาที่ฉงนสงสัย เด็กๆ พากันวิ่งหนีและไปซ่อนข้างหลังแม่ของตนเมื่อเห็นเจ้าราชสีห์ แต่ไม่มีใครพูดคุยกับพวกเขาเลย ร้านค้ามากมายเรียงรายบนท้องถนน และโดโรธีเห็นว่าทุกอย่างในร้านเหล่านี้เป็นสีเขียว มีการขายลูกอมและข้าวโพดคั่วสีเขียว รวมถึงรองเท้าสีเขียว หมวกสีเขียว และเสื้อผ้าสีเขียวหลากหลายรูปแบบ มีร้านหนึ่งขายน้ำมะนาวสีเขียว และเมื่อมีเด็กไปซื้อน้ำมะนาว โดโรธีก็เห็นว่าเด็กๆ จ่ายเงินด้วยเหรียญสีเขียว \n\nดูเหมือนว่าเมืองนี้จะไม่มีม้าหรือสัตว์ชนิดอื่นใดเลย ผู้คนขนของกันด้วยรถเข็นเล็กๆ สีเขียวแบบที่ต้องเข็นไปข้างหน้า ทุกคนแลดูมีความสุข ปลื้มปีติ และมั่งคั่ง"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"แม้ว่าจะสวมแว่นสีเขียวเพื่อปกป้องสายตาไว้แล้ว แต่โดโรธีและผองเพื่อนก็อดไม่ได้ที่จะตกตะลึงกับความงดงามเมื่อแรกเห็นของเมืองอันน่าอัศจรรย์นี้ ท้องถนนมีบ้านเรือนที่สวยงามสร้างจากหินอ่อนสีเขียวประดับด้วยมรกตแวววาวเป็นประกายเต็มไปหมด เธอและเพื่อนๆ เดินไปบนทางเท้าทำจากหินอ่อนสีเขียวเหมือนกัน ร่องระหว่างหินอ่อนแต่ละก้อนโรยด้วยมรกตเรียงเบียดกันเป็นแถว ส่องประกายวาววับเมื่อจับต้องกับแสงแดด บานหน้าต่างทำจากกระจกสีเขียว แม้แต่ท้องฟ้าที่ปกคลุมเมืองนี้ยังมีสีอมเขียวอ่อนๆ แสงอาทิตย์ที่ส่องลงมาก็เป็นสีเขียวเช่นกัน \n\nมีผู้คนเดินไปมาอยู่มากมาย ทั้งผู้ชาย ผู้หญิง และเด็ก ทุกคนล้วนแต่งตัวด้วยเสื้อผ้าสีเขียวและมีผิวพรรณออกสีเขียวๆ ผู้คนต่างพากันจ้องมองมาที่โดโรธีและผองเพื่อนหลากหลายเผ่าพันธุ์ด้วยสายตาที่ฉงนสงสัย เด็กๆ พากันวิ่งหนีและไปซ่อนข้างหลังแม่ของตนเมื่อเห็นเจ้าราชสีห์ แต่ไม่มีใครพูดกับพวกเขาเลย ร้านค้ามากมายเรียงรายบนท้องถนน และโดโรธีเห็นว่าทุกอย่างในร้านเหล่านี้ล้วนเป็นสีเขียว มีการขายลูกอมและข้าวโพดคั่วสีเขียว รวมถึงรองเท้าสีเขียว หมวกสีเขียว และเสื้อผ้าสีเขียวหลากหลายรูปแบบ มีร้านหนึ่งขายน้ำมะนาวสีเขียว และเมื่อมีเด็กไปซื้อน้ำมะนาว โดโรธีก็เห็นว่าเด็กๆ จ่ายเงินด้วยเหรียญสีเขียว \n\nดูเหมือนว่าเมืองนี้จะไม่มีม้าหรือสัตว์ชนิดอื่นใดเลย ผู้คนขนของกันด้วยรถเข็นเล็กๆ สีเขียวแบบที่ต้องเข็นไปข้างหน้า ทุกคนแลดูมีความสุข ปลื้มปีติ และมั่งคั่ง"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"การเลือกรูปแบบ"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"อัตโนมัติ"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"เลือกด้วยตนเอง"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"เปลี่ยนความละเอียดเป็น %1$s ไหม"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"เลือก \"ตกลง\" เพื่อเริ่มใช้ %1$s"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision ไม่รองรับ %1$s และจะถูกปิดใน \"การตั้งค่าจอแสดงผลขั้นสูง\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"โหมดนี้รองรับ %1$s ในทีวีบางเครื่อง คุณอาจต้องเปิด HDMI ที่ได้รับการปรับปรุงเพื่อเปิดใช้งานรูปแบบ HDR เพิ่มเติม ไปที่การตั้งค่าของทีวีเพื่อดูว่ารับรองฟีเจอร์นี้ไหม"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"โหมดนี้รองรับ %1$s\nในทีวีบางเครื่อง คุณอาจต้องเปิด HDMI ที่ได้รับการปรับปรุงเพื่อเปิดใช้งานรูปแบบ HDR เพิ่มเติม ไปที่การตั้งค่าของทีวีเพื่อดูว่ารับรองฟีเจอร์นี้ไหม"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"ยกเลิก"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ตกลง"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"ล้างข้อมูลในแคชไหม"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"การทำงานนี้จะล้างข้อมูลในแคชของแอปทั้งหมด"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"เชื่อมต่อแล้ว"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"เลิกเชื่อมต่อแล้ว"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"คุณไม่มีสิทธิ์ในการเปลี่ยนการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"ใช้สำหรับเสียงทีวี"</string>
     <string name="send_feedback" msgid="936698637869795473">"ส่งความเห็น"</string>
     <string name="launch_help" msgid="2607478763131952469">"ศูนย์ช่วยเหลือ"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"อุปกรณ์นี้จัดการโดยองค์กรของคุณ"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"อุปกรณ์เครื่องนี้จัดการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"ดูข้อมูลเพิ่มเติม"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{แอปกล้อง}other{แอปกล้อง}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"แอปปฏิทิน"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"เปิดใช้"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"การกำหนดค่า"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> สามารถเก็บรวบรวมข้อความที่คุณพิมพ์ทั้งหมด ยกเว้นรหัสผ่าน โดยรวมถึงข้อมูลส่วนตัวต่างๆ เช่น หมายเลขบัตรเครดิต"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -800,7 +800,7 @@
     <string name="system_desc_bt_hci_log" msgid="2592649923221658103">"เปิดใช้งานการบันทึกสอดแนมบลูทูธ HCI"</string>
     <string name="system_desc_usb_debugging" msgid="5672275208185222785">"โหมดแก้ปัญหาเมื่อเชื่อมต่อ USB"</string>
     <string name="system_desc_wait_for_debugger" msgid="7213496668606417691">"แอปที่ถูกแก้จะรอให้เครื่องซ่อมแซมเพิ่มก่อนทำงาน"</string>
-    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
+    <string name="system_desc_show_layout_bounds" msgid="5275008598296135852">"แสดงขอบคลิป ระยะขอบ ฯลฯ"</string>
     <string name="system_desc_show_gpu_view_updates" msgid="9088343415389734854">"แสดงมุมมองภายในหน้าต่างเมื่อวาดด้วย GPU"</string>
     <string name="system_desc_show_hardware_layer" msgid="3483713991865249527">"แสดงเลเยอร์ฮาร์ดแวร์เป็นสีเขียวเมื่อมีการอัปเดต"</string>
     <string name="system_desc_show_gpu_overdraw" msgid="74019834911598588">"จากดีที่สุดไปหาแย่ที่สุด: ฟ้า เขียว แดงอ่อน แดง"</string>
@@ -1029,7 +1029,7 @@
     <string name="directory_access" msgid="7338555825237012006">"การเข้าถึงไดเรกทอรี"</string>
     <string name="directory_access_description" msgid="3630855858552422012">"แอปเหล่านี้มีสิทธิ์เข้าถึงบางไดเรกทอรี"</string>
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
-    <string name="system_alert_window_settings" msgid="5790572489650085051">"แสดงทับแอปอื่นๆ"</string>
+    <string name="system_alert_window_settings" msgid="5790572489650085051">"แสดงทับบนแอปอื่นๆ"</string>
     <string name="permit_draw_overlay" msgid="5312730681030266735">"อนุญาตให้แสดงทับแอปอื่นๆ"</string>
     <string name="allow_overlay_description" msgid="5152329837278240259">"อนุญาตให้แอปแสดงทับแอปอื่นๆ ที่คุณกำลังใช้อยู่ ซึ่งอาจรบกวนการใช้งานแอปเหล่านั้นหรือเปลี่ยนรูปลักษณ์หรือการทำงานตามที่ควรเป็น"</string>
     <string name="write_system_settings" msgid="4284654265954461890">"แก้ไขการตั้งค่าระบบ"</string>
@@ -1091,7 +1091,7 @@
     <string name="select_device_admin_msg" msgid="8475934459999710332">"แอปผู้ดูแลระบบอุปกรณ์"</string>
     <string name="add_device_admin_msg" msgid="5390773166682603421">"เปิดใช้งานแอปผู้ดูแลระบบอุปกรณ์ไหม"</string>
     <string name="add_device_admin" msgid="5078281377915844544">"เปิดใช้งานแอปผู้ดูแลระบบอุปกรณ์นี้"</string>
-    <string name="device_admin_warning" msgid="7399916080685200660">"การเปิดใช้งานแอปผู้ดูแลระบบนี้จะอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
+    <string name="device_admin_warning" msgid="7399916080685200660">"การเปิดใช้งานแอปผู้ดูแลนี้จะอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"<xliff:g id="APP_NAME">%1$s</xliff:g> จะเป็นผู้จัดการและตรวจสอบอุปกรณ์นี้"</string>
     <string name="device_admin_status" msgid="5467001937240455367">"แอปผู้ดูแลระบบนี้ทำงานอยู่และอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
     <string name="adding_profile_owner_warning" msgid="3888867082224127564">"การดำเนินการต่อจะทำให้ผู้ใช้ของคุณได้รับการจัดการโดยผู้ดูแลระบบ ซึ่งอาจจัดเก็บข้อมูลที่เกี่ยวข้องนอกเหนือจากข้อมูลส่วนบุคคลของคุณได้ด้วย\n\nผู้ดูแลระบบสามารถตรวจสอบและจัดการการตั้งค่า การเข้าถึง แอป และข้อมูลที่เชื่อมโยงกับผู้ใช้นี้ รวมถึงกิจกรรมเครือข่ายและข้อมูลตำแหน่งของอุปกรณ์"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"เชื่อมต่อสำเร็จ"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"แสดงทั้งหมด"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"กำลังค้นหา"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"เรียก Intent การเพิ่มบัญชีจาก Authenticator ไม่สำเร็จ"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"เพิ่มบัญชีไม่สำเร็จหรือประเภทบัญชีไม่พร้อมใช้งาน"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"ช่องและอินพุต"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"ช่อง อินพุตภายนอก"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"ช่อง"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"ฟีเจอร์ที่เปิดใช้"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"โปรดทราบว่าโหมดนี้อาจทำให้อุปกรณ์ใช้พลังงานมากขึ้น"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"เปิดใช้ \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 2b6cfd876..a90f2232d 100644
--- a/Settings/res/values-tl/energy-modes.xml
+++ b/Settings/res/values-tl/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Mahahalagang feature ng network"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mababang paggamit ng kuryente"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"I-off ang koneksyon sa network kapag hindi ginagamit ang TV."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Mga kritikal na update at function"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Mga inirerekomendang feature ng network"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Naka-optimize na paggamit ng kuryente"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ino-on ang mga feature na wine-wake ang TV sa pamamagitan ng network (naka-network na standby)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Mga karagdagang feature ng network"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Mas mataas ng paggamit ng kuryente"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Bukod pa sa mga inirerekomendang feature, io-on ng opsyong ito ang mga karagdagang feature kapag hindi ginagamit ang TV na posibleng makapagpataas sa paggamit ng kuryente."</string>
+    <string 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-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 2027c5bb2..e04465dd1 100644
--- a/Settings/res/values-tl/strings.xml
+++ b/Settings/res/values-tl/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Mga Setting ng App"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Lokasyon, Paggamit at Diagnostics, Mga Ad"</string>
     <string name="add_account" msgid="7386223854837017129">"Magdagdag ng account"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Hindi Kilalang Account"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Alisin ang account"</string>
     <string name="account_sync" msgid="4315295293211313989">"Pumili ng naka-sync na apps"</string>
     <string name="sync_now" msgid="4335217984374620551">"Mag-sync ngayon"</string>
@@ -147,11 +148,11 @@
     <string name="surround_sound_disabled_format_info_clicked" msgid="463393349034930031">"Para i-enable, gawing Manual ang pagpili ng format."</string>
     <string name="surround_sound_enabled_format_info_clicked" msgid="4003154853054756792">"Para i-disable, gawing Manual ang pagpili ng format."</string>
     <string name="display_category_title" msgid="247804007525046312">"Display"</string>
-    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Advanced na mga setting ng display"</string>
+    <string name="advanced_display_settings_title" msgid="6293280819870140631">"Mga advanced na setting ng display"</string>
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Advanced na mga setting ng tunog"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"Payagan ang game mode"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Tumugma sa dynamic range ng content"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Itugma sa dynamic range ng content"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Kapag na-enable ang opsyong ito, lilipat ang system sa pagitan ng iba\'t ibang format ng dynamic range para tumugma sa content. Posibleng magdulot ito ng black screen habang lumilipat ng format.\n\nI-click ang mga setting sa Advanced na Display para sa higit pang opsyon sa dynamic range."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Gustong dynamic range"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Conversion na mas gusto ng system"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Sample na text"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Kabanata 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Kahit na pinoprotektahan ng kulay berdeng salamin ang kanilang mga mata, nasilaw si Dorothy at ang kanyang mga kaibigan sa kislap ng kamangha-manghang Lungsod. Nakalinya sa kalsada ang magagandang bahay na gawa sa berdeng marmol at punung-puno ng mga kumikinang na esmeralda. Naglakad sila sa kalsadang gawa rin sa berdeng marmol, may mga esmeraldang nakalagay nang magkakalapit at nakapila kung saan magkadikit ang mga bloke, at kumukutikutitap ang mga ito sa ningning ng araw. Gawa sa kulay berdeng salamin ang mga bintana; may tint na berde maging ang langit sa itaas ng Lungsod, at kulay berde ang mga sinag ng araw. \n\nMaraming tao roon, mga lalaki, babae, at bata, naglalakad-lakad, at nakasuot lahat sila ng mga damit na kulay berde at kulay berde rin ang mga balat nila. Namamangha nilang tiningnan si Dorothy at ang mga kasama niyang kakaiba ang pagkakasari-sari, at tumakbo palayo at nagtago sa likod ng mga nanay nila ang mga bata noong nakita nila ang Leon; ngunit walang kumausap sa kanila. Maraming tindahan ang nakatayo sa kalsada, at nakita ni Dorothy na kulay berde ang lahat ng paninda. Berdeng kendi at berdeng pop-corn ang inaalok para bilhin, pati na rin ang iba\'t ibang uri ng mga berdeng sapatos, berdeng sumbrero at berdeng damit. Sa isang lugar, may lalaking nagtitinda ng berdeng limonada, at kapag bumibili nito ang mga bata, nakikita ni Dorothy na berdeng barya ang ipinambabayad nila. \n\nTila walang kabayo o anumang uri ng hayop doon; dinadala ng mga lalaki ang mga bagay-bagay sa maliliit na berdeng kariton, na itinutulak nila sa kanilang harapan. Mukhang masaya, kuntento at masagana ang lahat."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Sa simula, manghang-mangha sina Dorothy at ang kanyang mga kaibigan sa kinang ng magandang Lungsod kahit na may suot silang mga berdeng salamin. May nakatayong magagandang bahay sa mga kalye. Lahat ng bahay ay gawa sa berdeng marmol at puno ng mga kumikinang na emerald ang lahat ng bahagi nito. Naglakad sila sa isang sementadong daang gawa rin sa berdeng marmol, kung saan ang mga pinagsama-samang bloke ay binubuo ng tumpok-tumpok na emerald na kumikinang sa tuwing tinatamaan ng sinag ng araw. Gawa sa berdeng salamin ang mga bintana; kahit ang kalangitan sa Lungsod ay kulay berde rin, gayundin ang mga sinag ng araw. \n\nNapakaraming tao, lalaki, babae, at bata na palakad-lakad, at lahat sila\'y nakasuot ng mga berdeng damit. Berde rin ang kulay ng kanilang mga balat. Tiningnan nila si Dorothy at ang kakaiba niyang mga kasama nang puno ng pagtataka. Nagsitakbuhan papalayo at nagtago sa likod ng kanilang mga nanay ang mga bata nang makita nila ang Leon; pero walang sinumang nakipag-usap sa kanila. Maraming tindahan sa kalye, at nakita ni Dorothy na kulay berde ang lahat ng nasa loob ng mga ito. May mga ibinebentang berdeng candy at popcorn, at mayroon ding lahat ng klaseng berdeng sapatos, sumbrero, at damit. Sa isang tindahan, may lalaking nagtitinda ng berdeng lemonade, at nang bumili ang mga bata roon ay nakita ni Dorothy na nagbayad sila gamit ang mga berdeng barya. \n\nMukhang walang kabayo o anumang uri ng hayop; binubuhat ng mga lalaki ang mga bagay gamit ang maliliit na berdeng karitong itinutulak nila. Mukhang masaya, kuntento, at masagana ang lahat ng tao."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Pagpipilian ng format"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Awtomatiko"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manual"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Gawing %1$s ang resolution?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Piliin ang OK para gamitin ang %1$s mula ngayon."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Hindi sinusuportahan ang Dolby Vision sa %1$s at idi-disable ito sa \"Mga Advanced na Setting ng Display\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Sinusuportahan ng mode na ito ang %1$s. Sa ilang TV, posibleng kailanganin mong i-on ang Pinahusay na HDMI para mag-enable ng higit pang HDR format. Tingnan ang mga setting ng iyong TV para alamin kung sinusuportahan ito."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Sinusuportahan ng mode na ito ang: %1$s\nSa ilang TV, posibleng kailanganin mong i-on ang Pinahusay na HDMI para mag-enable ng higit pang HDR format. Tingnan ang mga setting ng iyong TV para alamin kung sinusuportahan ito."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Kanselahin"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"I-clear ang naka-cache na data?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"I-clear nito ang naka-cache na data para sa app."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Nakakonekta"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Nadiskonekta"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Wala kang pahintulot na palitan ang mga setting ng Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Gamitin para sa audio ng TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Magpadala ng feedback"</string>
     <string name="launch_help" msgid="2607478763131952469">"Help Center"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Ang device na ito ay pinamamahalaan ng iyong organisasyon."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Pinamamahalaan ng <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Matuto pa"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Camera app}one{Mga Camera app}other{Mga Camera app}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"App na Kalendaryo"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"I-enable"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Configuration"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Gamitin ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"Makokolekta ng <xliff:g id="SERVICE">%1$s</xliff:g> ang lahat ng tekstong tina-type mo, bukod sa mga password. Kasama dito ang personal na data gaya ng mga numero ng credit card."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"Magagawa ng <xliff:g id="SERVICE">%1$s</xliff:g> na mabasa ang iyong screen, magpakita ng content sa ibabaw ng ibang app, subaybayan ang mga pakikipag-ugnayan mo sa ibang app o hardware sensor, at makipag-ugnayan sa mga app para sa iyo."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Ihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ang pagpili sa OK ay magpapahinto sa <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Text to speech"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Nakakonekta na"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Ipakita lahat"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Naghahanap"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Hindi nakuha ang intent na magdagdag ng account mula sa authenticator."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Hindi naidagdag ang account o hindi available ang uri ng account."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Mga Channel at Input"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Mga channel, external na input"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Mga Channel"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Ine-enable ang:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Tandaang posibleng mapataas ng mode na ito ang paggamit ng kuryente ng device."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"I-enable ang \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 5462fecd7..bde9f39ba 100644
--- a/Settings/res/values-tr/energy-modes.xml
+++ b/Settings/res/values-tr/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Gerekli ağ özellikleri"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Az enerji kullanımı"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV kullanımda değilken ağ bağlantısını kapatın."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Kritik güncellemeler ve işlevler"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Önerilen ağ özellikleri"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Optimize edilmiş enerji kullanımı"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"TV\'yi ağ üzerinden uyandıran (ağa bağlı bekleme modu) özellikleri açar."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Ek ağ özellikleri"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Daha fazla enerji kullanımı"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Bu seçenek, önerilen özelliklerin yanı sıra TV kullanımda değilken enerji kullanımını artırabilecek ek özellikleri açar."</string>
+    <string 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-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 8c344afed..b24bd58f3 100644
--- a/Settings/res/values-tr/strings.xml
+++ b/Settings/res/values-tr/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Uygulama Ayarları"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Konum, Kullanım ve Teşhis, Reklamlar"</string>
     <string name="add_account" msgid="7386223854837017129">"Hesap ekle"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Bilinmeyen Hesap"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Hesabı kaldır"</string>
     <string name="account_sync" msgid="4315295293211313989">"Senk. edilen uygulmlr. seç"</string>
     <string name="sync_now" msgid="4335217984374620551">"Şimdi senkronize et"</string>
@@ -150,7 +151,7 @@
     <string name="advanced_display_settings_title" msgid="6293280819870140631">"Gelişmiş ekran ayarları"</string>
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"Gelişmiş ses ayarları"</string>
-    <string name="game_mode_title" msgid="7280816243531315755">"Oyun moduna izin verin"</string>
+    <string name="game_mode_title" msgid="7280816243531315755">"Oyun moduna izin ver"</string>
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"İçerik dinamik aralığını eşleştir"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Bu seçenek etkinleştirildiğinde sistem içeriği eşleştirmek için farklı dinamik aralık biçimleri arasında geçiş yapar. Biçim değiştirme sırasında siyah ekran görünmesine neden olabilir.\n\nDiğer dinamik aralık seçenekleri için Gelişmiş Ekran ayarlarını tıklayın."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Tercih edilen dinamik aralık"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"HDR çıkışını zorunlu kılmak istiyor musunuz?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"Varsayılan olarak, <xliff:g id="HDR_TYPE">%s</xliff:g> biçimine dönüştürme zorunlu kılınır."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ekranınız, 1080p 60 Hz çözünürlükte çalışır. Bu seçenek, 4K 60 Hz çözünürlükte çalışırken ekranınızla uyumlu değildir."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision mevcut çözünürlükte desteklenmez. Dolby Vision\'ı manuel olarak etkinleştirirseniz ekranınızın çözünürlüğü 1080p 60 Hz olarak değiştirilir."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Çözünürlük 1080p 60 Hz olarak değiştirilsin mi?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision\'a dönüştürmeyi her zaman zorunlu kılar"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Dolby Vision, Gelişmiş Ekran Ayarları\'ndaki HDR Biçimleri bölümünde devre dışı bırakılmışsa Dolby Vision\'a dönüştürmeyi zorunlu kıldığınızda yeniden etkinleştirilir."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10\'a dönüştürmeyi her zaman zorunlu kılar"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Örnek metin"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Muhteşem Oz Büyücüsü"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11. Bölüm: Oz\'un Muhteşem Zümrüt Kenti"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Yeşil gözlüklerle korunuyor olsalar bile Dorothy ve arkadaşlarının bu olağanüstü güzellikteki Şehrin parlaklığı karşısında gözleri kamaşmıştı. Tamamı yeşil mermerden yapılmış çok güzel evlerle dolu sokaklarda her yer parlak zümrütlerle bezeliydi. Üzerinde yürüdükleri yeşil mermerden yapılmış kaldırım taşlarının birleştiği yerler, güneş ışığıyla parlayan dizi dizi zümrütlerle süslenmişti. Pencerelerin camları yeşildi. Hatta güneş ışınları ve Şehrin üzerindeki gökyüzünü bile yeşile boyanmıştı.\n\nHepsi yeşil kıyafetler giymiş, yeşil tenli birçok kadın, erkek ve çocuk sokakta geziniyordu. Dorothy ve garip görünümlü arkadaşlarını meraklı bakışlarla süzdüler. Aslan\'ı gören çocuklar kaçıp annelerinin arkasına saklanıyorlardı. Hiç kimse onlarla konuşmuyordu. Sokakta pek çok dükkan vardı. Dorothy, bu dükkanlardaki her şeyin yeşil olduğunu gördü. Yeşil şekerlerin, yeşil renkli patlamış mısırların yanı sıra yeşil ayakkabılar, yeşil şapkalar ve her türden yeşil kıyafetler satılıyordu. Bir yerde, yeşil limonata satan bir adam vardı ve Dorothy, limonata alan çocukların parayı yeşil kuruşlarla ödediklerini gördü. \n\nGörünürde ne at ne de başka hayvan vardı; erkekler, eşyalarını yeşil küçük arabalarla taşıyorlardı. Herkes mutlu, huzurlu ve refah içinde görünüyordu."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Yeşil gözlüklerle korunuyor olsalar bile Dorothy ve arkadaşlarının bu olağanüstü güzellikteki Şehrin parlaklığı karşısında gözleri kamaşmıştı. Tamamı yeşil mermerden yapılmış çok güzel evlerle dolu sokaklarda her yer parlak zümrütlerle bezeliydi. Üzerinde yürüdükleri yeşil mermerden yapılmış kaldırım taşlarının birleştiği yerler, güneş ışığıyla parlayan dizi dizi zümrütlerle süslenmişti. Pencerelerin camları yeşildi. Hatta güneş ışınları ve Şehrin üzerindeki gökyüzünü bile yeşile boyanmıştı.\n\nHepsi yeşil kıyafetler giymiş, yeşil tenli birçok kadın, erkek ve çocuk sokakta geziniyordu. Dorothy ve garip görünümlü arkadaşlarını meraklı bakışlarla süzdüler. Aslan\'ı gören çocuklar kaçıp annelerinin arkasına saklanıyorlardı. Hiç kimse onlarla konuşmuyordu. Sokakta pek çok dükkan vardı. Dorothy, bu dükkanlardaki her şeyin yeşil olduğunu gördü. Yeşil şekerlerin, yeşil renkli patlamış mısırların yanı sıra yeşil ayakkabılar, yeşil şapkalar ve her türden yeşil kıyafetler satılıyordu. Bir yerde, yeşil limonata satan bir adam vardı ve Dorothy, limonata alan çocukların parayı yeşil kuruşlarla ödediklerini gördü. \n\nGörünürde ne at ne de başka hayvan vardı; erkekler, eşyalarını yeşil küçük arabalarla taşıyorlardı. Herkes mutlu, huzurlu ve refah içinde görünüyordu."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Biçim seçimi"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Otomatik"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Manuel"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Çözünürlük %1$s olarak değiştirilsin mi?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Bundan sonra %1$s çözünürlüğü kullanmak için Tamam\'ı seçin."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision, %1$s çözünürlükte desteklenmez ve \"Gelişmiş Ekran Ayarları\"nda devre dışı bırakılır"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Bu modda %1$s desteklenir. Bazı televizyonlarda daha fazla HDR biçimini etkinleştirmek için gelişmiş HDMI\'yı açmanız gerekebilir. Bunun desteklenip desteklenmediğini görmek için televizyon ayarlarınızı kontrol edin."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Bu modda %1$s desteklenir\nBazı TV\'lerde daha fazla HDR biçimini etkinleştirmek için Gelişmiş HDMI\'yı açmanız gerekebilir. Bunun desteklenip desteklenmediğini görmek için televizyon ayarlarınızı kontrol edin."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"İptal"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"Tamam"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Önbelleğe alınan veriler silinsin mi?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Bu, tüm uygulamaların önbellek verilerini siler."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Bağlı"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Bağlantı değil"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Bluetooth ayarlarını değiştirmek için izniniz yok."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"TV sesi için kullan"</string>
     <string name="send_feedback" msgid="936698637869795473">"Geri bildirim gönder"</string>
     <string name="launch_help" msgid="2607478763131952469">"Yardım Merkezi"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Bu cihaz kuruluşunuz tarafından yönetiliyor."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından yönetiliyor."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Daha fazla bilgi"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera uygulaması}other{Kamera uygulamaları}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Takvim uygulaması"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Etkinleştir"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Yapılandırma"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g>, şifreler dışında yazdığınız tüm metinleri toplayabilir. Buna kredi kartı numaraları gibi kişisel veriler de dahildir."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g>; ekranınızı okuyabilir, diğer uygulamalar aracılığıyla içerik gösterebilir, uygulamalar veya donanım sensörleri ile olan etkileşimlerinizi izleyebilir ve sizin adınıza uygulamalarla etkileşim kurabilir."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Tamam\'ı seçmek <xliff:g id="SERVICE">%1$s</xliff:g> hizmetini durdurur."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Metin-konuşma"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Bağlantı başarılı"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Tümünü göster"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Arıyor"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Kimlik doğrulayıcıdan hesap ekleme intent\'i alınamadı."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Hesap eklenemedi veya hesap türü kullanılamıyor."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanallar ve Girişler"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanallar, harici girişler"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanallar"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Şunları etkinleştirir:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Bu modun, cihazın güç tüketimini artırabileceğini unutmayın."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" modunu etkinleştir"</string>
+    <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_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 c6bd8fcfd..6599ce42e 100644
--- a/Settings/res/values-uk/energy-modes.xml
+++ b/Settings/res/values-uk/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Основні мережеві функції"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Зменшене енергоспоживання"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"З’єднання з мережею вимикається, коли телевізор не використовується."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Важливі оновлення та функції"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Рекомендовані мережеві функції"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Оптимізоване енергоспоживання"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Вмикаються функції, які виводять телевізор із режиму сну через мережу (мережевий режим очікування)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Додаткові мережеві функції"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Збільшене енергоспоживання"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Коли телевізор не використовується, ця опція вмикає, окрім рекомендованих, додаткові функції, через що може збільшитися енергоспоживання."</string>
+    <string 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-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 834063273..92acd694a 100644
--- a/Settings/res/values-uk/strings.xml
+++ b/Settings/res/values-uk/strings.xml
@@ -45,7 +45,7 @@
     <string name="header_category_personal" msgid="7880053929985150368">"Особисте"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"Під’єднатися до мережі"</string>
     <string name="add_an_account" msgid="2601275122685226096">"Додати обліковий запис"</string>
-    <string name="accounts_category_title" msgid="7286858931427579845">"Облікові записи та вхід"</string>
+    <string name="accounts_category_title" msgid="7286858931427579845">"Облікові записи й вхід"</string>
     <string name="accounts_category_summary_no_account" msgid="3053606166993074648">"Немає облікових записів"</string>
     <string name="accounts_category_summary" msgid="7617932110389860822">"{count,plural, =1{# обліковий запис}one{# обліковий запис}few{# облікові записи}many{# облікових записів}other{# облікового запису}}"</string>
     <string name="accounts_slice_summary" msgid="1571012157154521119">"Медіа-сервіси, Асистент, Payments"</string>
@@ -55,7 +55,7 @@
     <string name="device_pref_category_title" msgid="8292572846154873762">"Параметри пристрою"</string>
     <string name="accessibility_category_title" msgid="1552664829936369592">"Доступність"</string>
     <string name="remotes_and_accessories_category_title" msgid="4795119810430255047">"Пульти дистанційного керування й аксесуари"</string>
-    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Зображення та звук"</string>
+    <string name="display_and_sound_category_title" msgid="9203309625380755860">"Екран і звук"</string>
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"Довідка й відгуки"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"Конфіденційність"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"Налаштування пристрою"</string>
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Налаштування додатка"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Місцезнаходження, використання й діагностика, реклама"</string>
     <string name="add_account" msgid="7386223854837017129">"Додати обліковий запис"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Невідомий обліковий запис"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Вилучення облікового запису"</string>
     <string name="account_sync" msgid="4315295293211313989">"Програми для синхронізації"</string>
     <string name="sync_now" msgid="4335217984374620551">"Синхронізувати зараз"</string>
@@ -102,12 +103,12 @@
     <string name="all_apps_disabled" msgid="2776041242863791053">"Вимкнені додатки"</string>
     <string name="device_daydream" msgid="2631191946958113220">"Заставка"</string>
     <string name="device_display" msgid="244634591698925025">"Екран"</string>
-    <string name="device_display_sound" msgid="7399153506435649193">"Зображення та звук"</string>
+    <string name="device_display_sound" msgid="7399153506435649193">"Екран і звук"</string>
     <string name="device_sound" msgid="8616320533559404963">"Звук"</string>
     <string name="device_surround_sound" msgid="1889436002598316470">"Об’ємний звук"</string>
     <string name="device_sound_effects" msgid="2000295001122684957">"Системні звуки"</string>
     <string name="device_apps" msgid="2134756632245008919">"Додатки"</string>
-    <string name="device_storage" msgid="8540243547121791073">"Пам’ять"</string>
+    <string name="device_storage" msgid="8540243547121791073">"Сховище"</string>
     <string name="device_reset" msgid="6115282675800077867">"Скинути налаштування"</string>
     <string name="device_backup_restore" msgid="3634531946308269398">"Резервне копіювання й відновлення"</string>
     <string name="device_factory_reset" msgid="1110189450013225971">"Відновлення заводських налаштувань"</string>
@@ -154,7 +155,7 @@
     <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"Враховувати динамічний діапазон контенту"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"Якщо цю опцію ввімкнено, система перемикатиметься між різними форматами динамічного діапазону з урахуванням контенту. Під час перемикання формату екран може ставати чорним.\n\nЩоб переглянути інші опції динамічного діапазону, натисніть \"Додаткові налаштування екрана\"."</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"Бажаний динамічний діапазон"</string>
-    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Системна конвертація"</string>
+    <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"Конвертація за вибором системи"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"Дозвольте системі керувати конвертацією формату"</string>
     <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"Якщо ви виберете цю опцію, система визначатиме відповідний динамічний діапазон, який передаватиметься на ваш екран, і за потреби конвертуватиме контент у цей динамічний діапазон."</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"Завжди відповідає формату контенту"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"Здійснювати примусову конвертацію у формат форматі HDR?"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"За умовчанням контент конвертуватиметься у формат <xliff:g id="HDR_TYPE">%s</xliff:g>."</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"Ваш екран працюватиме з роздільною здатністю 1080p 60 Гц. Ця опція не підтримується, якщо екран працює з роздільною здатністю 4K 60 Гц."</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Формат Dolby Vision не підтримується в поточній роздільній здатності. Якщо ввімкнути Dolby Vision вручну, роздільну здатність вашого дисплея буде змінено на 1080p 60 Гц."</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"Змінити роздільну здатність на 1080p 60 Гц?"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Завжди автоматично конвертувати відео у формат Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"Якщо формат Dolby Vision вимкнено в списку форматів HDR в додаткових налаштуваннях екрана, за допомогою автоматичної конвертації в Dolby Vision можна ввімкнути його знову."</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"Завжди автоматично конвертувати відео у формат HDR10"</string>
@@ -185,15 +184,15 @@
     <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"Якщо цього вимагає додаток, пристрій відтворюватиме зображення без зміни частоти кадрів, ЛИШЕ якщо телевізор може виконати плавний перехід."</string>
     <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"Підключений екран не підтримує плавну зміну частоти оновлення. Вибір цієї опції не дасть результату, якщо ви не використовуватимете екран, який підтримує цю функцію."</string>
     <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"Завжди"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Якщо цього вимагає додаток, пристрій відтворюватиме зображення без зміни частоти кадрів. Через це зображення на екрані може на секунду зникати, коли ви вмикаєте або вимикаєте відтворення відео."</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"Якщо цього вимагає додаток, пристрій відтворюватиме зображення із допасуванням до частоти кадрів контенту, який ви переглядаєте. Через це зображення на екрані може на секунду зникати, коли ви вмикаєте або вимикаєте відтворення відео."</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"Ніколи"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Навіть якщо цього вимагає додаток, пристрій ніколи не намагатиметься відтворювати зображення без зміни частоти кадрів."</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"Навіть якщо цього вимагає додаток, пристрій ніколи не намагатиметься допасувати частоту кадрів контенту, який ви переглядаєте."</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"Масштаб тексту"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"Масштаб: <xliff:g id="SCALE">%1$d</xliff:g>%%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Зразок тексту"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Чарівник країни Оз"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Глава 11. Дивовижне Смарагдове місто країни Оз"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Навіть крізь зелені скельця окулярів краса дивовижного міста спершу засліпила Дороті та її друзів. Уздовж вулиць височіли будинки із зеленого мармуру, усипані блискучими смарагдами. Тротуар також був вимощений плитами із зеленого мармуру, на стиках яких виблискували смарагди. Вікна будинків були із зеленого скла. Навіть небо над містом і промені сонця мали зелений відтінок. \n\nНа вулиці прогулювалося багато людей – чоловіків, жінок і дітей. Усі вони носили зелений одяг, а їхня шкіра мала зеленуватий відтінок. Люди з подивом дивилися на Дороті та її чудернацьку компанію, а діти тікали й ховалися за своїми матерями, коли бачили Лева. Проте ніхто не наважився заговорити з ними. У магазинах продавали товари зеленого кольору: зелені цукерки, зелений попкорн, зелені туфлі, капелюхи й інший одяг. В одній крамниці чоловік торгував зеленим лимонадом, за який діти розплачувалися зеленими монетами. \n\nЗдавалось, у місті немає ні коней, ні інших тварин – чоловіки перевозили речі на невеликих зелених тачках. Усі люди мали щасливий і задоволений вигляд."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Навіть крізь зелені скельця окулярів краса дивовижного міста спершу засліпила Дороті і її друзів. Уздовж вулиць височіли будинки із зеленого мармуру, усипані блискучими смарагдами. Тротуар також був вимощений плитами із зеленого мармуру, на стиках яких виблискували смарагди. Вікна будинків були із зеленого скла. Навіть небо над містом і промені сонця мали зелений відтінок. \n\nНа вулиці прогулювалося багато людей – чоловіків, жінок і дітей. Усі вони носили зелений одяг, а їхня шкіра мала зеленуватий відтінок. Люди з подивом дивилися на Дороті і її чудернацьку компанію, а діти тікали й ховалися за своїми матерями, коли бачили Лева. Проте ніхто не наважився заговорити з ними. У магазинах продавали товари зеленого кольору: зелені цукерки, зелений попкорн, зелені туфлі, капелюхи й інший одяг. В одній крамниці чоловік торгував зеленим лимонадом, за який діти розплачувалися зеленими монетами. \n\nЗдавалось, у місті немає ні коней, ні інших тварин – чоловіки перевозили речі на невеликих зелених тачках. Усі люди мали щасливий і задоволений вигляд."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Вибір формату"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Автоматично"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Вручну"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Змінити роздільну здатність на %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Натисніть OK, щоб надалі використовувати роздільну здатність %1$s."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Формат Dolby Vision не підтримується в режимі %1$s. Його буде вимкнено в меню \"Додаткові налаштування екрана\"."</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Цей режим підтримує %1$s. Можливо, на деяких телевізорах потрібно ввімкнути розширені параметри HDMI, щоб використовувати інші формати HDR. Це можна перевірити в налаштуваннях телевізора."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Цей режим підтримує: %1$s\nНа деяких телевізорах може знадобитися ввімкнути розширені параметри HDMI, щоб використовувати більше форматів HDR. Це можна перевірити в налаштуваннях телевізора."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Скасувати"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Гц"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Гц)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Видалити кешовані дані?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Кешовані дані всіх додатків буде видалено."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Підключено"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Відключено"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Ви не маєте дозволу змінювати налаштування Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Використовувати для звуку на телевізорі"</string>
     <string name="send_feedback" msgid="936698637869795473">"Надіслати відгук"</string>
     <string name="launch_help" msgid="2607478763131952469">"Довідковий центр"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Цим пристроєм керує адміністратор вашої організації."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Цим пристроєм керує <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Докладніше"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Додаток для камери}one{Додатки для камери}few{Додатки для камери}many{Додатки для камери}other{Додатки для камери}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Додаток для календарів"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Увімкнути"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Конфігурація"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> може збирати весь введений вами текст, окрім паролів. Це включає особисті дані, як-от номери кредитних карток."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"Виберіть OK, щоб вимкнути <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Синтез мовлення з тексту"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Підключено"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Показати все"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Пошук"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Не вдалось отримати намір додати обліковий запис від засобу автентифікації."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Не вдалося додати обліковий запис, або тип облікового запису недоступний."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Канали та входи"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Канали, зовнішні входи"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Канали"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Функції, що вмикаються"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Зверніть увагу, що в цьому режимі може збільшитися енергоспоживання пристрою."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Увімкнути режим \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 f9bb00384..002bf76e2 100644
--- a/Settings/res/values-ur/energy-modes.xml
+++ b/Settings/res/values-ur/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"نیٹ ورک کی ضروری خصوصیات"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"کم توانائی کا استعمال"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"TV کے استعمال میں نہ ہونے پر نیٹ ورک کنکشن آف کریں۔"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"اہم اپ ڈیٹس اور فنکشنز"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"تجویز کردہ نیٹ ورک کی خصوصیات"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"آپٹمائز کردہ توانائی کا استعمال"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"نیٹ ورک پر TV کو بحال کرنے والی خصوصیات کو آن کرتا ہے (اسٹینڈ بائی وضع میں نیٹ ورک)۔"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"نیٹ ورک کی اضافی خصوصیات"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"توانائی کے استعمال میں اضافہ"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"تجویز کردہ خصوصیات کے علاوہ، یہ اختیار اضافی خصوصیات کو آن کرتا ہے جب TV استعمال میں نہ ہو جو توانائی کے استعمال میں اضافہ کا باعث بن سکتا ہے۔"</string>
+    <string 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-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 2536172ae..cc928885c 100644
--- a/Settings/res/values-ur/strings.xml
+++ b/Settings/res/values-ur/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"ایپ کی ترتیبات"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"مقام، استعمال اور تشخیصات، اشتہارات"</string>
     <string name="add_account" msgid="7386223854837017129">"اکاؤنٹ شامل کریں"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"نامعلوم اکاؤنٹ"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"اکاؤنٹ ہٹائیں"</string>
     <string name="account_sync" msgid="4315295293211313989">"مطابقت پذیر ایپس منتخب کریں"</string>
     <string name="sync_now" msgid="4335217984374620551">"ابھی مطابقت پذیری کریں"</string>
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"فیکٹری ڈیٹا ری سیٹ"</string>
     <string name="device_calibration" msgid="2907914144048739705">"کیلیبریشن"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"ٹائمر بند کریں"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"TV بند کرنے اور توانائی بچانے کے لیے ٹائمرز سیٹ کریں"</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"‫TV بند کرنے اور توانائی بچانے کے لیے ٹائمرز سیٹ کریں"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"آلات"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"فارمیٹس منتخب کریں"</string>
@@ -151,7 +152,7 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"جدید ترین صوتی ترتیبات"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"گیم وضع کی اجازت"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مماثل مواد کا ڈائنیمک رینج"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"مواد کی ڈائنیمک رینج مماثل بنائیں"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"اس اختیار کو فعال کرنے پر، یہ سسٹم مواد سے مماثل کرنے کے لیے مختلف ڈائنیمک رینج فارمیٹس کے مابین سوئچ ہو جائے گا۔ فارمیٹ سوئچ کے دوران اس سے اسکرین سیاہ ہو سکتی ہے۔\n\nمزید ڈائنیمک رینج اختیارات کے لیے جدید ترین ڈسپلے کی ترتیبات پر کلک کریں۔"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"ترجیحی ڈائنیمک رینج"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"سسٹم کی ترجیحی تبدیلی"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"کیا آپ زبردستی HDR آؤٹ پٹ کرنا چاہتے ہیں؟"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"بطور ڈیفالٹ <xliff:g id="HDR_TYPE">%s</xliff:g> میں زبردستی تبدیلی کی جائے گی۔"</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"آپ کا ڈسپلے 1080p 60Hz ریزولیوشن پر چلے گا۔ 4k 60Hz ریزولیوشن پر چلنے پر یہ اختیار آپ کے ڈسپلے کے ساتھ موافقت نہیں رکھتا ہے۔"</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"Dolby Vision موجودہ ریزولوشن میں تعاون یافتہ نہیں ہے۔ اگر آپ Dolby Vision کو دستی طور پر فعال کرتے ہیں تو آپ کے ڈسپلے کی ریزولوشن 1080p 60Hz میں تبدیل ہو جائے گی"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"ریزولوشن کو 1080p 60Hz میں تبدیل کریں؟"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"Dolby Vision میں ہمیشہ زبردستی تبدیلی کریں"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"اگر اعلی درجے کی ڈسپلے کی ترتیبات میں HDR فارمیٹس میں Dolby Vision کو غیر فعال کر دیا جاتا ہے تو Dolby Vision میں زبردستی تبدیلی اسے دوبارہ فعال کر دے گی۔"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"HDR10 میں ہمیشہ زبردستی تبدیلی کریں"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"ٹیکسٹ کا نمونہ"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"اوز کا شاندار جادوگر"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"گیارھواں باب: اوز کا شاندار زمردی شہر"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"سبز رنگ کے چشموں سے محفوظ ہونے کے باوجود ڈوروتھی اور اس کے دوستوں کی آنکھیں اس شاندار شہر کی آب و تاب سے پہلے پہل چندھیا گئیں۔ سڑکوں پر قطار اندر قطار سبز سنگِ مرمر سے بنے خوبصورت گھر تھے جن پر ہر جگہ چمکتے زمرد جڑے ہوئے تھے۔ وہ اسی سبز سنگِ مرمر کی راہگزر پر چلے اور جہاں بلاک جڑے ہوئے تھے وہاں زمرد کی قطاریں تھیں، قرینے سے لگی ہوئی، اور سورج کی روشنی میں چمکتی ہوئی۔ کھڑکیوں کے چوکھٹے سبز شیشے کے تھے؛ حتی کہ شہر کے اوپر موجود آسمان میں بھی سبز رنگ کی جھلک تھی، اور سورج کی کرنیں بھی سبز تھیں۔ \n\nوہاں کئی لوگ تھے، آدمی، عورتیں اور بچے، مٹر گشت کرتے، اور ان سب نے سبز کپڑے پہنے ہوئے تھے اور ان کی چمڑیاں بھی سبز مائل تھیں۔ انہوں نے ڈوروتھی اور اس کی عجیب قسم کی سنگت کو تعجب سے دیکھا، شیر کو دیکھ کر سارے بچے بھاگ کھڑے ہوئے اور اپنی ماؤں کے پیچھے چھپ گئے؛ مگر ان سے کسی نے بات نہ کی۔ گلی میں کئی دکانیں تھیں اور ڈوروتھی نے دیکھا کہ ان دکانوں کے اندر ہر چیز سبز تھی۔ سبز مٹھائی اور سبز پاپ کارن بیچنے کیلئے رکھے تھے، ساتھ ہی سبز جوتے، سبز ٹوپیاں اور ہر قسم کے سبز کپڑے بھی۔ ایک جگہ پر ایک آدمی سبز سکنجبین بیچ رہا تھا اور ڈوروتھی نے دیکھا کہ جو بچے اسے خرید رہے تھے وہ اس کی ادائیگی سبز سکوں میں کر رہے تھے۔ \n\nوہاں گھوڑے یا کسی بھی اور قسم کے جانور نہیں تھے اور آدمی چیزوں کو چھوٹی سبز ہاتھ گاڑیوں پر لے جا رہے تھے جنہیں وہ اپنے سے آگے دھکیلتے۔ ہر کوئی خوش اور مطمئن اور خوشحال نظر آ رہا تھا۔"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"سبز رنگ کے چشموں سے محفوظ ہونے کے باوجود ڈوروتھی اور اس کے دوستوں کی آنکھیں اس شاندار شہر کی آب و تاب سے پہلے پہل چندھیا گئیں۔ سڑکوں پر قطار اندر قطار سبز سنگِ مرمر سے بنے خوبصورت گھر تھے جن پر ہر جگہ چمکتے زمرد جڑے ہوئے تھے۔ وہ اسی سبز سنگِ مرمر کی راہگزر پر چلے اور جہاں بلاک جڑے ہوئے تھے وہاں زمرد کی قطاریں تھیں، قرینے سے لگی ہوئی، اور سورج کی روشنی میں چمکتی ہوئی۔ کھڑکیوں کے چوکھٹے سبز شیشے کے تھے؛ حتی کہ شہر کے اوپر موجود آسمان میں بھی سبز رنگ کی جھلک تھی، اور سورج کی کرنیں بھی سبز تھیں۔ \n\nوہاں کئی لوگ تھے، آدمی، عورتیں اور بچے، مٹر گشت کرتے، اور ان سب نے سبز کپڑے پہنے ہوئے تھے اور ان کی چمڑیاں بھی سبز مائل تھیں۔ انہوں نے ڈوروتھی اور اس کی عجیب قسم کی سنگت کو تعجب سے دیکھا، شیر کو دیکھ کر سارے بچے بھاگ کھڑے ہوئے اور اپنی ماؤں کے پیچھے چھپ گئے؛ مگر ان سے کسی نے بات نہ کی۔ گلی میں کئی دکانیں تھیں اور ڈوروتھی نے دیکھا کہ ان دکانوں کے اندر ہر چیز سبز تھی۔ سبز مٹھائی اور سبز پاپ کارن بیچنے کیلئے رکھے تھے، ساتھ ہی سبز جوتے، سبز ٹوپیاں اور ہر قسم کے سبز کپڑے بھی۔ ایک جگہ پر ایک آدمی سبز سکنجبین بیچ رہا تھا اور ڈوروتھی نے دیکھا کہ جو بچے اسے خرید رہے تھے وہ اس کی ادائیگی سبز سکوں میں کر رہے تھے۔ \n\nوہاں گھوڑے یا کسی بھی اور قسم کے جانور نہیں تھے اور آدمی چیزوں کو چھوٹی سبز ہاتھ گاڑیوں پر لے جا رہے تھے جنہیں وہ اپنے سے آگے دھکیلتے۔ ہر کوئی خوش اور مطمئن اور خوشحال نظر آ رہا تھا۔"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"فارمیٹ کا انتخاب"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"خودکار"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"دستی"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"ریزولیوشن کو ‎%1$s میں تبدیل کریں؟"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"اب سے ‏%1$s کا استعمال کرنے کے لیے \'ٹھیک ہے\' کو منتخب کریں۔"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby ویژن ‎%1$s پر تعاون یافتہ نہیں ہے اور \"جدید ترین ڈسپلے کی ترتیبات\" میں غیر فعال ہو جائے گا"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"یہ وضع ‎%1$s کو سپورٹ کرتی ہے۔ کچھ TVs پر، HDR کے مزید فارمیٹس کو فعال کرنے کے لیے آپ کو بہتر کردہ HDMI کو آن کرنا پڑ سکتا ہے۔ یہ دیکھنے کے لیے اپنے TV کی ترتیبات چیک کریں کہ آیا یہ تعاون یافتہ ہے یا نہیں۔"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"یہ موڈ اس کو سپورٹ کرتا ہے: %1$s\nکچھ TVs پر، HDR کے مزید فارمیٹس کو فعال کرنے کے لیے آپ کو بہتر کردہ HDMI کو آن کرنا پڑ سکتا ہے۔ یہ دیکھنے کے لیے اپنے TV کی ترتیبات چیک کریں کہ آیا یہ تعاون یافتہ ہے یا نہیں۔"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"منسوخ کریں"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"ٹھیک ہے"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"کیش کیا ہوا ڈیٹا صاف کریں؟"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"یہ سبھی ایپس کیلئے کیش کیے ہوئے ڈیٹا کو صاف کر دے گا۔"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"منسلک ہے"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"غیر منسلک ہے"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"آپ کو بلوٹوتھ ترتیبات میں تبدیلی کرنے کی اجازت نہیں ہے۔"</string>
+    <string name="bluetooth_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="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"یہ آلہ آپ کی تنظیم کے زیر انتظام ہے۔"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> کے زیر انتظام ہے۔"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"مزید جانیں"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{کیمرا ایپ}other{کیمرا ایپس}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"کیلنڈر ایپ"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"فعال کریں"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"کنفیگریشن"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"‫<xliff:g id="SERVICE">%1$s</xliff:g> کا استعمال کریں؟"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"‫<xliff:g id="SERVICE">%1$s</xliff:g> پاس ورڈز کو چھوڑ کر، آپ کے ٹائپ کردہ تمام متن کو جمع کر سکتی ہے۔ اس میں ذاتی ڈیٹا جیسے کریڈٹ کارڈ نمبرز شامل ہیں۔"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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">"‫OK کو منتخب کرنے سے <xliff:g id="SERVICE">%1$s</xliff:g> رک جائے گی۔"</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"ٹیکسٹ ٹو اسپیچ"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"کنکشن کامیاب"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"سبھی دکھائیں"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"تلاش کر رہا ہے"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"تصدیق کنندہ سے اکاؤنٹ شامل کرنے کا انٹینٹ بازیاب کرنے میں ناکام۔"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"اکاؤنٹ شامل کرنے میں ناکام یا اکاؤنٹ کی قسم دستیاب نہیں ہے۔"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"چینلز اور ان پٹس"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"چینلز، خارجی ان پٹس"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"چینلز"</string>
@@ -1123,8 +1123,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="7196407759836930799">"جب TV استعمال میں نہ ہو تو توانائی کی کارکردگی کو بہتر بنائیں"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"فعال کرتا ہے:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"نوٹ کریں کہ یہ وضع آلہ کی بجلی کی کھپت کو بڑھا سکتی ہے۔"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"\"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\" کو فعال کریں"</string>
+    <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_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 ede773f59..b34b1e6ef 100644
--- a/Settings/res/values-uz/energy-modes.xml
+++ b/Settings/res/values-uz/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Asosiy tarmoq funksiyalari"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Kam quvvatli"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Televizor ishlatilmaganda tarmoq aloqasini faolsizlantirish."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Muhim yangilanishlar va funksiyalar"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Tavsiya etilgan tarmoq funksiyalari"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Moslashtirilgan quvvatli"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Televizorni tarmoqdan uygʻotish funksiyalarini yoqadi (tarmoq orqali kutish rejimida)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Qoʻshimcha tarmoq funksiyalari"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Yuqori quvvatli"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Tavsiya etilgan funksiyalardan tashqari bu parametr yoqilsa, televizorda qoʻshimcha funksiyalar yoqiladi, lekin ular quvvat sarfini oshirishi mumkin."</string>
+    <string 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-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 2cc3388bb..136d15ab3 100644
--- a/Settings/res/values-uz/strings.xml
+++ b/Settings/res/values-uz/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Ilova sozlamalari"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Joylashuv, foydalanish statistikasi va diagnostika, reklamalar"</string>
     <string name="add_account" msgid="7386223854837017129">"Hisob kiritish"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Notanish hisob"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Hisobni olib tashlash"</string>
     <string name="account_sync" msgid="4315295293211313989">"Sinxronadigan ilovalarni tanlang"</string>
     <string name="sync_now" msgid="4335217984374620551">"Hozir sinxronlash"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Namunaviy matn"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Oz mamlakati sehrgari"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"11-bob: Oz mamlakatining zumrad shahri"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Yashil koʻzoynak taqishgan boʻlishiga qaramasdan, bu ajoyib shaharning jilosi Doroti va uning doʻstlarining koʻzlarini qamashtirardi. Koʻchalarda yashil marmardan qurilgan va yorqin zumradlar bilan bezalgan goʻzal uylar tizilib turar edi. Ular yurib borayotgan yashil marmarli yoʻlakdagi zumradlar quyosh nurida jilolanardi. Uylar derazalari ham yashil oynadan qilingan edi. Hattoki shahar osmoni ham yashil tusda boʻlib, quyosh nurlari ham yashil edi. \n\nAtrofda yashil libos kiygan erkaklar, ayollar va bolalar yurishardi, ularning terisining rangi ham yashilsifat edi. Ular bir soʻz demay Doroti va uning gʻalati doʻstlariga hayratlanib boqishardi, bolalar bahaybat sherdan qoʻrqqanlaridan yugurib onalarini ortiga qochishardi. Doroti koʻrdiki, koʻchada koʻp doʻkonlar boʻlib, ulardagi barcha narsalar yashil rangda edi: yashil shirinliklar va bodroq, yashil poyabzal va bosh kiyimlar, yashil liboslar va barcha turdagi paltolar. Bir joydagi sotuvchidan bolalar yashil tangaga yashil limonad sotib olishar edi. \n\nOtlar va boshqa turdagi hayvonlar koʻrinmas edi. Odamlarlar oʻzlari surib yurgan yashil aravachalarida narsalarini olib yurishardi. Zumrad shahar aholisi baxtli va mamnun edi."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Yashil koʻzoynak taqishgan boʻlishiga qaramasdan, bu ajoyib shaharning jilosi Doroti va uning doʻstlarining koʻzlarini qamashtirardi.         Koʻchalarda yashil marmardan qurilgan va yorqin zumradlar bilan bezalgan goʻzal uylar tizilib turar edi.         Ular yurib borayotgan yashil marmarli yoʻlakdagi zumradlar quyosh nurida jilolanardi.         Uylar derazalari ham yashil oynadan qilingan edi. Hattoki shahar osmoni ham yashil tusda boʻlib, quyosh nurlari ham yashil edi.         \n\nAtrofda yashil libos kiygan erkaklar, ayollar va bolalar yurishardi, ularning terisi ham yam-yashil edi.         Ular bir soʻz demay Doroti va uning gʻalati doʻstlariga hayratlanib boqishardi, bolalar bahaybat sherdan qoʻrqib yugurib onalarining ortiga qochishardi.         Doroti koʻchada doʻkonlar koʻp ekani, ulardagi barcha narsalar yashil rangda ekanini koʻrdi: yashil shirinliklar va bodroq, yashil poyabzal va bosh kiyimlar, yashil liboslar va barcha turdagi paltolar.         Bir joydagi sotuvchidan bolalar yashil tangaga yashil limonad sotib olishar edi. Otlar va boshqa turdagi hayvonlar koʻrinmas edi.         \n\nOdamlar oʻzlari surib yurgan yashil aravachalarida narsalarini olib yurishardi.         Zumrad shahar aholisi baxtli va mamnun edi."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Format tanlash"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Avtomatik"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Oddiy usulda"</string>
@@ -218,17 +219,16 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Tiniqlik %1$s sifatiga almashsinmi?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Hozirdan %1$s ishlatish uchun OK tugmasini bosing."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision %1$s rejimida ishlamaydi va “Kengaytirilgan ekran sozlamalari” bandida faolsizlantiriladi"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Bu rejim %1$s tiniqlikda ishlaydi. Ayrim televizorlarda boshqa HDR formatlarini Kengaytirilgan HDMI yoniqligida tanlash mumkin. Buning ishlashini televizor sozlamalari orqali tekshirish mumkin."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Bu rejimida ishlaydi: %1$s\nAyrim televizorlarda boshqa HDR formatlarini Kengaytirilgan HDMI yoniqligida tanlash mumkin. Buning ishlashini televizor sozlamalari orqali tekshirish mumkin."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Bekor qilish"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Kesh tozalansinmi?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Barcha ilovalarning keshi o‘chirib tashlanadi."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"Aksessuarni qo‘shish"</string>
-    <string name="accessory_state_pairing" msgid="15908899628218319">"Ulanmoqda…"</string>
+    <string name="accessory_state_pairing" msgid="15908899628218319">"Juftlanmoqda…"</string>
     <string name="accessory_state_connecting" msgid="6560241025917621212">"Ulanmoqda…"</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"Ulanib bo‘lmadi"</string>
     <string name="accessory_state_canceled" msgid="4794837663402063770">"Bekor qilindi"</string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Ulandi"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Uzildi"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Sizda Bluetooth sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"TV audiosi uchun foydalanish"</string>
     <string name="send_feedback" msgid="936698637869795473">"Fikr-mulohaza yuborish"</string>
     <string name="launch_help" msgid="2607478763131952469">"Yordam markazi"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Bu – tashkilotingiz tomonidan boshqariladigan qurilma."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Bu – <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan boshqariladigan qurilma."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Batafsil"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Kamera uchun ilova}other{Kamera uchun ilovalar}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Taqvim ilovasi"</string>
@@ -657,7 +657,7 @@
     <string name="location_high_battery_use" msgid="5325556609027887602">"Yuqori batareya sarfi"</string>
     <string name="location_low_battery_use" msgid="728585923412018253">"Batareya sarfi kam"</string>
     <string name="location_mode_wifi_description" msgid="84697248707903061">"Joyni hisoblash uchun Wi‑Fi dan foydalanish"</string>
-    <string name="location_status" msgid="3037321737386011224">"Joylashuv holati"</string>
+    <string name="location_status" msgid="3037321737386011224">"Joylashuv axboroti"</string>
     <string name="location_services" msgid="551503779736382878">"Joylashuv axboroti xizmatlari"</string>
     <string name="on" msgid="4899322147062342542">"Yoniq"</string>
     <string name="off" msgid="3127416478888499352">"O‘chiq"</string>
@@ -680,7 +680,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="9200419191468995574">"Yuqori kontrastli matn"</string>
     <string name="accessibility_toggle_bold_text_preference_title" msgid="3328992531170432669">"Qalin matn"</string>
     <string name="accessibility_color_correction" msgid="6765093204922184119">"Ranglarni tuzatish"</string>
-    <string name="color_correction_usage" msgid="4160611639548748657">"Rangni tuzatishdan foydalanish"</string>
+    <string name="color_correction_usage" msgid="4160611639548748657">"Ranglarni tuzatish"</string>
     <string name="color_correction_color_mode" msgid="5081377780734779169">"Rangli rejim"</string>
     <string name="color_correction_mode_deuteranomaly" msgid="1513793544554228224">"Deyteranomaliya"</string>
     <string name="color_correction_mode_deuteranomaly_summary" msgid="5991561481464520986">"Qizil/yashil"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Yoqish"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Konfiguratsiya"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"<xliff:g id="SERVICE">%1$s</xliff:g>dan foydalanilsinmi?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> parollardan boshqa siz kiritadgina barcha matnni to‘plashi mumkin. Bu kredit karta raqamlari kabi shaxsiy ma’lumotlarni o‘z ichiga oladi."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> ekraningizni oʻqiy oladi, kontentni boshqa ilovalar ustidan koʻrsata oladi, ilovalar yoki apparat sensorlari bilan oʻzaro munosabatlaringizni kuzata oladi va nomingizdan ilovalar bilan oʻzaro aloqada boʻladi."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"<xliff:g id="SERVICE">%1$s</xliff:g> xizmati to‘xtatilsinmi?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"OK ni tanlash <xliff:g id="SERVICE">%1$s</xliff:g> ni to‘xtatadi."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Matndan nutqqa"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Muvaffaqiyatli ulandi"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Hammasi"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Qidirilmoqda"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Autentifikatordan hisob kiritish intenti olinmadi."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Hisob kiritilmadi yoki bunday hisob turi ishlamaydi."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kanallar va manbalar"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kanallar, tashqi manbalar"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kanallar"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Ishga tushadi:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Eslatma: bu rejim qurilmada quvvat sarfini oshirishi mumkin."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"“<xliff:g id="ENERGYMODENAME">%s</xliff:g>” rejimini yoqish"</string>
+    <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_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 9a6b9d121..fabc3b02b 100644
--- a/Settings/res/values-vi/energy-modes.xml
+++ b/Settings/res/values-vi/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Tính năng mạng thiết yếu"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Mức sử dụng năng lượng thấp"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Tắt kết nối mạng khi bạn không dùng TV."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Chức năng và bản cập nhật quan trọng"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Tính năng mạng đề xuất"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Mức sử dụng năng lượng tối ưu"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Bật các tính năng đánh thức TV qua mạng (chế độ chờ có kết nối mạng)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Chèn tính năng 1]"</item>
     <item msgid="8724721267222341891">"[Chèn tính năng 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Tính năng mạng bổ sung"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Mức sử dụng năng lượng cao hơn"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ngoài tính năng đề xuất, tuỳ chọn này còn bật các tính năng bổ sung khi bạn không dùng TV và do đó có thể làm tăng mức sử dụng năng lượng."</string>
+    <string 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-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 89e77c9a4..c526839c9 100644
--- a/Settings/res/values-vi/strings.xml
+++ b/Settings/res/values-vi/strings.xml
@@ -65,11 +65,12 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Cài đặt ứng dụng"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Vị trí, Dữ liệu sử dụng và chẩn đoán, Quảng cáo"</string>
     <string name="add_account" msgid="7386223854837017129">"Thêm tài khoản"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"Tài khoản không xác định"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Xóa tài khoản"</string>
     <string name="account_sync" msgid="4315295293211313989">"Chọn ứng dụng được đồng bộ hóa"</string>
     <string name="sync_now" msgid="4335217984374620551">"Đồng bộ hóa ngay bây giờ"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Đang đồng bộ hóa…"</string>
-    <string name="last_synced" msgid="8371967816955123864">"Đồng bộ lần cuối <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="8371967816955123864">"Đồng bộ hoá lần gần đây nhất: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Đã tắt"</string>
     <string name="account_remove" msgid="8456848988853890155">"Xóa tài khoản"</string>
     <string name="account_remove_failed" msgid="5654411101098531690">"Không thể xóa tài khoản"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Văn bản mẫu"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"Phù thủy xứ Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Chương 11: Thành phố ngọc lục bảo của xứ Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Ngay cả khi đã đeo kính bảo vệ mắt màu xanh lục, lúc đầu Dorothy và bạn bè của cô vẫn bị lóa mắt bởi sự lộng lẫy của Thành phố tuyệt vời đó. Dọc phố là những ngôi nhà xinh xắn nối đuôi nhau, tất cả đều được xây bằng đá cẩm thạch xanh lục và ngọc lục bảo lấp lánh dùng để tô điểm ở mọi nơi. Ngay cả vỉa hè dưới chân họ cũng lát bằng đá cẩm thạch xanh lục và các viên gạch lát được ghép với nhau bằng những hàng ngọc lục bảo, đặt sát gần nhau và lấp lánh dưới ánh mặt trời. Các tấm cửa sổ bằng kính màu xanh lục, ngay cả bầu trời phía trên Thành phố cũng có sắc xanh lục và các tia nắng cũng màu xanh lục. \n\nNhiều người, đàn ông, phụ nữ và trẻ em, đi dạo ở đây và họ đều khoác trên mình những bộ quần áo màu xanh lục và có làn da màu hơi xanh lục. Họ nhìn Dorothy và những người bạn kỳ lạ của cô bằng con mắt ngạc nhiên, còn bọn trẻ bỏ chạy và nấp phía sau lưng mẹ khi chúng nhìn thấy Sư tử, nhưng không ai nói với họ lời nào. Có nhiều cửa hàng trên phố và Dorothy thấy mọi thứ trong các cửa hàng đó đều có màu xanh lục. Kẹo, bỏng ngô, giày dép, mũ và quần áo đủ loại được bày bán đều có màu xanh lục. Một người đàn ông trên phố đang bán nước chanh màu xanh lục và khi bọn trẻ mua nước chanh, Dorothy quan sát thấy chúng trả cho ông ấy những đồng xu màu xanh lục. \n\nDường như ở đó không có ngựa hay bất kỳ loài động vật nào, người dân ở đó chở đồ trên những chiếc xe đẩy hàng nhỏ màu xanh lục. Mọi người có vẻ rất hạnh phúc, mãn nguyện và thịnh vượng."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Ngay cả khi đã đeo kính bảo vệ mắt màu xanh lục, lúc đầu Dorothy và bạn bè vẫn cảm thấy loá mắt trước vẻ lộng lẫy của Thành phố tuyệt diệu đó. Dọc phố là những ngôi nhà xinh xắn nằm san sát, tất cả đều được xây bằng đá cẩm thạch màu xanh lục và trang hoàng ngọc lục bảo lấp lánh khắp mọi ngóc ngách. Ngay cả vỉa hè dưới chân họ cũng lát đá cẩm thạch màu xanh lục và ở vị trí tiếp giáp giữa các viên đá, người ta ráp những hàng ngọc lục bảo nằm sát gần nhau và lấp lánh dưới ánh mặt trời. Các ô cửa sổ đều lắp kính màu xanh lục, ngay cả bầu trời phía trên Thành phố cũng có sắc xanh lục và các tia nắng cũng vậy. \n\nĐường phố tấp nập người qua lại, từ đàn ông, phụ nữ đến trẻ em. Ai cũng khoác trên mình những bộ quần áo màu xanh lục và có làn da màu hơi xanh lục. Họ ngạc nhiên nhìn Dorothy và nhóm bạn kỳ lạ của cô, còn bọn trẻ bỏ chạy và nấp phía sau lưng mẹ khi thấy Sư tử, nhưng không ai nói với họ lời nào. Có nhiều cửa hàng trên phố và Dorothy thấy mọi thứ trong các cửa hàng đó đều có màu xanh lục. Kẹo, bỏng ngô, giày dép, mũ và quần áo đủ loại được bày bán đều có màu xanh lục. Một người đàn ông trên phố đang bán nước chanh màu xanh lục và Dorothy thấy rằng khi trả tiền nước chanh, bọn trẻ cũng dùng những đồng xu màu xanh lục. \n\nDường như ở đó không có ngựa hay bất kỳ loài động vật nào, người dân chở đồ trên những chiếc xe đẩy hàng nhỏ màu xanh lục. Mọi người đều có vẻ rất hạnh phúc, mãn nguyện và sung túc."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Lựa chọn định dạng"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Tự động"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Thủ công"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Thay đổi độ phân giải thành %1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Chọn OK để dùng %1$s từ giờ trở đi."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"Dolby Vision không được hỗ trợ tại %1$s và sẽ bị tắt trong \"Cài đặt hiển thị nâng cao\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Chế độ này hỗ trợ %1$s. Trên một số TV, bạn có thể cần bật HDMI nâng cao để hỗ trợ nhiều định dạng HDR hơn. Kiểm tra chế độ cài đặt TV để xem định dạng này có được hỗ trợ hay không."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Chế độ này hỗ trợ: %1$s\nTrên một số TV, bạn có thể cần bật HDMI nâng cao để hỗ trợ nhiều định dạng HDR hơn. Kiểm tra chế độ cài đặt TV để xem định dạng này có được hỗ trợ hay không."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Hủy"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"OK"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Xóa dữ liệu đã lưu trong bộ nhớ đệm?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Xóa dữ liệu lưu trong cache cho tất cả ứng dụng."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Đã kết nối"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Đã ngắt kết nối"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Bạn không có quyền thay đổi cài đặt Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Dùng cho âm thanh TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Gửi ý kiến phản hồi"</string>
     <string name="launch_help" msgid="2607478763131952469">"Trung tâm trợ giúp"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Thiết bị này do tổ chức của bạn quản lý."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Thiết bị này được <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> quản lý."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"– %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Tìm hiểu thêm"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{Ứng dụng máy ảnh}other{Ứng dụng máy ảnh}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Ứng dụng Lịch"</string>
@@ -531,7 +531,7 @@
     <string name="storage_dcim_usage" msgid="1890098882753254745">"Ảnh và video"</string>
     <string name="storage_music_usage" msgid="5362871290115089474">"Âm thanh"</string>
     <string name="storage_media_misc_usage" msgid="3404230292054880339">"Khác"</string>
-    <string name="storage_media_cache_usage" msgid="6397941751551207630">"Dữ liệu đã lưu trong bộ nhớ đệm"</string>
+    <string name="storage_media_cache_usage" msgid="6397941751551207630">"Dữ liệu được lưu trong bộ nhớ đệm"</string>
     <string name="storage_eject" msgid="3268870873944951902">"Ngắt kết nối"</string>
     <string name="storage_format" msgid="5360900929128087085">"Xóa và định dạng"</string>
     <string name="storage_format_as_private" msgid="77945551149326052">"Xóa và định dạng làm bộ nhớ thiết bị"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Bật"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Cấu hình"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"<xliff:g id="SERVICE">%1$s</xliff:g> có thể thu thập tất cả văn bản bạn nhập, ngoại trừ mật khẩu. Dữ liệu được thu thập bao gồm cả dữ liệu cá nhân như số thẻ tín dụng."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"<xliff:g id="SERVICE">%1$s</xliff:g> sẽ có thể đọc màn hình của bạn, hiển thị nội dung trên các ứng dụng khác, theo dõi hoạt động tương tác của bạn với các ứng dụng hoặc cảm biến phần cứng, đồng thời thay mặt bạn tương tác với các ứng dụng."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Ngừng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Chọn OK sẽ ngừng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Chuyển văn bản sang lời nói"</string>
@@ -788,7 +788,7 @@
     <string name="system_window_animation_scale" msgid="685477540250939659">"Tỷ lệ hình động của cửa sổ"</string>
     <string name="system_transition_animation_scale" msgid="7266380208347453619">"Tỷ lệ hình động chuyển đổi"</string>
     <string name="system_animator_duration_scale" msgid="3829445237130423625">"Tỷ lệ thời lượng trình tạo hình động"</string>
-    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Đã bật chế độ nghiêm ngặt"</string>
+    <string name="system_strict_mode_enabled" msgid="7392183793064579588">"Luôn bật chế độ nghiêm ngặt"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"Kết xuất GPU cấu hình"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"Bật theo dõi"</string>
     <string name="system_dont_keep_activities" msgid="4641165963339846161">"Không tiếp tục các hoạt động"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Kết nối thành công"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Hiển thị tất cả"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Đang tìm kiếm"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Không truy xuất được ý định thêm tài khoản từ trình xác thực."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Không thêm được tài khoản hoặc không có loại tài khoản này."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Kênh và nguồn đầu vào"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Kênh, nguồn đầu vào bên ngoài"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Kênh"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Các tính năng sẽ bật:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Lưu ý: Chế độ này có thể làm tăng mức tiêu thụ điện năng của thiết bị."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Bật \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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 3156ca1f5..a9a5d7f8c 100644
--- a/Settings/res/values-zh-rCN/energy-modes.xml
+++ b/Settings/res/values-zh-rCN/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"基本网络功能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"低能耗"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"在您未使用电视时关闭网络连接。"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"重要更新和功能"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"推荐的网络功能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"优化能耗"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"开启可通过网络唤醒电视的功能（联网待机）。"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"其他网络功能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"高能耗"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"除了推荐的功能外，此选项还会在您未使用电视时开启可能会增加能耗的其他功能。"</string>
+    <string 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-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 39c1bb49b..d2f59653e 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -44,10 +44,10 @@
     <string name="header_category_accessories" msgid="6479803330480847199">"遥控器和配件"</string>
     <string name="header_category_personal" msgid="7880053929985150368">"个人"</string>
     <string name="connect_to_network" msgid="4133686359319492392">"连接到网络"</string>
-    <string name="add_an_account" msgid="2601275122685226096">"添加帐号"</string>
-    <string name="accounts_category_title" msgid="7286858931427579845">"帐号和登录"</string>
-    <string name="accounts_category_summary_no_account" msgid="3053606166993074648">"未登录任何帐号"</string>
-    <string name="accounts_category_summary" msgid="7617932110389860822">"{count,plural, =1{# 个帐号}other{# 个帐号}}"</string>
+    <string name="add_an_account" msgid="2601275122685226096">"添加账号"</string>
+    <string name="accounts_category_title" msgid="7286858931427579845">"账号和登录"</string>
+    <string name="accounts_category_summary_no_account" msgid="3053606166993074648">"未登录任何账号"</string>
+    <string name="accounts_category_summary" msgid="7617932110389860822">"{count,plural, =1{# 个账号}other{# 个账号}}"</string>
     <string name="accounts_slice_summary" msgid="1571012157154521119">"媒体服务、Google 助理、付款功能"</string>
     <string name="connectivity_network_category_title" msgid="8226264889892008114">"网络和互联网"</string>
     <string name="sound_category_title" msgid="7899816751041939518">"声音"</string>
@@ -59,20 +59,21 @@
     <string name="help_and_feedback_category_title" msgid="7036505833991003031">"帮助和反馈"</string>
     <string name="privacy_category_title" msgid="8552430590908463601">"隐私设置"</string>
     <string name="privacy_device_settings_category" msgid="5018334603278648524">"设备设置"</string>
-    <string name="privacy_account_settings_category" msgid="5786591549945777400">"帐号设置"</string>
+    <string name="privacy_account_settings_category" msgid="5786591549945777400">"账号设置"</string>
     <string name="privacy_assistant_settings_title" msgid="4524957824712623680">"Google 助理"</string>
     <string name="privacy_purchases_settings_title" msgid="6490965297061569673">"付款和购买"</string>
     <string name="privacy_app_settings_category" msgid="858250971978879266">"应用设置"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"位置信息、使用情况和诊断信息、广告"</string>
-    <string name="add_account" msgid="7386223854837017129">"添加帐号"</string>
-    <string name="account_header_remove_account" msgid="8573697553061331373">"移除帐号"</string>
+    <string name="add_account" msgid="7386223854837017129">"添加账号"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"未知账号"</string>
+    <string name="account_header_remove_account" msgid="8573697553061331373">"移除账号"</string>
     <string name="account_sync" msgid="4315295293211313989">"选择要同步的应用"</string>
     <string name="sync_now" msgid="4335217984374620551">"立即同步"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"正在同步…"</string>
     <string name="last_synced" msgid="8371967816955123864">"上次同步时间：<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"已关闭"</string>
-    <string name="account_remove" msgid="8456848988853890155">"移除帐号"</string>
-    <string name="account_remove_failed" msgid="5654411101098531690">"无法移除帐号"</string>
+    <string name="account_remove" msgid="8456848988853890155">"移除账号"</string>
+    <string name="account_remove_failed" msgid="5654411101098531690">"无法移除账号"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
     <string name="sync_one_time_sync" msgid="1665961083810584134">"立即同步<xliff:g id="LAST_SYNC_TIME">
@@ -113,7 +114,7 @@
     <string name="device_factory_reset" msgid="1110189450013225971">"恢复出厂设置"</string>
     <string name="device_calibration" msgid="2907914144048739705">"校准"</string>
     <string name="device_energy_saver" msgid="6611757996220443028">"关机定时器"</string>
-    <string name="device_energy_saver_summary" msgid="5306058475316008429">"设置定时器，让系统助您将电视关机并节能"</string>
+    <string name="device_energy_saver_summary" msgid="5306058475316008429">"设置定时器，以定时关闭电视并节能"</string>
     <string name="overlay_internal_slice_title" msgid="6427352417573831625"></string>
     <string name="device_fastpair" msgid="1235240814051277047">"设备"</string>
     <string name="surround_sound_select_formats" msgid="6070283650131226239">"选择格式"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"示例文本"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"绿野仙踪"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"第 11 章：奥兹国神奇的翡翠城"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"尽管有绿色眼镜保护着眼睛，桃乐丝和她的朋友们在刚看到这座奇妙的城市时，这里耀眼的光芒还是让他们感到眼花缭乱。街道两旁耸立着绿色大理石砌成的美丽房屋，这些房屋上镶满了闪闪发光的翡翠。他们走过的人行道同样是用绿色大理石铺砌而成，石块由一排排翡翠紧密接合在一起，在阳光的照耀下闪闪发亮。房屋的窗户镶嵌着绿色的玻璃，城市上空有淡淡的绿晕，就连阳光也散发着绿色光芒。\n\n街道上有很多行人，男女老少都有，他们全穿着绿色衣物，连皮肤都泛着绿色。他们都用充满好奇的目光看着桃乐丝和她这群外貌迥异的伙伴们，而孩子们一看到狮子都飞快地躲到他们母亲身后；但没有人开口跟桃乐丝他们说话。街上有许多商店，桃乐丝看见店里的每一件商品都是绿色的，有绿色的糖果，绿色的爆米花，还有各种各样的绿鞋子、绿帽子和绿衣服。有位小贩在卖绿色的柠檬水，当孩子们去买汽水时，桃乐丝发现他们付钱时所用的硬币竟然也是绿色的。\n\n这里好像没有马，也没有其他任何动物。有人推着绿色小推车四处运送物品。每个人看起来都很快乐、满足，一切都显得安定繁荣。"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"尽管有绿色眼镜保护着眼睛，桃乐丝和她的朋友们在刚看到这座奇妙的城市时，这里耀眼的光芒还是让他们感到眼花缭乱。街道两旁耸立着绿色大理石砌成的美丽房屋，这些房屋上镶满了闪闪发光的翡翠。他们走过的人行道同样是用绿色大理石铺砌而成，石块由一排排翡翠紧密接合在一起，在阳光的照耀下闪闪发亮。房屋的窗户镶嵌着绿色的玻璃，城市上空有淡淡的绿晕，就连阳光也散发着绿色光芒。\n\n街道上有很多行人，男女老少都有，他们全穿着绿色衣物，连皮肤都泛着绿色。他们都用充满好奇的目光看着桃乐丝和她这群外貌迥异的伙伴们，而孩子们一看到狮子都飞快地躲到他们母亲身后；但没有人开口跟桃乐丝他们说话。街上有许多商店，桃乐丝看见店里的每一件商品都是绿色的，有绿色的糖果，绿色的爆米花，还有各种各样的绿鞋子、绿帽子和绿衣服。有位小贩在卖绿色的柠檬水，当孩子们去买汽水时，桃乐丝发现他们付钱时所用的硬币竟然也是绿色的。\n\n这里好像没有马，也没有其他任何动物。有人推着绿色小推车四处运送物品。每个人看起来都很快乐、满足，一切都显得安定繁荣。"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"格式选择"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"自动"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"手动"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"将分辨率更改为 %1$s？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"选择“确定”，即可立即开始使用%1$s。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"%1$s不支持杜比视界，“高级显示设置”中将停用此模式"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"此模式支持%1$s。在某些电视上，您可能需要开启 HDMI 增强模式才能启用更多 HDR 格式。请查看电视设置以了解是否支持此模式。"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"此模式支持：%1$s\n在某些电视上，您可能需要开启 HDMI 增强模式才能启用更多 HDR 格式。请查看电视设置以了解是否支持此模式。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"取消"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"确定"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"要清除缓存的数据吗？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"此操作会清除所有应用的缓存数据。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"已连接"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"已断开连接"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"您无权更改蓝牙设置。"</string>
+    <string name="bluetooth_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="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -311,7 +312,7 @@
     <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"贵单位可查看的信息类型"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"贵单位的管理员所做的更改"</string>
     <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"您对此设备的访问权限"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"与您的工作帐号关联的数据，例如电子邮件和日历"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"与您的工作账号关联的数据，例如电子邮件和日历"</string>
     <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"您设备上的应用列表"</string>
     <string name="enterprise_privacy_usage_stats" msgid="7062422823174345793">"每个应用的使用时长和数据用量"</string>
     <string name="enterprise_privacy_network_logs" msgid="305782312671493780">"最新的网络流量日志"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"此设备由贵单位管理。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"此设备由“<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>”管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"、"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"了解详情"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{相机应用}other{相机应用}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"日历应用"</string>
@@ -665,10 +665,10 @@
     <string name="third_party_location_services_title" msgid="2826218400381676508">"第三方位置信息服务"</string>
     <string name="location_reporting" msgid="3552501333650895634">"位置报告"</string>
     <string name="location_history" msgid="4055660203090513120">"位置记录"</string>
-    <string name="location_reporting_desc" msgid="1580018652781674608">"Google会在Google即时和Google地图等产品中使用此功能。启用位置报告功能后，凡是使用此功能的Google产品都将可以存储和使用您设备上与您的Google帐号关联的最新位置数据。"</string>
-    <string name="location_history_desc" msgid="926674012916014270">"如果您为此帐号启用了位置记录功能，Google就可以存储您设备上的位置数据，以供您的应用使用。\n\n例如，Google地图可为您提供路线信息、Google即时可告知您上下班交通路况信息。\n\n您可以随时关闭位置记录功能，但系统并不会因此删除相关记录。要查看和管理您的位置记录，请访问maps.google.com/locationhistory。"</string>
+    <string name="location_reporting_desc" msgid="1580018652781674608">"Google会在Google即时和Google地图等产品中使用此功能。启用位置报告功能后，凡是使用此功能的Google产品都将可以存储和使用您设备上与您的Google账号关联的最新位置数据。"</string>
+    <string name="location_history_desc" msgid="926674012916014270">"如果您为此账号启用了位置记录功能，Google就可以存储您设备上的位置数据，以供您的应用使用。\n\n例如，Google地图可为您提供路线信息、Google即时可告知您上下班交通路况信息。\n\n您可以随时关闭位置记录功能，但系统并不会因此删除相关记录。要查看和管理您的位置记录，请访问maps.google.com/locationhistory。"</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"删除位置记录"</string>
-    <string name="delete_location_history_desc" msgid="4035229731487113147">"该操作将删除您通过此设备存储在这个Google帐号中的所有位置记录。此删除操作无法撤消。部分应用（包括Google即时）将会因此而无法正常工作。"</string>
+    <string name="delete_location_history_desc" msgid="4035229731487113147">"该操作将删除您通过此设备存储在这个Google账号中的所有位置记录。此删除操作无法撤消。部分应用（包括Google即时）将会因此而无法正常工作。"</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"屏幕阅读器"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"显示"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"互动控制"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"启用"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"配置"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"“<xliff:g id="SERVICE">%1$s</xliff:g>”可以收集您输入的所有文字信息（密码除外），其中包括信用卡号等个人数据。"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -791,7 +791,7 @@
     <string name="system_strict_mode_enabled" msgid="7392183793064579588">"启用严格模式"</string>
     <string name="system_profile_gpu_rendering" msgid="1113416260742329348">"GPU 渲染模式分析"</string>
     <string name="system_enable_traces" msgid="108745519968154528">"启用跟踪"</string>
-    <string name="system_dont_keep_activities" msgid="4641165963339846161">"不保留活动"</string>
+    <string name="system_dont_keep_activities" msgid="4641165963339846161">"不保留 activity"</string>
     <string name="system_background_process_limit" msgid="1985373407150771045">"后台进程限制"</string>
     <string name="system_show_all_anrs" msgid="5353216640638263217">"显示所有ANR"</string>
     <string name="system_desc_stay_awake" msgid="8485868071929937500">"停用休眠功能"</string>
@@ -884,11 +884,11 @@
     <string name="inputs_header_connected_input" msgid="4323324944548164849">"{count,plural, =1{已连接的输入设备}other{已连接的输入设备}}"</string>
     <string name="inputs_header_standby_input" msgid="600117963181008144">"{count,plural, =1{待机的输入设备}other{待机的输入设备}}"</string>
     <string name="inputs_header_disconnected_input" msgid="3852361100151289264">"{count,plural, =1{已断开连接的输入设备}other{已断开连接的输入设备}}"</string>
-    <string name="user_add_profile_item_summary" msgid="3211866291940617804">"限制其他人使用您帐号中的应用和内容"</string>
+    <string name="user_add_profile_item_summary" msgid="3211866291940617804">"限制其他人使用您账号中的应用和内容"</string>
     <string name="user_new_profile_name" msgid="6637593067318708353">"受限个人资料"</string>
     <string name="user_restrictions_controlled_by" msgid="8124926446168030445">"由<xliff:g id="APP">%1$s</xliff:g>控制"</string>
     <string name="app_not_supported_in_limited" msgid="4046604594925826955">"受限个人资料无法使用此应用"</string>
-    <string name="app_sees_restricted_accounts" msgid="174038126799649152">"此应用可访问您的帐号"</string>
+    <string name="app_sees_restricted_accounts" msgid="174038126799649152">"此应用可访问您的账号"</string>
     <string name="restriction_location_enable_title" msgid="2552780806199464266">"位置信息"</string>
     <string name="restriction_location_enable_summary" msgid="3719330231217994482">"允许应用使用您的位置信息"</string>
     <string name="restricted_profile_switch_to" msgid="6193201935877168764">"进入受限个人资料"</string>
@@ -903,7 +903,7 @@
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"请稍候…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"更改 PIN 码"</string>
     <string name="restriction_description" msgid="2053112392083722259">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>\n<xliff:g id="VALUE">%2$s</xliff:g>"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"此应用由“<xliff:g id="APP">%1$s</xliff:g>”控制，可使用您的帐号"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"此应用由“<xliff:g id="APP">%1$s</xliff:g>”控制，可使用您的账号"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"输入 PIN 码即可观看此频道"</string>
     <string name="pin_enter_unlock_program" msgid="275489015420025531">"输入 PIN 码即可观看此节目"</string>
     <string name="pin_enter_pin" msgid="5020029261153234751">"输入 PIN 码"</string>
@@ -932,7 +932,7 @@
     <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"已使用的存储空间"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"已使用 <xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="VOLUME">%2$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"清除数据"</string>
-    <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"系统会永久删除此应用的所有数据。\n删除的内容包括所有文件、设置、帐号、数据库等。"</string>
+    <string name="device_apps_app_management_clear_data_desc" msgid="170972356946852847">"系统会永久删除此应用的所有数据。\n删除的内容包括所有文件、设置、账号、数据库等。"</string>
     <string name="device_apps_app_management_clear_default" msgid="4566187319647111484">"清除默认操作"</string>
     <string name="device_apps_app_management_clear_default_set" msgid="1649974109123107390">"使用此应用处理某些操作"</string>
     <string name="device_apps_app_management_clear_default_none" msgid="5935252537185381597">"没有默认操作"</string>
@@ -941,7 +941,7 @@
     <string name="device_apps_app_management_licenses" msgid="4809737266551899869">"第三方源代码"</string>
     <string name="device_apps_app_management_permissions" msgid="4951820230491375037">"权限"</string>
     <string name="device_apps_app_management_not_available" msgid="4198634078194500518">"无法使用应用"</string>
-    <string name="unused_apps" msgid="5539166745483454543">"未使用的应用"</string>
+    <string name="unused_apps" msgid="5539166745483454543">"闲置应用"</string>
     <string name="settings_ok" msgid="5950888975075541964">"确定"</string>
     <string name="settings_confirm" msgid="4489126458677153411">"确认"</string>
     <string name="settings_cancel" msgid="576094334743686152">"取消"</string>
@@ -956,7 +956,7 @@
     <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>
@@ -972,16 +972,16 @@
     <string name="limit_network_in_standby_toggle_info" msgid="566947772381093991">"除非收到自动更新，否则电视在待机模式下会断开网络连接。这可能会减少电视的能耗，但也意味着待机模式下，您可能无法使用投屏和 Google 助理等功能。"</string>
     <string name="limit_network_in_standby_confirm_title" msgid="789232987058850322">"允许在待机模式下连接网络"</string>
     <string name="limit_network_in_standby_confirm_message" msgid="7176699480768019689">"如果允许在待机模式下连接网络，待机时的能耗就会增加。"</string>
-    <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"目前没有存储备份数据的帐号"</string>
+    <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"目前没有存储备份数据的账号"</string>
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
     <string name="backup_erase_dialog_message" msgid="222169533402624861">"要停止备份您的 WLAN 密码、书签、其他设置以及应用数据，并清除 Google 服务器上的所有副本吗？"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"备份我的数据"</string>
-    <string name="privacy_backup_account" msgid="4527813051841860610">"备份帐号"</string>
+    <string name="privacy_backup_account" msgid="4527813051841860610">"备份账号"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"自动还原"</string>
     <string name="factory_reset_device" msgid="6509900821515094361">"重置设备"</string>
-    <string name="factory_reset_description" msgid="6697396335158766785">"此操作会将您的设备恢复为默认设置，并清空所有数据、帐号、文件和已下载的应用。"</string>
-    <string name="factory_reset_info_description" msgid="5098454670833183487">"此操作会将您的设备恢复为默认设置，并清空所有数据、帐号、文件和已下载的应用。"</string>
-    <string name="factory_reset_content_description" msgid="1677022688420116803">"恢复出厂设置，此操作会将您的设备恢复为默认设置，并清空所有数据、帐号、文件和已下载的应用。"</string>
+    <string name="factory_reset_description" msgid="6697396335158766785">"此操作会将您的设备恢复为默认设置，并清空所有数据、账号、文件和已下载的应用。"</string>
+    <string name="factory_reset_info_description" msgid="5098454670833183487">"此操作会将您的设备恢复为默认设置，并清空所有数据、账号、文件和已下载的应用。"</string>
+    <string name="factory_reset_content_description" msgid="1677022688420116803">"恢复出厂设置，此操作会将您的设备恢复为默认设置，并清空所有数据、账号、文件和已下载的应用。"</string>
     <string name="confirm_factory_reset_description" msgid="1337483463207721713">"要清除此设备上的所有个人信息和已下载的应用吗？此操作无法撤消！"</string>
     <string name="confirm_factory_reset_device" msgid="4308646529880718465">"全部清除"</string>
     <string name="select_device_name_title" msgid="3045019448327493634">"为您的 <xliff:g id="DEVICEMODEL">%1$s</xliff:g> 选择名称"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"连接成功"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"全部显示"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"正在搜索"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"未能从身份验证器中提取“添加账号”意图。"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"添加账号失败，或账号类型不适用。"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"频道和输入源"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"频道、外部输入源"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"频道"</string>
@@ -1116,13 +1118,18 @@
     <string name="picture_settings_title" msgid="7643193630924322697">"画面"</string>
     <string name="screen_settings_title" msgid="7806908869190824434">"屏幕"</string>
     <string name="sound_settings_title" msgid="9149367966117889465">"声音"</string>
-    <string name="power_and_energy" msgid="4638182439670702556">"开关和电源"</string>
+    <string name="power_and_energy" msgid="4638182439670702556">"电源和能耗"</string>
     <string name="power_on_behavior" msgid="927607372303160716">"开机行为"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"重置"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"以太网配对码"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"耗能模式"</string>
+    <string name="energy_modes" msgid="1331693860386361744">"能耗模式"</string>
     <string name="energy_modes_summary" msgid="7196407759836930799">"在您未使用电视时改善能效"</string>
-    <string name="energy_mode_enables" msgid="357960364751477627">"启用："</string>
+    <string name="energy_mode_enables" msgid="357960364751477627">"此模式会启用下列功能："</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"请注意，此模式可能会增加设备的耗电量。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"启用“<xliff:g id="ENERGYMODENAME">%s</xliff:g>”"</string>
+    <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_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 e8eeea002..9dad7ad09 100644
--- a/Settings/res/values-zh-rHK/energy-modes.xml
+++ b/Settings/res/values-zh-rHK/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"必要網絡功能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"低耗電量"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"在電視閒置時關閉網絡連線"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"重要更新和功能"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"建議的網絡功能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"優化耗電量"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"開啟可透過網絡喚醒電視的功能 (網絡待機)。"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"額外網絡功能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"耗電量增加"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"開啟這個選項後，即使電視閒置，系統仍會啟用建議及其他功能，並可能會增加耗電量。"</string>
+    <string 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-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 8a7b1c971..811743d83 100644
--- a/Settings/res/values-zh-rHK/strings.xml
+++ b/Settings/res/values-zh-rHK/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"應用程式設定"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"位置、使用情況與診斷、廣告"</string>
     <string name="add_account" msgid="7386223854837017129">"新增帳戶"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"不明帳戶"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"移除帳戶"</string>
     <string name="account_sync" msgid="4315295293211313989">"選擇已同步的應用程式"</string>
     <string name="sync_now" msgid="4335217984374620551">"立即同步處理"</string>
@@ -127,14 +128,14 @@
     <string name="surround_sound_format_dolby_truehd" msgid="5113046743572967088">"Dolby TrueHD"</string>
     <string name="surround_sound_format_e_ac3_joc" msgid="3360344066462262996">"配備 Dolby Atmos 技術的 Dolby Digital Plus"</string>
     <string name="surround_sound_format_dra" msgid="6102878163986662443">"DRA"</string>
-    <string name="surround_sound_auto_info" msgid="4829346839183591680">"請注意：如果您的裝置無法正確報告支援的格式，自動選項未必可以運作。"</string>
+    <string name="surround_sound_auto_info" msgid="4829346839183591680">"請注意：如果你的裝置無法正確報告支援的格式，自動選項未必可以運作。"</string>
     <string name="surround_sound_auto_title" msgid="4892922385727913277">"自動：只啟用音訊輸出裝置支援的格式 "</string>
     <string name="surround_sound_auto_summary" msgid="7073023654150720285">"選取後，系統將允許應用程式選擇裝置系統支援的任何音效格式。應用程式未必會選擇最高音質的格式。"</string>
     <string name="surround_sound_none_title" msgid="1600095173519889326">"無：一律不使用環迴立體聲"</string>
     <string name="surround_sound_manual_title" msgid="4935447605070985537">"手動：不論音訊輸出裝置支援哪些格式，只啟用或停用此裝置已選的支援格式。"</string>
-    <string name="surround_sound_manual_summary" msgid="5155535847461070572">"選取後，您可以手動停用裝置系統支援但播放時出現問題的音效格式，同時可以啟用裝置系統不支援的音效格式。在個別情況下，應用程式未必會選擇最高音質的格式。"</string>
+    <string name="surround_sound_manual_summary" msgid="5155535847461070572">"選取後，你可以手動停用裝置系統支援但播放時出現問題的音效格式，同時可以啟用裝置系統不支援的音效格式。在個別情況下，應用程式未必會選擇最高音質的格式。"</string>
     <string name="surround_sound_enable_unsupported_dialog_title" msgid="9155579373370356463">"要啟用不支援的音效格式嗎？"</string>
-    <string name="surround_sound_enable_unsupported_dialog_desc" msgid="1901648758103522741">"您已連接的音響裝置並不支援此格式。這可能會導致裝置出現非預期的行為，如發出大聲的噪音或劈啪聲。"</string>
+    <string name="surround_sound_enable_unsupported_dialog_desc" msgid="1901648758103522741">"你已連接的音響裝置並不支援此格式。這可能會導致裝置出現非預期的行為，如發出大聲的噪音或劈啪聲。"</string>
     <string name="surround_sound_enable_unsupported_dialog_cancel" msgid="3499147437078761105">"取消"</string>
     <string name="surround_sound_enable_unsupported_dialog_ok" msgid="7466983147896640444">"仍要變更"</string>
     <string name="surround_sound_supported_title" msgid="4873195851187547020">"支援的格式"</string>
@@ -156,20 +157,18 @@
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"偏好的動態範圍"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"系統自動轉換"</string>
     <string name="preferred_dynamic_range_selection_system_desc" msgid="5712920601553613576">"由系統管理格式轉換"</string>
-    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"選取這個選項，系統就會向螢幕傳送合適的動態範圍，並按需要將內容轉換至該動態範圍。"</string>
+    <string name="preferred_dynamic_range_selection_system_summary" msgid="4509062596428781094">"選取這個選項，系統會斷定合適向螢幕傳送的動態範圍，並按需要將內容轉換至該動態範圍。"</string>
     <string name="preferred_dynamic_range_selection_passthrough_desc" msgid="4831260397179583737">"一律採用內容的格式"</string>
     <string name="preferred_dynamic_range_selection_force_title" msgid="4448836594133973103">"強制轉換"</string>
     <string name="preferred_dynamic_range_selection_force_desc" msgid="1418542349290684513">"強制轉換至偏好格式"</string>
-    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"強制轉換至您偏好的格式。強制轉換可能會影響「顯示模式」或「HDR 格式」內的其他設定。"</string>
+    <string name="preferred_dynamic_range_selection_force_summary" msgid="8381058061765216239">"強制轉換至你偏好的格式。強制轉換可能會影響「顯示模式」或「HDR 格式」內的其他設定。"</string>
     <string name="preferred_dynamic_range_selection_force_sdr_title" msgid="3135104063034317252">"一律轉換至 SDR"</string>
     <string name="preferred_dynamic_range_selection_force_hdr_title" msgid="1032587815433139859">"一律轉換至 <xliff:g id="HDR_TYPE">%s</xliff:g>"</string>
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"要強制輸出 HDR 格式嗎？"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"根據預設，格式會強制轉換至 <xliff:g id="HDR_TYPE">%s</xliff:g>。"</string>
-    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"您的螢幕將採用 1080p 60Hz 解像度。此選項不支援採用 4K 60Hz 解像度的螢幕。"</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"你的螢幕將採用 1080p 60Hz 解像度。此選項不支援採用 4K 60Hz 解像度的螢幕。"</string>
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"目前的解像度並不支援 Dolby Vision。若你手動啟用 Dolby Vision，螢幕解像度度將會變更為 1080p 60Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"要將解像度變更為 1080p 60Hz？"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"一律強制轉換至 Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"如「進階顯示設定」中的「HDR 格式」已停用 Dolby Vision，強制轉換至 Dolby Vision 便可重新啟用此格式。"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"一律強制轉換至 HDR10"</string>
@@ -182,18 +181,18 @@
     <string name="dynamic_range_selection_force_sdr_summary" msgid="2874771365465898941">"強制轉換至 SDR 將停用「進階顯示設定」中的所有「HDR 格式」選項。"</string>
     <string name="match_content_frame_rate_title" msgid="153291168560947689">"配合內容的影格速率"</string>
     <string name="match_content_frame_rate_seamless" msgid="5577846750811067585">"只限流暢轉換"</string>
-    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"如果應用程式要求，您的裝置會根據您正觀看內容的原來影格速率輸出內容 (只限電視可流暢轉換時)。"</string>
-    <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"您連接的顯示屏不支援更新率無縫轉換功能。除非您轉用支援的顯示屏，否則這個選項不會產生任何作用。"</string>
+    <string name="match_content_frame_rate_seamless_summary" msgid="2737466163964133210">"如果應用程式要求，你的裝置會根據你正觀看內容的原來影格速率輸出內容 (只限電視可流暢轉換時)。"</string>
+    <string name="match_content_frame_rate_seamless_not_supported_summary" msgid="98559950465123792">"你連接的顯示屏不支援更新率無縫轉換功能。除非你轉用支援的顯示屏，否則這個選項不會產生任何作用。"</string>
     <string name="match_content_frame_rate_non_seamless" msgid="2702658727234710031">"一律啟用"</string>
-    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"如果應用程式要求，您的裝置會根據您正觀看內容的原來影格速率輸出內容。這可能會令螢幕在退出或開始影片播放時暫時空白一秒。"</string>
+    <string name="match_content_frame_rate_non_seamless_summary" msgid="6831699459487130055">"如果應用程式要求，你的裝置會根據你正觀看內容的原來影格速率輸出內容。這可能會令螢幕在退出或開始影片播放時暫時空白一秒。"</string>
     <string name="match_content_frame_rate_never" msgid="1678354793095148423">"永不"</string>
-    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"即使應用程式要求，您的裝置也永不會嘗試根據您正觀看內容的原來影格速率輸出內容。"</string>
+    <string name="match_content_frame_rate_never_summary" msgid="742977618080396095">"即使應用程式要求，你的裝置也永不會嘗試根據你正觀看內容的原來影格速率輸出內容。"</string>
     <string name="font_scale_settings_title" msgid="4114019544800225980">"文字縮放比例"</string>
     <string name="font_scale_item_detail" msgid="1558315053348778805">"縮放至 <xliff:g id="SCALE">%1$d</xliff:g>%%"</string>
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"範例文字"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"《綠野仙蹤》"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"第 11 章：奧茲國的奇妙翡翠城"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"即使戴著綠色眼鏡保護雙眼，桃樂絲和她的朋友一開始還是被這座奇妙城市的耀眼光芒照得目眩神迷。街道兩旁都是以碧綠大理石砌成的美麗房屋，到處鑲滿閃閃發亮的翡翠。她們走過的路面同樣以碧綠大理石鋪砌而成，石板與石板之間鑲有一排排緊密相連的翡翠，在陽光的照耀下閃閃發亮。房屋的窗戶鑲嵌著翠綠玻璃，城市上空呈現淡綠色，就連陽光也散發著綠色光芒。\n\n路上有很多行人，不論男女老幼都穿著綠色衣服，甚至皮膚也略帶綠色。他們好奇地盯著桃樂絲和她那群外貌奇特的夥伴，所有小孩一看到獅子都拔足而逃，各自躲到母親身後；然而，沒有人開口與他們交談。街道上的商店五花八門，桃樂絲發現店裡每件商品都是綠色的，有綠色的糖果和爆谷，還有綠色的鞋子、帽子和衣服。有位小販在路上售賣綠色檸檬水，當孩子們拿錢購買時，桃樂絲發現錢幣也是綠色的。\n\n城裡似乎沒有馬，也沒有任何動物。居民都是推著綠色小車運載物品。每個人看起來都很開心滿足，一切都安定繁榮。"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"即使戴著綠色眼鏡保護雙眼，桃樂絲和她的朋友一開始還是被這座奇妙城市的耀眼光芒照得目眩神迷。街道兩旁都是以碧綠大理石砌成的美麗房屋，到處鑲滿閃閃發亮的翡翠。她們走過的路面同樣以碧綠大理石鋪砌而成，石板與石板之間鑲有一排排緊密相連的翡翠，在陽光的照耀下閃閃發亮。房屋的窗戶鑲嵌著翠綠玻璃，城市上空呈現淡綠色，就連陽光也散發著綠色光芒。\n\n路上有很多行人，不論男女老幼都穿著綠色衣服，甚至皮膚也略帶綠色。他們好奇地盯著桃樂絲和她那群外貌奇特的夥伴，所有小孩一看到獅子都拔足而逃，各自躲到母親身後；然而，沒有人開口與他們交談。街道上的商店五花八門，桃樂絲發現店裡每件商品都是綠色的，有綠色的糖果和爆谷，還有綠色的鞋子、帽子和衣服。有位小販在路上售賣綠色檸檬水，當孩子們拿錢購買時，桃樂絲發現錢幣也是綠色的。\n\n城裡似乎沒有馬，也沒有任何動物。居民都是推著綠色小車運載物品。每個人看起來都很開心滿足，一切都安定繁榮。"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"格式選擇"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"自動"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"手動"</string>
@@ -207,7 +206,7 @@
     <string name="hdr_format_hdr10plus" msgid="4371652089162162876">"HDR10+"</string>
     <string name="hdr_format_dolby_vision" msgid="7367264615042999587">"Dolby Vision"</string>
     <string name="hdr_format_selection_auto_summary" msgid="7384637194191436727">"選取後，系統將允許應用程式選擇裝置系統支援的任何 HDR 格式。應用程式未必會選擇最高畫質的格式。"</string>
-    <string name="hdr_format_selection_manual_summary" msgid="7886959642083639353">"選取後，您可以手動停用裝置系統支援但播放時出現問題的 HDR 格式，但您無法強行啟用裝置系統不支援的 HDR 格式。應用程式未必會選擇最高畫質的格式。"</string>
+    <string name="hdr_format_selection_manual_summary" msgid="7886959642083639353">"選取後，你可以手動停用裝置系統支援但播放時出現問題的 HDR 格式，但你無法強行啟用裝置系統不支援的 HDR 格式。應用程式未必會選擇最高畫質的格式。"</string>
     <string name="hdr_format_info" msgid="5652559220799426076">"格式資料"</string>
     <string name="hdr_show_formats" msgid="171065892975445851">"顯示格式"</string>
     <string name="hdr_hide_formats" msgid="8561568998525727230">"隱藏格式"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"要將解像度變更為 %1$s 嗎？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"選擇 [確定] 即可從現在開始使用 %1$s。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"「%1$s」並不支援 Dolby Vision，因此 Dolby Vision 會在「進階顯示設定」中停用"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"此模式支援 %1$s。在部分電視上，您可能要開啟 HDMI 增強格式，方可啟用更多 HDR 格式。請檢查電視設定以確認支援狀況。"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"此模式支援：%1$s\n在部分電視上，你可能要開啟 HDMI 增強格式，方可啟用更多 HDR 格式。請檢查電視設定以確認支援狀況。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"取消"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"確定"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"清除快取資料？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"這會清除所有應用程式的快取資料。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -261,7 +259,7 @@
     <string name="connected_devices_slice_pref_title" msgid="6761921505544005991">"遙控器和配件"</string>
     <string name="bluetooth_toggle_title" msgid="3808904783456336104">"藍牙"</string>
     <string name="bluetooth_toggle_confirmation_dialog_title" msgid="3906746631391295717">"關閉藍牙"</string>
-    <string name="bluetooth_toggle_confirmation_dialog_summary" msgid="9017044450625172698">"關閉藍牙後，您將無法透過遙控器使用「Google 助理」。"</string>
+    <string name="bluetooth_toggle_confirmation_dialog_summary" msgid="9017044450625172698">"關閉藍牙後，你將無法透過遙控器使用「Google 助理」。"</string>
     <string name="bluetooth_pair_accessory" msgid="5508750142754420984">"配對配件"</string>
     <string name="bluetooth_known_devices_category" msgid="6895470515631452961">"配件"</string>
     <string name="bluetooth_official_remote_category" msgid="5817814488268307170">"遙控器"</string>
@@ -279,13 +277,14 @@
     <string name="bluetooth_serial_number_label" msgid="6639294603220209971">"藍牙位址"</string>
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"已連接"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"已中斷連接"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"您沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"你沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"用於電視音訊"</string>
     <string name="send_feedback" msgid="936698637869795473">"傳送意見"</string>
     <string name="launch_help" msgid="2607478763131952469">"說明中心"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
     <string name="system_date_time" msgid="5922833592234018667">"日期和時間"</string>
     <string name="system_language" msgid="5516099388471974346">"語言"</string>
-    <string name="language_empty_list_user_restricted" msgid="5430199913998605436">"您沒有變更裝置語言的權限。"</string>
+    <string name="language_empty_list_user_restricted" msgid="5430199913998605436">"你沒有變更裝置語言的權限。"</string>
     <string name="system_keyboard" msgid="1514460705385401872">"鍵盤"</string>
     <string name="system_keyboard_autofill" msgid="8530944165814838255">"鍵盤和自動填入"</string>
     <string name="system_autofill" msgid="6983989261108020046">"自動填入"</string>
@@ -307,14 +306,14 @@
     <string name="number_of_device_admins_none" msgid="2734299122299837459">"沒有使用中的應用程式"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"受管理的裝置資料"</string>
-    <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"由您的機構管理的變更和設定"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"由你的機構管理的變更和設定"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="2866704039759872293">"由「<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>」管理的變更和設定"</string>
-    <string name="enterprise_privacy_header" msgid="9221881402582661521">"為讓您存取工作資料，您的機構可能會在裝置上變更設定和安裝軟件。\n\n如要瞭解詳情，請與您機構的管理員聯絡。"</string>
-    <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"您機構可查看的資訊類型"</string>
-    <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"您機構管理員作出的變更"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"您對此裝置的存取權"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"與您公司帳戶關聯的資料 (例如電郵和日曆)"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"您裝置上的應用程式清單"</string>
+    <string name="enterprise_privacy_header" msgid="9221881402582661521">"為讓你存取工作資料，你的機構可能會在裝置上變更設定和安裝軟件。\n\n如要瞭解詳情，請與你機構的管理員聯絡。"</string>
+    <string name="enterprise_privacy_exposure_category" msgid="1555735251238636669">"你機構可查看的資訊類型"</string>
+    <string name="enterprise_privacy_exposure_changes_category" msgid="7750498604032318318">"你機構管理員作出的變更"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="7397106369136259850">"你對此裝置的存取權"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="8135491104894522008">"與你公司帳戶關聯的資料 (例如電郵和日曆)"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="5012554762299490994">"你裝置上的應用程式清單"</string>
     <string name="enterprise_privacy_usage_stats" msgid="7062422823174345793">"每個應用程式的使用時間和數據用量"</string>
     <string name="enterprise_privacy_network_logs" msgid="305782312671493780">"最近的網絡流量記錄"</string>
     <string name="enterprise_privacy_bug_reports" msgid="2393617117911211486">"最新的錯誤報告"</string>
@@ -331,23 +330,22 @@
     <string name="enterprise_privacy_input_method" msgid="5814752394251833058">"預設鍵盤"</string>
     <string name="enterprise_privacy_input_method_name" msgid="1088874503312671318">"已設定為「<xliff:g id="APP_LABEL">%s</xliff:g>」"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="8845550514448914237">"已開啟「永久連線的 VPN」"</string>
-    <string name="enterprise_privacy_always_on_vpn_personal" msgid="6996782365866442280">"已開啟您個人設定檔中的「永久連線的 VPN」"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="3674119583050531071">"已開啟您工作設定檔中的「永久連線的 VPN」"</string>
+    <string name="enterprise_privacy_always_on_vpn_personal" msgid="6996782365866442280">"已開啟你個人設定檔中的「永久連線的 VPN」"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="3674119583050531071">"已開啟你工作設定檔中的「永久連線的 VPN」"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="2818848848337527780">"已設定全域 HTTP Proxy"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="975646846291012452">"信任的憑證"</string>
-    <string name="enterprise_privacy_ca_certs_personal" msgid="7641368559306519707">"您個人設定檔中信任的憑證"</string>
-    <string name="enterprise_privacy_ca_certs_work" msgid="2905939250974399645">"您工作設定檔中信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_personal" msgid="7641368559306519707">"你個人設定檔中信任的憑證"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="2905939250974399645">"你工作設定檔中信任的憑證"</string>
     <string name="enterprise_privacy_number_ca_certs" msgid="5918439861975410142">"{count,plural, =1{# 個 CA 憑證}other{# 個 CA 憑證}}"</string>
     <string name="enterprise_privacy_lock_device" msgid="3140624232334033641">"管理員可以將裝置上鎖和重設密碼"</string>
     <string name="enterprise_privacy_wipe_device" msgid="1714271125636510031">"管理員可以刪除所有裝置資料"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="8272298134556250600">"輸入錯誤密碼的次數上限；如果超出此上限，系統將刪除所有裝置資料"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="1184137458404844014">"輸入錯誤密碼的次數上限；如果超出此上限，系統將刪除工作設定檔資料"</string>
     <string name="enterprise_privacy_number_failed_password_wipe" msgid="277415009661470768">"{count,plural, =1{# 次嘗試}other{# 次嘗試}}"</string>
-    <string name="do_disclosure_generic" msgid="8390478119591845948">"此裝置由您的機構管理。"</string>
+    <string name="do_disclosure_generic" msgid="8390478119591845948">"此裝置由你的機構管理。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"，"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"瞭解詳情"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{相機應用程式}other{相機應用程式}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"日曆應用程式"</string>
@@ -360,7 +358,7 @@
     <string name="app_names_concatenation_template_3" msgid="4932774380339466733">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>、<xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>、<xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="tutorials" msgid="7880770425872110455">"教學課程"</string>
     <string name="about_system_update" msgid="7421264399111367755">"系統更新"</string>
-    <string name="system_update_description" msgid="998883510488461766">"此操作會將您的系統軟件更新至最新版本。您的裝置將會重新啟動。"</string>
+    <string name="system_update_description" msgid="998883510488461766">"此操作會將你的系統軟件更新至最新版本。你的裝置將會重新啟動。"</string>
     <string name="system_update_content_description" msgid="5702888187682876466">"系統更新，呢項操作會將你嘅系統軟件更新做最新版本。你部裝置將會重新啟動。"</string>
     <string name="about_preference" msgid="9112690446998150670">"關於"</string>
     <string name="device_name" msgid="566626587332817733">"裝置名稱"</string>
@@ -373,12 +371,12 @@
     <string name="about_version" msgid="6223547403835399861">"Android TV OS 版本"</string>
     <string name="about_serial" msgid="3432319328808745459">"序號"</string>
     <string name="about_build" msgid="8467840394761634575">"Android TV OS 版本"</string>
-    <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{您只需完成剩餘的 # 個步驟，便可成為開發人員}other{您只需完成剩餘的 # 個步驟，便可成為開發人員}}"</string>
+    <string name="show_dev_countdown" msgid="4064986225625409361">"{count,plural, =1{你只需完成剩餘的 # 個步驟，便可成為開發人員}other{你只需完成剩餘的 # 個步驟，便可成為開發人員}}"</string>
     <string name="about_ads" msgid="7662896442040086522">"廣告"</string>
-    <string name="ads_description" msgid="8081069475265061074">"管理您的廣告設定，例如重設廣告 ID。"</string>
+    <string name="ads_description" msgid="8081069475265061074">"管理你的廣告設定，例如重設廣告 ID。"</string>
     <string name="ads_content_description" msgid="1006489792324920289">"廣告，管理你嘅廣告設定，例如重設廣告 ID。"</string>
-    <string name="show_dev_on" msgid="612741433124106067">"您現已成為開發人員！"</string>
-    <string name="show_dev_already" msgid="1522591284776449818">"不用了，您已經是開發人員"</string>
+    <string name="show_dev_on" msgid="612741433124106067">"你現已成為開發人員！"</string>
+    <string name="show_dev_already" msgid="1522591284776449818">"不用了，你已經是開發人員"</string>
     <string name="device_info_default" msgid="2374506935205518448">"不明"</string>
     <string name="selinux_status" msgid="1146662734953021410">"SELinux 狀態"</string>
     <string name="selinux_status_disabled" msgid="4027105362332795142">"已停用"</string>
@@ -392,10 +390,10 @@
     <string name="device_status_summary" msgid="3270932829412434985">"網絡、序列號和其他資料"</string>
     <string name="manual" msgid="5683935624321864999">"手動"</string>
     <string name="regulatory_information" msgid="9107675969694713391">"監管資訊"</string>
-    <string name="device_feedback" msgid="4871903271442960465">"傳送您對這部裝置的意見"</string>
+    <string name="device_feedback" msgid="4871903271442960465">"傳送你對這部裝置的意見"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4641790432171693921">"啟動程式已解鎖"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="2979556699380115576">"請先連線至互聯網"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"連線至互聯網或聯絡您的流動網絡供應商"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="1946089732305102622">"連線至互聯網或聯絡你的流動網絡供應商"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5634005787486307657">"無法在已遭流動網絡供應商鎖定的裝置上啟用"</string>
     <string name="oem_lock_info_message" msgid="2165887409937351689">"請重新啟動裝置以啟用裝置保護功能。"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="1654574152815129396">"已釋放共 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行時間：<xliff:g id="DATE">%2$s</xliff:g>"</string>
@@ -414,7 +412,7 @@
     <string name="terms_title" msgid="192888187310800678">"條款及細則"</string>
     <string name="webview_license_title" msgid="5370270485188947540">"WebView 系統授權"</string>
     <string name="consumer_information_title" msgid="7729729568416672733">"消費者資料"</string>
-    <string name="consumer_information_message" msgid="205236637689468764">"您可以在 Android TV 上找到來自應用程式開發人員和電影公司等第三方合作夥伴以及 Google 的內容。詳情請參閱 "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
+    <string name="consumer_information_message" msgid="205236637689468764">"你可以在 Android TV 上找到來自應用程式開發人員和電影公司等第三方合作夥伴以及 Google 的內容。詳情請參閱 "<a href="g.co/tv/androidtvinfo">"g.co/tv/androidtvinfo"</a></string>
     <string name="consumer_information_button_ok" msgid="6979480064600038080">"確定"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="4475363344103354364">"差"</item>
@@ -443,7 +441,7 @@
     <string name="wifi_setting_available_networks" msgid="2096957819727319750">"可用的網絡"</string>
     <string name="wifi_setting_other_options_add_network" msgid="6490215784178866978">"新增網絡"</string>
     <string name="wifi_setting_other_options_add_network_via_easyconnect" msgid="2869989555950644533">"快速連接"</string>
-    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"「快速連接」可助您使用手機掃瞄 QR 碼，以快速連接 Wi-Fi。"</string>
+    <string name="wifi_setting_other_options_add_network_via_easyconnect_info_summary" msgid="4564538591168691865">"「快速連接」可助你使用手機掃瞄 QR 碼，以快速連接 Wi-Fi。"</string>
     <string name="security_type" msgid="2297615092250075696">"安全性類型"</string>
     <string name="other_network" msgid="5299289104661858596">"其他網絡…"</string>
     <string name="skip_network" msgid="3095529090560000692">"略過"</string>
@@ -516,12 +514,12 @@
     <string name="title_wifi_phase2_authentication" msgid="1167205033305931574">"選擇 <xliff:g id="SSID">%1$s</xliff:g> 的 phase2 驗證"</string>
     <string name="title_wifi_identity" msgid="6273917200971028259">"輸入 <xliff:g id="SSID">%1$s</xliff:g> 的身分"</string>
     <string name="title_wifi_anonymous_identity" msgid="5965175781722004334">"輸入 <xliff:g id="SSID">%1$s</xliff:g> 的匿名身分"</string>
-    <string name="wifi_setup_summary_title_connected" msgid="2725439590655448489">"您已連線至 <xliff:g id="SSID">%1$s</xliff:g>"</string>
+    <string name="wifi_setup_summary_title_connected" msgid="2725439590655448489">"你已連線至 <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_summary_title_connected" msgid="201105022065577659">"已連接網絡"</string>
     <string name="wifi_summary_title_not_connected" msgid="7991004795297065201">"未連接網絡"</string>
     <string name="wifi_summary_description_connected_to_wifi_network" msgid="8796747274977762311">"已連接 <xliff:g id="SSID">%1$s</xliff:g>。要連接至其他網絡嗎？"</string>
     <string name="wifi_summary_unknown_network" msgid="8044143986439139664">"未知的網絡"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7326314737931342236">"您無權更改 Wi-Fi 網絡。"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7326314737931342236">"你無權更改 Wi-Fi 網絡。"</string>
     <string name="title_ok" msgid="6500452958848127145">"確定"</string>
     <string name="title_cancel" msgid="2337143367016419016">"取消"</string>
     <string name="storage_title" msgid="6637715914885228193">"儲存空間"</string>
@@ -544,14 +542,14 @@
     <string name="storage_migrate_away" msgid="7880100961434638430">"將資料轉移至其他儲存空間"</string>
     <string name="storage_no_apps" msgid="95566375753627272">"沒有任何應用程式可供備份"</string>
     <string name="storage_forget" msgid="4671975563260507003">"移除此裝置儲存空間"</string>
-    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"如需使用儲存在此硬碟內的應用程式或資料，請重新插入。如果無法使用硬碟，可選擇忘記此儲存空間。\n\n如果您選擇忘記儲存空間，硬碟上的所有資料將被永久刪除。\n\n您可以稍後重新安裝應用程式，但儲存在此硬碟的相關資料將被刪除。"</string>
+    <string name="storage_forget_wall_of_text" msgid="230454348256179142">"如需使用儲存在此硬碟內的應用程式或資料，請重新插入。如果無法使用硬碟，可選擇忘記此儲存空間。\n\n如果你選擇忘記儲存空間，硬碟上的所有資料將被永久刪除。\n\n你可以稍後重新安裝應用程式，但儲存在此硬碟的相關資料將被刪除。"</string>
     <string name="storage_device_storage_section" msgid="22958375769694027">"儲存裝置"</string>
     <string name="storage_removable_storage_section" msgid="280332107650735088">"可攜式儲存裝置"</string>
     <string name="storage_reset_section" msgid="3896575204828589494">"重設"</string>
     <string name="storage_free_up" msgid="5719667150891467122">"騰出儲存空間"</string>
     <string name="storage_free_up_clear_cached_data" msgid="858596875459698634">"清除快取資料"</string>
     <string name="storage_free_up_clear_cached_data_summary" msgid="3111860361699185304">"騰出 <xliff:g id="SPACE">%1$s</xliff:g>"</string>
-    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"清除佔用空間的臨時檔案。這不會影響應用程式偏好設定或離線影片等已儲存的資料，而您亦無需再次登入應用程式。"</string>
+    <string name="storage_free_up_clear_cached_data_info" msgid="719348815620748812">"清除佔用空間的臨時檔案。這不會影響應用程式偏好設定或離線影片等已儲存的資料，而你亦無需再次登入應用程式。"</string>
     <string name="storage_free_up_clear_cached_data_confirm_title" msgid="5047418718048910850">"要清除快取資料嗎？"</string>
     <string name="storage_free_up_clear_cached_data_confirm_description" msgid="4840728913914074729">"這會清除所有應用程式的快取資料。"</string>
     <string name="storage_free_up_uninstall_apps" msgid="7755671754934975908">"解除安裝應用程式"</string>
@@ -566,7 +564,7 @@
     <string name="storage_wizard_format_as_private_title" msgid="7985715762649933211">"格式化為裝置儲存空間"</string>
     <string name="storage_wizard_format_as_private_description" msgid="6143406934742456154">"USB 驅動器需要格式化，以策安全。格式化後，該驅動器只能用於此裝置。格式化將清除目前驅動器上的所有資料。要避免資料遺失，請先備份資料。"</string>
     <string name="storage_wizard_format_as_public_title" msgid="3546915348149438389">"清除和格式化"</string>
-    <string name="storage_wizard_format_as_public_description" msgid="5849129772499352597">"格式化後，您可在其他裝置使用此 USB 硬碟。USB 硬碟的所有資料將被刪除，請先將應用程式備份至其他裝置儲存空間。"</string>
+    <string name="storage_wizard_format_as_public_description" msgid="5849129772499352597">"格式化後，你可在其他裝置使用此 USB 硬碟。USB 硬碟的所有資料將被刪除，請先將應用程式備份至其他裝置儲存空間。"</string>
     <string name="storage_wizard_format_progress_title" msgid="3875906251546380271">"正在格式化 USB 驅動器…"</string>
     <string name="storage_wizard_format_progress_description" msgid="292229747129805538">"這個過程可能需時，請勿移除驅動器。"</string>
     <string name="storage_wizard_migrate_choose_title" msgid="8743036821605231654">"選擇接收轉移資料的儲存空間"</string>
@@ -579,7 +577,7 @@
     <string name="storage_wizard_migrate_progress_title" msgid="2623480667090826800">"正在將資料移至<xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_migrate_progress_description" msgid="4023358325977284145">"此操作需時，請勿移除外置硬碟。\n某些應用程式在此期間將無法正常運作。"</string>
     <string name="storage_wizard_format_slow_title" msgid="7640229918512394316">"這驅動器好像有點緩慢。"</string>
-    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"您可以繼續，但轉移至此位置的應用程式可能會間斷，而資料傳輸亦可能需要較長時間。請考慮使用較高速的驅動器以提升效能。"</string>
+    <string name="storage_wizard_format_slow_summary" msgid="3674023258060474037">"你可以繼續，但轉移至此位置的應用程式可能會間斷，而資料傳輸亦可能需要較長時間。請考慮使用較高速的驅動器以提升效能。"</string>
     <string name="storage_wizard_format_action" msgid="3275676687226857170">"格式化"</string>
     <string name="storage_wizard_backup_apps_action" msgid="1402199004931596519">"備份應用程式"</string>
     <string name="storage_wizard_back_up_apps_title" msgid="6225663573896846937">"存儲在<xliff:g id="NAME">%1$s</xliff:g>的應用程式"</string>
@@ -592,7 +590,7 @@
     <string name="storage_wizard_move_app_progress_title" msgid="7058465372227392453">"正在轉移<xliff:g id="NAME">%1$s</xliff:g>…"</string>
     <string name="storage_wizard_move_app_progress_description" msgid="7673347796805764888">"請勿在轉移時移除驅動器。\n在完成轉移前，此裝置上的<xliff:g id="APPNAME">%1$s</xliff:g>應用程式將不能使用。"</string>
     <string name="storage_wizard_forget_confirm_title" msgid="3709482471888830896">"要移除裝置儲存空間嗎？"</string>
-    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"執行「忘記」後，此硬碟內的所有資料將被永久刪除。您要繼續嗎？"</string>
+    <string name="storage_wizard_forget_confirm_description" msgid="5896860042525566767">"執行「忘記」後，此硬碟內的所有資料將被永久刪除。你要繼續嗎？"</string>
     <string name="storage_wizard_forget_action" msgid="5609631662522950596">"忘記"</string>
     <string name="storage_new_title" msgid="4768955281180255038">"已連接 USB 驅動器"</string>
     <string name="storage_new_action_browse" msgid="3355241742574072658">"瀏覽"</string>
@@ -641,17 +639,17 @@
     <string name="camera_physical_privacy_enabled_title" msgid="1944155695921165511">"已封鎖相機存取權"</string>
     <string name="camera_physical_privacy_enabled_text" msgid="6692088634676282779">"如要解除封鎖，請將裝置上的私隱開關移至相機開啟位置以允許相機存取權。"</string>
     <string name="mic_toggle_info_title" msgid="1086545614315873599">"麥克風存取權：<xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
-    <string name="mic_toggle_info_content" msgid="3187791167208947239">"啟用後，所有允許使用麥克風的應用程式和服務均可存取麥克風。\n\n停用後，任何應用程式或服務均無法存取麥克風。但您仍然可以透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。\n\n使用自訂通訊協定來與電視通訊的音響裝置可能不受此設定影響。"</string>
+    <string name="mic_toggle_info_content" msgid="3187791167208947239">"啟用後，所有允許使用麥克風的應用程式和服務均可存取麥克風。\n\n停用後，任何應用程式或服務均無法存取麥克風。但你仍然可以透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。\n\n使用自訂通訊協定來與電視通訊的音響裝置可能不受此設定影響。"</string>
     <string name="mic_remote_toggle_on_info_title" msgid="8503441878870972046">"遙控器上的麥克風已啟用"</string>
-    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"「Google 助理」可存取您遙控器上的麥克風。您可透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。"</string>
+    <string name="mic_remote_toggle_on_info_content" msgid="2715872916376493679">"「Google 助理」可存取你遙控器上的麥克風。你可透過按下遙控器上的「Google 助理」按鈕來與「Google 助理」對話。"</string>
     <string name="mic_remote_toggle_off_info_title" msgid="4902909833546393713">"遙控器上的麥克風已停用"</string>
-    <string name="mic_remote_toggle_off_info_content" msgid="8062526350553191004">"您將無法再利用遙控器與「Google 助理」對話。請啟用麥克風存取權以使用「Google 助理」按鈕。"</string>
+    <string name="mic_remote_toggle_off_info_content" msgid="8062526350553191004">"你將無法再利用遙控器與「Google 助理」對話。請啟用麥克風存取權以使用「Google 助理」按鈕。"</string>
     <string name="camera_toggle_info_title" msgid="3871317082313736088">"相機存取權：<xliff:g id="SENSOR_STATE">%s</xliff:g>"</string>
     <string name="camera_toggle_info_content" msgid="2999965953853204003">"啟用後，所有獲授權的應用程式和服務均可存取此裝置的任何相機。\n\n設有自訂通訊協定的周邊相機將不受此設定影響。"</string>
     <string name="sensor_toggle_info_on" msgid="4568111889147132257">"已開啟"</string>
     <string name="sensor_toggle_info_off" msgid="7546772458177469821">"已關閉"</string>
     <string name="system_location" msgid="4057295363709016511">"位置"</string>
-    <string name="system_desc_location" msgid="1680134126100535031">"允許經您許可的應用程式使用您的位置資料"</string>
+    <string name="system_desc_location" msgid="1680134126100535031">"允許經你許可的應用程式使用你的位置資料"</string>
     <string name="system_network_location_confirm" msgid="7128162421781085332">"同意記錄位置資料"</string>
     <string name="location_mode_title" msgid="728244518174115443">"模式"</string>
     <string name="location_category_recent_location_requests" msgid="4541924383164183490">"最近的定位要求"</string>
@@ -668,9 +666,9 @@
     <string name="location_reporting" msgid="3552501333650895634">"位置報告"</string>
     <string name="location_history" msgid="4055660203090513120">"位置記錄"</string>
     <string name="location_reporting_desc" msgid="1580018652781674608">"Google 將在「Google 即時資訊」和「Google 地圖」等產品使用這項功能。啟用「位置報告」功能後，任何使用這項功能的 Google 產品，均可透過連結的 Google 帳戶儲存及使用裝置最近的位置資料。"</string>
-    <string name="location_history_desc" msgid="926674012916014270">"啟用此帳戶的位置記錄後，Google 就能儲存裝置的位置資料，以供您的應用程式使用。\n\n例如，「Google 地圖」能為您規劃路線，而「Google 即時資訊」能為您提供交通資訊。\n\n您隨時可以關閉位置記錄，但系統不會因此刪除記錄內容。如要查看及管理您的位置記錄，請瀏覽 maps.google.com/locationhistory。"</string>
+    <string name="location_history_desc" msgid="926674012916014270">"啟用此帳戶的位置記錄後，Google 就能儲存裝置的位置資料，以供你的應用程式使用。\n\n例如，「Google 地圖」能為你規劃路線，而「Google 即時資訊」能為你提供交通資訊。\n\n你隨時可以關閉位置記錄，但系統不會因此刪除記錄內容。如要查看及管理你的位置記錄，請瀏覽 maps.google.com/locationhistory。"</string>
     <string name="delete_location_history_title" msgid="707559064715633152">"刪除位置記錄"</string>
-    <string name="delete_location_history_desc" msgid="4035229731487113147">"這會刪除您透過這部裝置儲存在這個 Google 帳戶中的所有位置記錄，一旦刪除即無法復原。部分應用程式會因此停止運作，包括「Google 即時資訊」在內。"</string>
+    <string name="delete_location_history_desc" msgid="4035229731487113147">"這會刪除你透過這部裝置儲存在這個 Google 帳戶中的所有位置記錄，一旦刪除即無法復原。部分應用程式會因此停止運作，包括「Google 即時資訊」在內。"</string>
     <string name="accessibility_screen_readers_category_title" msgid="7742526514873922018">"螢幕閱讀器"</string>
     <string name="accessibility_display_category_title" msgid="593444602101558017">"顯示"</string>
     <string name="accessibility_interaction_controls_category_title" msgid="5290687835178852745">"互動控制功能"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"啟用"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"設定"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"除了密碼之外，「<xliff:g id="SERVICE">%1$s</xliff:g>」可收集您輸入的所有文字，包括信用卡號碼等個人資料。"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -812,7 +810,7 @@
     <string name="security_unknown_sources_title" msgid="2012801664240314305">"不明來源"</string>
     <string name="security_unknown_sources_desc" msgid="7196715598352173267">"允許安裝「Play 商店」以外的應用程式"</string>
     <string name="security_unknown_sources_confirm_title" msgid="4600896691987804985">"允許安裝不明來源的應用程式"</string>
-    <string name="security_unknown_sources_confirm_desc" msgid="7883820068140189584">"您的裝置和個人資料較易受到來歷不明的應用程式入侵。如因使用這些應用程式而導致裝置受損或資料遺失，您同意負上全責。"</string>
+    <string name="security_unknown_sources_confirm_desc" msgid="7883820068140189584">"你的裝置和個人資料較易受到來歷不明的應用程式入侵。如因使用這些應用程式而導致裝置受損或資料遺失，你同意負上全責。"</string>
     <string name="system_hdcp_checking_never" msgid="3251512398865365135">"永不"</string>
     <string name="system_hdcp_checking_drm" msgid="2159124883496899278">"針對 DRM 內容"</string>
     <string name="system_hdcp_checking_always" msgid="5868177105455148262">"一律檢查"</string>
@@ -852,7 +850,7 @@
     <string name="title_current_autofill_service" msgid="9029001041887283153">"目前的自動填入服務"</string>
     <string name="title_select_autofill_service" msgid="696559582725756848">"選取自動填入服務"</string>
     <string name="autofill_none" msgid="1615056985649424207">"不用了"</string>
-    <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;請確定您信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=「密碼服務」&gt;%1$s&lt;/xliff:g&gt;應用程式會根據您畫面上的內容判斷可自動填入的資料。"</string>
+    <string name="autofill_confirmation_message" msgid="3840267789160192558">"&lt;b&gt;請確定你信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=「密碼服務」&gt;%1$s&lt;/xliff:g&gt;應用程式會根據你畫面上的內容判斷可自動填入的資料。"</string>
     <string name="computing_size" msgid="8623916230485437579">"正在計算..."</string>
     <string name="title_select_wifi_network" msgid="935820896444071617">"選取 Wi-Fi 網絡"</string>
     <string name="accessories_wifi_display_rename_device" msgid="8803397194143132061">"重新命名"</string>
@@ -886,13 +884,13 @@
     <string name="inputs_header_connected_input" msgid="4323324944548164849">"{count,plural, =1{已連接的訊號源}other{已連接的訊號源}}"</string>
     <string name="inputs_header_standby_input" msgid="600117963181008144">"{count,plural, =1{待機訊號源}other{待機訊號源}}"</string>
     <string name="inputs_header_disconnected_input" msgid="3852361100151289264">"{count,plural, =1{未連接的訊號源}other{未連接的訊號源}}"</string>
-    <string name="user_add_profile_item_summary" msgid="3211866291940617804">"限制透過您的帳戶存取應用程式和其他內容"</string>
+    <string name="user_add_profile_item_summary" msgid="3211866291940617804">"限制透過你的帳戶存取應用程式和其他內容"</string>
     <string name="user_new_profile_name" msgid="6637593067318708353">"限制存取的個人檔案"</string>
     <string name="user_restrictions_controlled_by" msgid="8124926446168030445">"由 <xliff:g id="APP">%1$s</xliff:g> 控制"</string>
     <string name="app_not_supported_in_limited" msgid="4046604594925826955">"這個應用程式不支援限制存取的個人檔案"</string>
-    <string name="app_sees_restricted_accounts" msgid="174038126799649152">"這個應用程式可以存取您的帳戶"</string>
+    <string name="app_sees_restricted_accounts" msgid="174038126799649152">"這個應用程式可以存取你的帳戶"</string>
     <string name="restriction_location_enable_title" msgid="2552780806199464266">"地點"</string>
-    <string name="restriction_location_enable_summary" msgid="3719330231217994482">"允許應用程式使用您的位置資訊"</string>
+    <string name="restriction_location_enable_summary" msgid="3719330231217994482">"允許應用程式使用你的位置資訊"</string>
     <string name="restricted_profile_switch_to" msgid="6193201935877168764">"進入受限制的個人檔案"</string>
     <string name="restricted_profile_switch_out" msgid="3589381233390753413">"離開受限制的個人檔案"</string>
     <string name="restricted_profile_delete_title" msgid="7153982195273379506">"刪除受限制的個人檔案"</string>
@@ -905,14 +903,14 @@
     <string name="restricted_profile_configure_apps_description_loading" msgid="3293508876131962699">"請稍候…"</string>
     <string name="restricted_profile_change_password_title" msgid="6961384850606763601">"變更 PIN 碼"</string>
     <string name="restriction_description" msgid="2053112392083722259">"<xliff:g id="DESCRIPTION">%1$s</xliff:g>\n<xliff:g id="VALUE">%2$s</xliff:g>"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"這個應用程式可以存取您的帳戶 (受到「<xliff:g id="APP">%1$s</xliff:g>」控制)。"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="1261056180558324892">"這個應用程式可以存取你的帳戶 (受到「<xliff:g id="APP">%1$s</xliff:g>」控制)。"</string>
     <string name="pin_enter_unlock_channel" msgid="243855138978654080">"輸入 PIN 即可觀看這個頻道"</string>
     <string name="pin_enter_unlock_program" msgid="275489015420025531">"輸入 PIN 即可觀看這個節目"</string>
     <string name="pin_enter_pin" msgid="5020029261153234751">"輸入 PIN"</string>
     <string name="pin_enter_new_pin" msgid="1930944619313642621">"設定新 PIN"</string>
     <string name="pin_enter_again" msgid="7615050143778858658">"重新輸入新 PIN"</string>
     <string name="pin_enter_old_pin" msgid="5665265735227617942">"輸入舊 PIN"</string>
-    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"您已輸入 5 次錯誤的 PIN。\n請於 <xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> 秒後再試一次。"</string>
+    <string name="pin_enter_wrong_seconds" msgid="3014013615537066237">"你已輸入 5 次錯誤的 PIN。\n請於 <xliff:g id="RELATIVE_TIME_SPAN">%1$d</xliff:g> 秒後再試一次。"</string>
     <string name="pin_toast_wrong" msgid="4297542365877164402">"PIN 錯誤，請再試一次"</string>
     <string name="pin_toast_not_match" msgid="2439298696342975155">"PIN 不符，請再試一次"</string>
     <string name="wifi_setup_input_password" msgid="8510003548463241234">"請輸入 <xliff:g id="SSID">%1$s</xliff:g> 的密碼"</string>
@@ -923,14 +921,14 @@
     <string name="device_apps_app_management_version" msgid="2119174719194899740">"版本 <xliff:g id="APP_VERSION">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_open" msgid="4249743535677261897">"開啟"</string>
     <string name="device_apps_app_management_force_stop" msgid="4454221309989640309">"強制停止"</string>
-    <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"如果您強制停止應用程式，應用程式或許不能正常操作。"</string>
+    <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"如果你強制停止應用程式，應用程式或許不能正常操作。"</string>
     <string name="device_apps_app_management_uninstall" msgid="4171103696233332967">"解除安裝"</string>
     <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"解除安裝更新"</string>
     <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"即將解除安裝這個 Android 系統應用程式的所有更新。"</string>
     <string name="device_apps_app_management_disable" msgid="819003297535493633">"停用"</string>
-    <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"您要停用這個應用程式嗎？"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"你要停用這個應用程式嗎？"</string>
     <string name="device_apps_app_management_enable" msgid="9173340340253029114">"啟用"</string>
-    <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"您要啟用這個應用程式嗎？"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="8686291003061136476">"你要啟用這個應用程式嗎？"</string>
     <string name="device_apps_app_management_storage_used" msgid="6725789557993296433">"已使用的儲存空間"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="8928632612101487179">"<xliff:g id="VOLUME">%2$s</xliff:g>的已使用空間：<xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="7305471678286735600">"清除資料"</string>
@@ -971,12 +969,12 @@
     <string name="device_energy_saver_validation_attentive" msgid="1461105528087097435">"「觀看時」計時器設定的時間必須長於「無活動時」計時器"</string>
     <string name="limit_network_in_standby_toggle_title" msgid="6587185599397355336">"在待機模式下限制網絡連線"</string>
     <string name="limit_network_in_standby_toggle_summary" msgid="9127792748675581174">"在待機模式下降低耗電量"</string>
-    <string name="limit_network_in_standby_toggle_info" msgid="566947772381093991">"您的電視處於待機模式時會中斷網絡連線 (接收自動更新除外)。此操作可降低電視的耗電量，但您可能無法在電視處於待機模式時使用 Google Cast 和「Google 助理」等功能。"</string>
+    <string name="limit_network_in_standby_toggle_info" msgid="566947772381093991">"你的電視處於待機模式時會中斷網絡連線 (接收自動更新除外)。此操作可降低電視的耗電量，但你可能無法在電視處於待機模式時使用 Google Cast 和「Google 助理」等功能。"</string>
     <string name="limit_network_in_standby_confirm_title" msgid="789232987058850322">"允許在待機模式下連接網絡"</string>
     <string name="limit_network_in_standby_confirm_message" msgid="7176699480768019689">"允許在待機模式下連接網絡，會增加待機期間的耗電量。"</string>
     <string name="backup_configure_account_default_summary" msgid="2170733614341544296">"目前沒有任何帳戶儲存備份資料"</string>
     <string name="backup_erase_dialog_title" msgid="6008454053276987100"></string>
-    <string name="backup_erase_dialog_message" msgid="222169533402624861">"您要停止備份 Wi-Fi 密碼、書籤、其他設定和應用程式資料，並清除在 Google 伺服器上的所有備份資料嗎？"</string>
+    <string name="backup_erase_dialog_message" msgid="222169533402624861">"你要停止備份 Wi-Fi 密碼、書籤、其他設定和應用程式資料，並清除在 Google 伺服器上的所有備份資料嗎？"</string>
     <string name="privacy_backup_data" msgid="3604057980102997914">"備份我的資料"</string>
     <string name="privacy_backup_account" msgid="4527813051841860610">"備份帳戶"</string>
     <string name="privacy_automatic_restore" msgid="7117805818589418118">"自動還原"</string>
@@ -1009,8 +1007,8 @@
     <string name="choose_application" msgid="2375936782103669988">"選擇應用程式"</string>
     <string name="experimental_preference" msgid="3982593252210557436">"(實驗性)"</string>
     <string name="reboot_safemode_action" msgid="2862127510492131128">"重新開機進入安全模式"</string>
-    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"您要重新開機進入安全模式嗎？"</string>
-    <string name="reboot_safemode_desc" msgid="2919933461408942799">"這會停用所有已安裝的第三方應用程式。您必須再次重新開機才能復原這些應用程式。"</string>
+    <string name="reboot_safemode_confirm" msgid="5745977150299953603">"你要重新開機進入安全模式嗎？"</string>
+    <string name="reboot_safemode_desc" msgid="2919933461408942799">"這會停用所有已安裝的第三方應用程式。你必須再次重新開機才能復原這些應用程式。"</string>
     <string name="capturing_bugreport" msgid="832512801903486821">"正在擷取錯誤報告"</string>
     <string name="available_virtual_keyboard_category" msgid="7445262027711560629">"可用的虛擬鍵盤"</string>
     <string name="manage_keyboards" msgid="7983890675377321912">"管理鍵盤"</string>
@@ -1026,14 +1024,14 @@
     <string name="high_power_system" msgid="6263052626979462255">"無法優化電量"</string>
     <string name="manage_notification_access_title" msgid="8659254371564990084">"通知權限"</string>
     <string name="no_notification_listeners" msgid="5119406452675724448">"沒有任何已安裝的應用程式要求通知存取權。"</string>
-    <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"這些應用程式將可讀取所有通知，包括聯絡人姓名和您收到的訊息文字等個人資料，還能關閉通知或觸發通知中的動作按鈕。"</string>
+    <string name="notification_listener_security_warning_summary" msgid="8602907284276088658">"這些應用程式將可讀取所有通知，包括聯絡人姓名和你收到的訊息文字等個人資料，還能關閉通知或觸發通知中的動作按鈕。"</string>
     <string name="default_notification_access_package_summary" msgid="1354775994781420222">"系統要求"</string>
     <string name="directory_access" msgid="7338555825237012006">"目錄存取權"</string>
     <string name="directory_access_description" msgid="3630855858552422012">"這些應用程式有權存取特定目錄。"</string>
     <string name="directory_on_volume" msgid="5628089584970521703">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
     <string name="system_alert_window_settings" msgid="5790572489650085051">"顯示在其他應用程式上層"</string>
     <string name="permit_draw_overlay" msgid="5312730681030266735">"允許顯示在其他應用程式上層"</string>
-    <string name="allow_overlay_description" msgid="5152329837278240259">"允許應用程式在其他使用中的應用程式上顯示。這可能會干擾您使用這些應用程式，或變更它們的顯示或運作方式。"</string>
+    <string name="allow_overlay_description" msgid="5152329837278240259">"允許應用程式在其他使用中的應用程式上顯示。這可能會干擾你使用這些應用程式，或變更它們的顯示或運作方式。"</string>
     <string name="write_system_settings" msgid="4284654265954461890">"修改系統設定"</string>
     <string name="write_settings_title" msgid="2361816483383105754">"可修改系統設定"</string>
     <string name="write_settings_description" msgid="7382397926674265937">"此權限可讓應用程式修改系統設定。"</string>
@@ -1041,15 +1039,15 @@
     <string name="write_settings_off" msgid="6730113471695092167">"否"</string>
     <string name="manage_external_storage_title" msgid="8139593207533811077">"所有檔案存取權"</string>
     <string name="permit_manage_external_storage" msgid="1776899171934627417">"允許存取以管理所有檔案"</string>
-    <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"允許此應用程式讀取、修改和刪除此裝置或任何已連接的儲存空間卷宗上的所有檔案。如獲得權限，應用程式可能會在您不知情的情況下存取檔案。"</string>
+    <string name="allow_manage_external_storage_description" msgid="4288250228151617611">"允許此應用程式讀取、修改和刪除此裝置或任何已連接的儲存空間卷宗上的所有檔案。如獲得權限，應用程式可能會在你不知情的情況下存取檔案。"</string>
     <string name="picture_in_picture_title" msgid="2636935591386702348">"畫中畫"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="3688997906817583854">"允許畫中畫"</string>
     <string name="picture_in_picture_empty_text" msgid="4370198922852736600">"沒有已安裝的應用程式支援畫中畫"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"當您離開正運作中的應用程式時，允許該應用程式建立畫中畫視窗 (例如方便您繼續觀看影片)。該視窗會顯示在您目前使用的其他應用程式上層。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="3296649114939705896">"當你離開正運作中的應用程式時，允許該應用程式建立畫中畫視窗 (例如方便你繼續觀看影片)。該視窗會顯示在你目前使用的其他應用程式上層。"</string>
     <string name="alarms_and_reminders_description" msgid="4063972350154624500">"允許應用程式設定鬧鐘及安排有時效的操作。這樣，應用程式就可以在背景中執行，可能會較耗電。\n\n如果關閉此權限，應用程式所設定的鬧鐘和預定在特定時間進行的事件便無法執行。"</string>
     <string name="turn_screen_on_title" msgid="5293798529284629011">"開啟螢幕"</string>
     <string name="allow_turn_screen_on" msgid="4903401106871656521">"允許開啟螢幕"</string>
-    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"允許應用程式開啟螢幕。應用程式獲授權後，可在您未有明確表明意圖的情況下隨時開啟螢幕。"</string>
+    <string name="allow_turn_screen_on_description" msgid="7521761625343889415">"允許應用程式開啟螢幕。應用程式獲授權後，可在你未有明確表明意圖的情況下隨時開啟螢幕。"</string>
     <string name="special_access" msgid="21806055758289916">"特別應用程式權限"</string>
     <string name="string_concat" msgid="5213870180216051497">"<xliff:g id="PART1">%1$s</xliff:g>，<xliff:g id="PART2">%2$s</xliff:g>"</string>
     <string name="audio_category" msgid="6143623109624947993">"音訊"</string>
@@ -1069,7 +1067,7 @@
     <string name="title_data_saver" msgid="7500278996154002792">"數據節省模式"</string>
     <string name="summary_data_saver" msgid="6793558728898207405">"自動調整影片畫質以使用節省流動數據"</string>
     <string name="title_data_alert" msgid="8262081890052682475">"數據用量和通知"</string>
-    <string name="data_saver_header_info" msgid="2706725187498535785">"您可以經 Wi-Fi、以太網絡或手機的熱點連接互聯網。"</string>
+    <string name="data_saver_header_info" msgid="2706725187498535785">"你可以經 Wi-Fi、以太網絡或手機的熱點連接互聯網。"</string>
     <string name="bluetooth_ask_discovery_title" msgid="4955540555242269694">"要向其他藍牙裝置顯示嗎？"</string>
     <string name="bluetooth_ask_discovery_message" msgid="8609666862877703398">"應用程式要求將電視設為向其他藍牙裝置顯示 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。"</string>
     <string name="help_center_title" msgid="6109822142761302433"></string>
@@ -1082,9 +1080,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="6500185610058872758">"無法開啟此應用程式"</string>
     <string name="default_admin_support_msg" msgid="7913455019068370350">"如有任何問題，請與 IT 管理員聯絡"</string>
     <string name="admin_support_more_info" msgid="9053232166115098434">"更多詳細資料"</string>
-    <string name="admin_profile_owner_message" msgid="5729169873349157622">"您的管理員可以監控及管理與工作設定檔相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
-    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"您的管理員可以監控及管理與此使用者相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
-    <string name="admin_device_owner_message" msgid="1935507216776040907">"您的管理員可以監控及管理與此裝置相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
+    <string name="admin_profile_owner_message" msgid="5729169873349157622">"你的管理員可以監控及管理與工作設定檔相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
+    <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"你的管理員可以監控及管理與此使用者相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
+    <string name="admin_device_owner_message" msgid="1935507216776040907">"你的管理員可以監控及管理與此裝置相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"移除公司檔案"</string>
     <string name="active_device_admin_msg" msgid="185537304726228624">"裝置管理應用程式"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"停用此裝置管理應用程式"</string>
@@ -1096,11 +1094,11 @@
     <string name="device_admin_warning" msgid="7399916080685200660">"啟動此管理應用程式將允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式執行以下操作："</string>
     <string name="device_admin_warning_simplified" msgid="3310965971422346950">"此裝置將由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理及監控。"</string>
     <string name="device_admin_status" msgid="5467001937240455367">"此管理應用程式已啟用，並允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式執行以下操作："</string>
-    <string name="adding_profile_owner_warning" msgid="3888867082224127564">"如繼續操作，管理員將會管理您的使用者。除了您的個人資料，管理員亦可能會儲存其他相關的資料。\n\n您的管理員可以監控及管理與此使用者相關的設定、存取權、應用程式和資料，包括網絡活動和裝置的位置資料。"</string>
+    <string name="adding_profile_owner_warning" msgid="3888867082224127564">"如繼續操作，管理員將會管理你的使用者。除了你的個人資料，管理員亦可能會儲存其他相關的資料。\n\n你的管理員可以監控及管理與此使用者相關的設定、存取權、應用程式和資料，包括網絡活動和裝置的位置資料。"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="2080017987692459555">"要分享錯誤報告嗎？"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"您的 IT 管理員要求您提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料。"</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="4637489112422692638">"您的 IT 管理員要求您提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料，裝置的運作速度也可能暫時減慢。"</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="8096239263583331293">"您已向 IT 管理員提供此錯誤報告。請聯絡他們以瞭解詳情。"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="8515056665416643253">"你的 IT 管理員要求你提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料。"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="4637489112422692638">"你的 IT 管理員要求你提供錯誤報告，以協助解決此裝置的問題。報告可能包含應用程式和相關資料，裝置的運作速度也可能暫時減慢。"</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="8096239263583331293">"你已向 IT 管理員提供此錯誤報告。請聯絡他們以瞭解詳情。"</string>
     <string name="share_remote_bugreport_action" msgid="6760197666368262892">"分享"</string>
     <string name="decline_remote_bugreport_action" msgid="2130779396296090961">"拒絕"</string>
     <string name="network_connection_request_dialog_title" msgid="4103963119407212989">"可配合「<xliff:g id="APPNAME">%1$s</xliff:g>」使用的裝置"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"連線成功"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"顯示全部"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"正在搜尋"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"無法從驗證器擷取新增帳戶的 Intent。"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"無法新增帳戶，或不支援有關帳戶類型。"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"頻道和訊號源"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"頻道、外接訊號源"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"頻道"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"啟用以下功能："</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"請注意，這個模式可能會增加裝置的耗電量。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"啟用「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」"</string>
+    <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_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 4ba34115a..1ff613a93 100644
--- a/Settings/res/values-zh-rTW/energy-modes.xml
+++ b/Settings/res/values-zh-rTW/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"必要的網路功能"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"低耗電"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"在沒有人使用電視時關閉網路連線。"</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"重大更新與功能"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"建議的網路功能"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"最佳化耗電量"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"開啟可透過網路喚醒電視的功能 (連網待機)。"</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Insert feature 1]"</item>
     <item msgid="8724721267222341891">"[Insert feature 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"其他網路功能"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"高耗電"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"在沒有人使用電視時，這個選項還會開啟建議功能以外的功能，耗電量可能會因此增加。"</string>
+    <string 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-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 5797db47f..f91742607 100644
--- a/Settings/res/values-zh-rTW/strings.xml
+++ b/Settings/res/values-zh-rTW/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"應用程式設定"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"位置、使用狀況與診斷、廣告"</string>
     <string name="add_account" msgid="7386223854837017129">"新增帳戶"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"不明帳戶"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"移除帳戶"</string>
     <string name="account_sync" msgid="4315295293211313989">"選擇同步完成的應用程式"</string>
     <string name="sync_now" msgid="4335217984374620551">"立即同步處理"</string>
@@ -151,7 +152,7 @@
     <string name="hdmi_cec_settings_title" msgid="7120729705063868627">"HDMI-CEC"</string>
     <string name="advanced_sound_settings_title" msgid="319921303039469139">"進階音效設定"</string>
     <string name="game_mode_title" msgid="7280816243531315755">"允許遊戲模式"</string>
-    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"配合內容的動態範圍"</string>
+    <string name="match_content_dynamic_range_title" msgid="2794980556561655838">"採用內容動態範圍"</string>
     <string name="match_content_dynamic_range_summary" msgid="2255683926227355398">"啟用這個選項後，系統會配合內容切換使用不同的動態範圍格式。請注意，切換格式時螢幕可能會顯示一片黑。\n\n如要查看更多動態範圍選項，請點選「進階顯示設定」。"</string>
     <string name="preferred_dynamic_range_title" msgid="5064883672337010588">"偏好的動態範圍"</string>
     <string name="preferred_dynamic_range_selection_system_title" msgid="4505030483876080996">"系統自動轉換"</string>
@@ -166,10 +167,8 @@
     <string name="preferred_dynamic_range_force_dialog_title" msgid="6865110024863661702">"要強制進行高動態範圍輸出作業嗎？"</string>
     <string name="preferred_dynamic_range_force_dialog_desc" msgid="7758323258282201656">"系統預設會強制轉換為「<xliff:g id="HDR_TYPE">%s</xliff:g>」格式。"</string>
     <string name="preferred_dynamic_range_force_dialog_desc_4k30_issue" msgid="4938418395391206131">"你的螢幕將採用 1080p 60Hz 解析度。這個選項不支援採用 4K 60Hz 解析度的螢幕。"</string>
-    <!-- no translation found for selection_dolby_vision_not_supported_sidebar (8994591316574824115) -->
-    <skip />
-    <!-- no translation found for manual_dolby_vision_format_on_4k60_title (4172263676512376500) -->
-    <skip />
+    <string name="selection_dolby_vision_not_supported_sidebar" msgid="8994591316574824115">"目前的解析度不支援 Dolby Vision。如果你手動啟用 Dolby Vision，螢幕解析度將變更為 1080p 60Hz"</string>
+    <string name="manual_dolby_vision_format_on_4k60_title" msgid="4172263676512376500">"要將解析度變更為 1080p 60Hz 嗎？"</string>
     <string name="dynamic_range_selection_force_dv_title" msgid="8070148109262327094">"一律強制轉換成 Dolby Vision"</string>
     <string name="dynamic_range_selection_force_dv_summary" msgid="1052851029985095562">"當「進階顯示設定」&gt;「HDR 格式」中的 Dolby Vision 處於停用狀態時，如果強制轉換成 Dolby Vision，就會將其重新啟用。"</string>
     <string name="dynamic_range_selection_force_hdr10_title" msgid="1221688206945051384">"一律強制轉換成 HDR10"</string>
@@ -193,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"範例文字"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"綠野仙蹤"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"第 11 章：奧茲國的翡翠城"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"即使配戴著綠色眼鏡保護雙眼，這座美麗城市閃耀的光芒還是令桃樂絲和她的朋友們目眩神迷。街道兩側佇立著以碧綠大理石建造的華美房屋，上頭鑲滿光彩奪目的翡翠。街道路面同樣是以碧綠大理石鋪砌而成，石板接合處嵌有一排排緊密相連的翡翠，在陽光的照耀下閃閃發亮。房屋窗面採用翠綠玻璃，襯著城市上方的淡綠天空，就連陽光也透出青綠色調。\n\n城內居民眾多，無論男女老幼全都穿著綠色衣物，甚至皮膚也帶有綠色光澤。他們充滿好奇地盯著桃樂絲和她那群外貌迥異的夥伴，只是孩子們一看到獅子便飛快躲到母親身後；然而，一直沒有任何人開口與他們交談。街道上的商店五花八門，桃樂絲發現這些商店兜售的商品，從糖果和爆米花到鞋子、帽子和各式衣物，全都是綠色的。有位小販賣著綠色檸檬汁，當小孩掏錢購買時，桃樂絲清楚看見錢幣也是綠色的。\n\n城裡似乎沒有馬匹或任何動物；居民們都是推著綠色小推車來搬運物品。每個人看起來都相當幸福且富足。"</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"即使戴上綠色眼鏡保護雙眼，這座美麗城市閃耀的光芒還是令桃樂絲和她的朋友們目眩神迷。街道兩側佇立著以碧綠大理石建造的華美房屋，上頭鑲滿光彩奪目的翡翠。街道路面同樣是以碧綠大理石鋪砌而成，石板接合處嵌有一排排緊密相連的翡翠，在陽光的照耀下閃閃發亮。房屋窗面採用翠綠玻璃，襯著城市上方的淡綠天空，就連陽光也透出青綠色調。\n\n城內居民眾多，無論男女老幼全都穿著綠色衣物，甚至皮膚也帶有綠色光澤。他們好奇地盯著桃樂絲和她那群外貌迥異的夥伴，只是孩子們一看到獅子便飛快躲到母親身後。然而，一直沒有任何人開口與他們交談。街道上的商店五花八門，桃樂絲發現這些商店兜售的商品，從糖果和爆米花到鞋子、帽子和各式衣物，全都是綠色的。有位小販賣著綠色檸檬汁，當小孩掏錢購買時，桃樂絲清楚看見錢幣也是綠色的。\n\n城裡似乎沒有馬匹或任何動物，居民都是推著綠色小推車來搬運物品。每個人看起來都相當幸福且富足。"</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"選取格式"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"自動"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"手動"</string>
@@ -220,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"要將解析度變更為「%1$s」嗎？"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"選取 [確定] 就能立即使用 %1$s。"</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"「%1$s」不支援 Dolby Vision，因此 Dolby Vision 會在「進階顯示設定」中處於停用狀態"</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"這個模式支援以下高動態範圍類型：%1$s。在某些電視上，你可能必須開啟增強型 HDMI，才能啟用更多高動態範圍格式。請查看電視設定，確認是否支援增強型 HDMI。"</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"這個模式支援：%1$s\n在某些電視上，你可能需要開啟增強型 HDMI，才能啟用更多高動態範圍格式。請查看電視設定，確認是否支援增強型 HDMI。"</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"取消"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"確定"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"清除快取資料？"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"這項操作會清除所有應用程式的快取資料。"</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -280,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"已連線"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"連線已中斷"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"你沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"做為電視音訊輸出裝置"</string>
     <string name="send_feedback" msgid="936698637869795473">"提供意見"</string>
     <string name="launch_help" msgid="2607478763131952469">"說明中心"</string>
     <string name="system_cast" msgid="6081391679828510058">"Google Cast"</string>
@@ -346,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"這個裝置是由貴機構所管理。"</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"這個裝置是由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 所管理。"</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">"、"</string>
-    <string name="space_separator" msgid="4169645647388594972">" ⁠"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"瞭解詳情"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{相機應用程式}other{相機應用程式}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"日曆應用程式"</string>
@@ -745,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"啟用"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"設定"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>嗎？"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"「<xliff:g id="SERVICE">%1$s</xliff:g>」可收集您輸入的所有文字 (密碼除外)，包括信用卡號等個人資料。"</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="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>
@@ -997,8 +995,8 @@
     <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>
-    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"為裝置命名，將相片、影片等內容從手機投放時即可使用此名稱投放"</string>
+    <string name="device_name_suggestion_title" msgid="3986220212759193742">"設定裝置名稱"</string>
+    <string name="device_name_suggestion_summary" msgid="4582691399302362938">"從手機投放相片、影片等內容時，即可使用此名稱"</string>
     <string name="change_setting" msgid="7211706374208138343">"變更"</string>
     <string name="keep_settings" msgid="703474489210093961">"不變更"</string>
     <string name="apps_permissions" msgid="7876407267050498394">"權限"</string>
@@ -1110,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"連線成功"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"全部顯示"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"搜尋中"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"無法從驗證器擷取帳戶新增意圖。"</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"無法新增帳戶或者系統不支援該帳戶類型。"</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"頻道和輸入來源"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"頻道、外部輸入來源"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"頻道"</string>
@@ -1127,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"啟用以下功能："</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"請注意，這個模式可能會使裝置耗電量增加。"</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"啟用「<xliff:g id="ENERGYMODENAME">%s</xliff:g>」"</string>
+    <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_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 f8acbbd9d..8f66697d0 100644
--- a/Settings/res/values-zu/energy-modes.xml
+++ b/Settings/res/values-zu/energy-modes.xml
@@ -16,24 +16,26 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="energy_mode_low_title" msgid="2408371934616917432">"Izakhi ezibalulekile zenethiwekhi"</string>
-    <string name="energy_mode_low_subtitle" msgid="3541491740634993554">"Ukusetshenziswa kwamandla okuphansi"</string>
-    <string name="energy_mode_low_info" msgid="7336221780506353827">"Vala uxhumo lenethiwekhi lapho i-TV ingasetshenziswa."</string>
+    <string 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-array name="energy_mode_low_features">
     <item msgid="4976202876230149030">"Izibuyekezo nokukhethwayo okubucayi"</item>
   </string-array>
     <string name="energy_mode_low_eco_hint" msgid="2421460758847643655"></string>
-    <string name="energy_mode_moderate_title" msgid="6131212898797802584">"Izakhi ezinconyiwe zenethiwekhi"</string>
-    <string name="energy_mode_moderate_subtitle" msgid="8452759001885415587">"Ukusetshenziswa kwamandla okulungiselelwe"</string>
-    <string name="energy_mode_moderate_info" msgid="8606735947366228051">"Ivula izakhi ezivusa i-TV ngenethiwekhi (okubekwe eceleni kwenethiwekhi)."</string>
+    <string 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-array name="energy_mode_moderate_features">
     <item msgid="2654586107956150296">"[Faka isakhi 1]"</item>
     <item msgid="8724721267222341891">"[Faka isakhi 2]"</item>
   </string-array>
     <string name="energy_mode_moderate_eco_hint" msgid="252189162446856286"></string>
-    <string name="energy_mode_high_title" msgid="4428472238583662129">"Izakhi ezengeziwe zenethiwekhi"</string>
-    <string name="energy_mode_high_subtitle" msgid="3146607061198429672">"Ukwenyuka kokusetshenziswa kwamandla"</string>
-    <string name="energy_mode_high_info" msgid="3151321275701804406">"Ngokungeziwe kuzakhi ezinconyiwe, le nketho ivula izakhi ezengeziwe lapho i-TV ingasetshenziswa ezingase zikhulise ukusetshenziswa kwamandla."</string>
+    <string 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-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 45e02a093..4ca92fff9 100644
--- a/Settings/res/values-zu/strings.xml
+++ b/Settings/res/values-zu/strings.xml
@@ -65,6 +65,7 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Amasethingi Ohlelo Lokusebenza"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Indawo, Ukusentshenziswa Nezikhangiso Zokuxilonga"</string>
     <string name="add_account" msgid="7386223854837017129">"Engeza i-akhawunti"</string>
+    <string name="unknown_account" msgid="5159580666787047518">"I-akhawunti Engaziwa"</string>
     <string name="account_header_remove_account" msgid="8573697553061331373">"Susa i-akhawunti"</string>
     <string name="account_sync" msgid="4315295293211313989">"Khetha izinhlelo zokusebenza ezivumelanisiwe"</string>
     <string name="sync_now" msgid="4335217984374620551">"Vumelanisa manje"</string>
@@ -191,7 +192,7 @@
     <string name="font_scale_sample_text_title" msgid="5239266611413037261">"Isampuli yombhalo"</string>
     <string name="font_scale_preview_text_title" msgid="8056182208511371119">"I-The Wonderful Wizard of Oz"</string>
     <string name="font_scale_preview_text_subtitle" msgid="677394182922188048">"Isahluko 11: The Wonderful Emerald City of Oz"</string>
-    <string name="font_scale_preview_text_body" msgid="2040384234251207410">"Nanoma amehlo avikelwe izibuko eziluhlaza u-Sonto nabangani bakhe ekuqaleni bamangazwa ubuhle obukhulu bedolobha elihle. Imigwaqo ibikade inezindlu ezinhle ezenze ulayini zonke ezakhiwe ngamamebula aluhlaza nezigcwaliswe yonke indawo ngama-emerald acwebezelayo. Bahamba kuphevumente yamamabuli afanayo aluhlaza, futhi lapho amabhulokhu ahlanganiswe khona ndawonye bekukhona amarowu ama-emerald, asethwe ngokusondelene, aphinde akhazimula ekukhanyeni kwelanga. Amapheyini ewindi bewekade kungowengilazi eliluhlaza; nesibhakabhaka esingaphezulu kwedolobha besikade sinokuthintwa okuluhlaza, futhi imisebe yelanga beyikade iluhlaza. \n\nBekukhona abantu abaningi, abesilisa, abesifazane nezingane, abazihambelayo nje, futhi bonke labo bebagqoke izingubo eziluhlaza futhi banezikhumba ezisaluhlaza. Babheka uSonto nahamba nabo abahlukile ngandlela thize ngamehlo anemibuzo, futhi izingane zonke zabaleka zayozifihla ngemuva komama bazo uma bebona ibhubezi; kodwa akekho umuntu okhulume nabo. Iningi lezitolo zema emgwaqeni, futhi uSonto wabona ukuthi yonke into ekuzo ibikade iluhlaza. Uswidi oluhlaza namakipukipu aluhlaza bewakade anikezwa ukuze athengiswe, kanye nezicathulo eziluhlaza, izigqoko eziluhlaza nezingubo eziluhlaza zalo lonke uhlobo. Endaweni eyodwa indoda ethile ibikade ithengisa i-lemonade eluhlaza, futhi ngenkathi izingane ziyithenga uSonto wakwazi ukubona ukuthi ziyikhokhele ngamapeni aluhlaza. \n\nKwabonakala kungekho amahhashi noma izilwane zanoma iluphi uhlobo; amadoda athwala izinto ngezinqola ezincane eziluhlaza, abazisunduza ngaphambi kwabo. Wonke umuntu wabukeka ajabulile futhi anelisekile futhi aphumelela."</string>
+    <string name="font_scale_preview_text_body" msgid="7890679265084738383">"Nangamehlo avikelwe ngezibuko eziluhlaza, u-Dorothy nabangani bakhe baqala bamangala ngobuhle Bedolobha elihle. Imigwaqo beyinemigqa yezindlu ezinhle ezakhiwe ngemabuli eluhlaza futhi zafakwa ama-emerald akhanyayo. Bahamba endaweni yokuhamba ngezinyawo yemabuli efanayo eluhlaza, lapho amabhulokhi aye ahlanganiswa ndawonye amarowu wama-emerald, abekwe ngokusondelene, futhi ashayinayo ngokukhanya kwelanga. Amafasitela bewakade enziwe ngengilazi eluhlaza; kanye nesibhakabhaka ngaphezulu kwedolobha besinombadlana oluhlaza, futhi imisebe yelanga beyikade iluhlaza. \n\nBekukade kukhona abantu abaningi, amadoda, abesifazane nezingane abahambahambayo, futhi bonke laba bantu bebagqoke izingubo eziluhlaza futhi banezikhumba eziluhlaza. Babheka u-Dorothy kanye nahamba nabo abahluke ngokumangazayo ngamehlo anemibuzo, futhi zonke izingane zabaleka zaphinde zaqasha ngemuva komama bazo uma zibona ibhubesi; kodwa akekho umuntu okhulume nabo. Iningi lezitolo zime emgwaqeni, futhi u-Dorothy wabona ukuthi yonke into kuzo beyikade iluhlaza. Uswidi oluhlaza nama-pop-corn aluhlaza anikezwa ukuze athengiswe, kanye nezicathulo eziluhlaza, izigqoko eziluhlaza kanye nezimpahla eziluhlaza zalo lonke uhlobo. Endaweni eyodwa indoda beyithengisa ijuzi yolamula eluhlaza, futhi ngenkathi izingane ziyithenga u-Dorothy wabona ukuthi ziyikhokhele ngamapeni aluhlaza. \n\nKwabonakala kungekho mahhashi noma izilwane zanoma luphi uhlobo; amadoda athwala izinto ngamakalishi aluhlaza amancane, abawasunduza ngaphambi kwabo. Wonke umuntu wabonakala ejabulile futhi enelisekile futhi ephumelela."</string>
     <string name="hdr_format_selection_title" msgid="4042679694363850581">"Ukukhetha kokufometha"</string>
     <string name="hdr_format_selection_auto_title" msgid="2370148695440344232">"Okuzenzakalelayo"</string>
     <string name="hdr_format_selection_manual_title" msgid="2077604650196987438">"Mathupha"</string>
@@ -218,12 +219,11 @@
     <string name="resolution_selection_with_mode_dialog_title" msgid="5011192408613100514">"Shintsha ukucaca kube ngu-%1$s?"</string>
     <string name="resolution_selection_dialog_desc" msgid="3667357611495669701">"Khetha okuthi KULUNGILE ukuze usebenzise i-%1$s kusukela manje."</string>
     <string name="resolution_selection_disabled_dolby_vision_dialog_desc" msgid="7952404018654828187">"I-Dolby Vision ayisekelwe ku-%1$s futhi izokhutshazwa kokuthi \"Amasethingi Esibonisi Athuthukisiwe\""</string>
-    <string name="resolution_hdr_description_info" msgid="7378290600353021584">"Le modi isekela i-%1$s. Kwamanye ama-TV, kungase kudingeke uvule i-HDMI Ethuthukisiwe ukuze unike amandla amafomethi e-HDR angeziwe. Hlola amasethingi akho e-TV ukuze ubone ukuthi lokhu kuyasekelwa yini."</string>
+    <string name="resolution_hdr_description_info" msgid="2408761621976850238">"Le modi isekela: %1$s\nKwamanye ama-TV, kungase kudingeke ukuthi uvule i-HDMI Ethuthukisiwe ukuze unike amandla amafomethi e-HDR engeziwe. Hlola amasethingi akho e-TV ukuze ubone ukuthi lokhu kuyasekelwa yini."</string>
     <string name="resolution_selection_dialog_cancel" msgid="3683616572317946129">"Khansela"</string>
     <string name="resolution_selection_dialog_ok" msgid="3123351228545013492">"KULUNGILE"</string>
     <string name="resolution_selection_hz" msgid="4425902505388495637">"I-Hz"</string>
-    <!-- no translation found for resolution_display_mode (6633857172598855480) -->
-    <skip />
+    <string name="resolution_display_mode" msgid="6633857172598855480">"<xliff:g id="RESOLUTION">%1$s</xliff:g> (<xliff:g id="REFRESH_RATE">%2$s</xliff:g> Hz)"</string>
     <string name="device_storage_clear_cache_title" msgid="14370154552302965">"Sula idatha efakwe kunqolobane?"</string>
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"Lokhu kuzosula idatha efakwe kunqolobane yazo zonke izinhlelo zokusebenza."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
@@ -278,6 +278,7 @@
     <string name="bluetooth_connected_status" msgid="8629393539370085418">"Ixhunyiwe"</string>
     <string name="bluetooth_disconnected_status" msgid="7617866963193224775">"Inqamukile"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="1610743588460010736">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_toggle_active_audio_output_title" msgid="3715722506642793944">"Sebenzisa umsindo we-TV"</string>
     <string name="send_feedback" msgid="936698637869795473">"Thumela impendulo"</string>
     <string name="launch_help" msgid="2607478763131952469">"Isikhungo sosizo"</string>
     <string name="system_cast" msgid="6081391679828510058">"I-Google Cast"</string>
@@ -302,7 +303,7 @@
     <string name="security_enable_widgets_disabled_summary" msgid="7678529948487939871">"Kukhutshazwe umlawuli"</string>
     <string name="disabled_by_administrator_summary" msgid="3420979957115426764">"Ayitholakali"</string>
     <string name="manage_device_admin" msgid="5714217234035017983">"Ama-app omlawuli wedivayisi"</string>
-    <string name="number_of_device_admins_none" msgid="2734299122299837459">"Azikho izinhlelo zokusebenza ezisebenzayo"</string>
+    <string name="number_of_device_admins_none" msgid="2734299122299837459">"Awekho ama-app asebenzayo"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="108190334043671416">"Kukhutshazwe umlawuli, inqubomgomo yokubethela, noma isitoreji sezitifiketi"</string>
     <string name="enterprise_privacy_settings" msgid="8226765895133003202">"Ulwazi lwedivayisi oluphethwe"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5719549523275019419">"Ushintsho nezilungiselelo eziphethwe inhlangano yakho"</string>
@@ -344,8 +345,7 @@
     <string name="do_disclosure_generic" msgid="8390478119591845948">"Le divayisi iphethwe inhlangano yakho."</string>
     <string name="do_disclosure_with_name" msgid="4755509039938948975">"Le divayisi iphethwe yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="4226390963162716446">" "</string>
-    <string name="word_separator" msgid="3175619900852797955">","</string>
-    <string name="space_separator" msgid="4169645647388594972">" I-160"</string>
+    <string name="hdr_capability" msgid="3331021013422460270">"- %1$s"</string>
     <string name="learn_more" msgid="820336467414665686">"Funda kabanzi"</string>
     <string name="default_camera_app_title" msgid="4573905807226306484">"{count,plural, =1{I-app yekhamera}one{Ama-app wekhamera}other{Ama-app wekhamera}}"</string>
     <string name="default_calendar_app_title" msgid="1533912443930743532">"Uhlelo lokusebenza lekhalenda"</string>
@@ -743,7 +743,7 @@
     <string name="system_accessibility_status" msgid="8504842254080682515">"Nika amandla"</string>
     <string name="system_accessibility_config" msgid="4820879735377962851">"Ukucushwa"</string>
     <string name="system_accessibility_service_on_confirm_title" msgid="4547924421106540376">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="system_accessibility_service_on_confirm_desc" msgid="1291445700158602622">"I-<xliff:g id="SERVICE">%1$s</xliff:g> ingaqoqa wonke umbhalo owuthayiphayo, ngaphandle kwamaphasiwedi. Lokhu kufaka idatha yomuntu siqu efana nezinombolo zekhadi lesikweletu."</string>
+    <string name="system_accessibility_service_on_confirm_desc" msgid="5426217096813804569">"I-<xliff:g id="SERVICE">%1$s</xliff:g> izokwazi ukufunda isikrini sakho, ibonise okuqukethwe phezu kwamanye ama-app, ilandelele ukusebenzisana kwakho nama-app noma izinzwa zehadiwe, futhi ihlanganyele nama-app esikhundleni sakho."</string>
     <string name="system_accessibility_service_off_confirm_title" msgid="1110904358228641834">"Misa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="system_accessibility_service_off_confirm_desc" msgid="3486513644923267157">"Ukukhetha UKULUNGILE kuzomisa i-<xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="system_accessibility_tts_output" msgid="3186078508203212288">"Umbhalo kuya kokukhulunywayo"</string>
@@ -1084,7 +1084,7 @@
     <string name="admin_profile_owner_user_message" msgid="6431405126322617268">"Umqondisi wakho angakwazi ukwengamela futhi aphathe izinhlelo zokusebenza nedatha ephathelene nalo msebenzisi, kufaka phakathi izilungiselelo, izimvume, ukufinyelela kwezinkampani, umsebenzi wenethiwekhi kanye nolwazi lwendawo ledivayisi yakho."</string>
     <string name="admin_device_owner_message" msgid="1935507216776040907">"Umqondisi wakho angakwazi ukwengamela nokuphatha izinhlelo zokusebenza nedatha ephathelene naele divayisi, kufaka phakathi izimvume zezilungiselelo, ukufinyelela kwebhizinisi, umsebenzi wenethiwekhi nolwazi lwendawo yedivayisi yakho."</string>
     <string name="remove_managed_profile_label" msgid="8950011141359605612">"Susa iphrofayela yomsebenzi"</string>
-    <string name="active_device_admin_msg" msgid="185537304726228624">"Uhlelo lokusebenza lomlawuli wedivayisi"</string>
+    <string name="active_device_admin_msg" msgid="185537304726228624">"Ama-app omlawuli wedivayisi"</string>
     <string name="remove_device_admin" msgid="2623866073546295104">"Yekisa ukusebenza lolu hlelo lokusebenza lomlawuli wedivayisi"</string>
     <string name="uninstall_device_admin" msgid="6301368408620948266">"Khipha uhlelo lokusebenza"</string>
     <string name="remove_and_uninstall_device_admin" msgid="1504351551194915633">"Yekisa futhi ukhiphe"</string>
@@ -1108,6 +1108,8 @@
     <string name="network_connection_connect_successful" msgid="2981223044343511313">"Ukuxhumeka kuphumelele"</string>
     <string name="network_connection_request_dialog_showall" msgid="2653775399674126208">"Veza konke"</string>
     <string name="progress_scanning" msgid="3323638586482686516">"Iyasesha"</string>
+    <string name="add_account_intent_not_available_dialog_message" msgid="8326403834567215053">"Yehlulekile ukubuyisa inhloso yokwengeza i-akhawunti kusuka kusifakazeli sobuqiniso."</string>
+    <string name="add_account_failed_dialog_message" msgid="3704858007957373186">"Yehlulekile ukwengeza i-akhawunti noma uhlobo lwe-akhawunti alutholakali."</string>
     <string name="channels_and_inputs_title" msgid="7484506121290830217">"Iziteshi Nokokufaka"</string>
     <string name="channels_and_inputs_summary" msgid="3168386051698084007">"Iziteshi, okokufaka kwangaphandle"</string>
     <string name="channels_settings_title" msgid="8048956665383762510">"Iziteshi"</string>
@@ -1125,4 +1127,9 @@
     <string name="energy_mode_enables" msgid="357960364751477627">"Inika amandla:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"Qaphela ukuthi le modi ingase ikhulise ukusetshenziswa kwamandla kwedivayisi."</string>
     <string name="energy_modes_confirmation_title" msgid="4520280098781914825">"Nika amandla okuthi \"<xliff:g id="ENERGYMODENAME">%s</xliff:g>\""</string>
+    <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_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/config.xml b/Settings/res/values/config.xml
index 0bb787b65..bddfb4817 100644
--- a/Settings/res/values/config.xml
+++ b/Settings/res/values/config.xml
@@ -161,4 +161,13 @@
     <string-array name="config_energy_mode_high_additionalAllowedFeatures" translatable="false" />
 
     <bool name="config_energy_mode_unrestricted_enabled">false</bool>
+
+    <!--
+        Whether the ATV integrates the Find My Remote functionality with the on-device button.
+        If it does, the integration should respect the value of
+        Settings.Global.fmr_on_physical_button_enabled setting.
+        Note that this variable only controls the default implementation, which is used if
+        strings/connected_devices_slice_uri is empty.
+    -->
+    <bool name="config_find_my_remote_integration_enabled">false</bool>
 </resources>
diff --git a/Settings/res/values/energy-modes.xml b/Settings/res/values/energy-modes.xml
index 182796205..d2a613bec 100644
--- a/Settings/res/values/energy-modes.xml
+++ b/Settings/res/values/energy-modes.xml
@@ -19,7 +19,7 @@
 
     <!-- Whether to show "Energy Mode" options when Low Power Standby is supported.
          If false, falls back to a toggle to enable/disable Low Power Standby if LPS is supported. -->
-    <bool name="enable_energy_modes">true</bool>
+    <bool name="enable_energy_modes">false</bool>
 
     <!-- The default energy mode, used if none has been set yet. -->
     <string name="default_energy_mode" translatable="false">@null</string>
@@ -31,9 +31,9 @@
     <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">Essential network features</string>
-    <string name="energy_mode_low_subtitle">Low energy use</string>
-    <string name="energy_mode_low_info">Turn off network connection when the TV is not in use.</string>
+    <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-array name="energy_mode_low_features">
         <item>Critical updates and functions</item>
     </string-array>
@@ -53,9 +53,10 @@
     <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">Recommended network features</string>
-    <string name="energy_mode_moderate_subtitle">Optimized energy use</string>
-    <string name="energy_mode_moderate_info">Turns on features that wake the TV over the network (networked standby).</string>
+    <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-array name="energy_mode_moderate_features">
         <item>[Insert feature 1]</item>
         <item>[Insert feature 2]</item>
@@ -75,9 +76,10 @@
     <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">Additional network features</string>
-    <string name="energy_mode_high_subtitle">Increased energy use</string>
-    <string name="energy_mode_high_info">In addition to recommended features, this option turns on additional features when the TV is not in use that may increase energy use.</string>
+    <string 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-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 22209724f..c89af6377 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -138,6 +138,8 @@
     <skip />
     <!-- Preference which adds an account [CHAR LIMIT=50] -->
     <string name="add_account">Add account</string>
+    <!-- Account not found [CHAR LIMIT=50]-->
+    <string name="unknown_account">Unknown Account</string>
     <!-- Header for remove account [CHAR LIMIT=50] -->
     <string name="account_header_remove_account">Remove account</string>
     <!-- Sync item label: control sync settings [CHAR LIMIT=100] -->
@@ -504,7 +506,7 @@
         Green candy and green pop-corn were offered for sale, as well as green shoes, green hats and green clothes of all sorts.
         At one place a man was selling green lemonade, and when the children bought it Dorothy could see that they paid for it with green pennies.
         \n\nThere seemed to be no horses nor animals of any kind; the men carried things around in little green carts, which they pushed before them.
-        Everyone seeemed happy and contented and prosperous.
+        Everyone seemed happy and contented and prosperous.
     </string>
 
     <!-- Title for preference for HDR format selection. [CHAR LIMIT=50] -->
@@ -729,6 +731,8 @@
     <string name="bluetooth_disconnected_status">Disconnected</string>
     <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
     <string name="bluetooth_empty_list_user_restricted">You don\u2019t have permission to change Bluetooth settings.</string>
+    <!-- Text on button that allows users to toggle their Bluetooth device as the active audio output. [CHAR LIMIT=50] -->
+    <string name="bluetooth_toggle_active_audio_output_title">Use for TV audio</string>
 
     <!-- Help and feedback preferences -->
     <skip />
@@ -1839,7 +1843,7 @@
     <!-- Title for confirmation screen when turning ON accessibility service[CHAR LIMIT=20] -->
     <string name="system_accessibility_service_on_confirm_title">Use <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
     <!-- Description for confirmation screen when turning ON accessibility service[[CHAR LIMIT=NONE] -->
-    <string name="system_accessibility_service_on_confirm_desc"><xliff:g id="service" example="TalkBack">%1$s</xliff:g> can collect all of the text you type, except passwords. This includes personal data such as credit card numbers.</string>
+    <string name="system_accessibility_service_on_confirm_desc"><xliff:g id="service" example="TalkBack">%1$s</xliff:g> will be able to read your screen, display content over other apps, track your interactions with apps or hardware sensors, and interact with apps on your behalf.</string>
     <!-- Title for confirmation screen when turning OFF accessibility service[CHAR LIMIT=50] -->
     <string name="system_accessibility_service_off_confirm_title">Stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
     <!-- Description for confirmation screen when turning OFF accessibility service[[CHAR LIMIT=NONE] -->
@@ -2218,11 +2222,27 @@
     <string name="restricted_profile_configure_apps_description_loading" >One moment\u2026</string>
     <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
     <string name="restricted_profile_change_password_title" >Change pin</string>
+
+    <!-- Title of preference screen to create a restricted profile. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_create_preference_screen">Create restricted profile?</string>
+    <!-- Placeholder to indicate that restricted profile is already created. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_already_created_placeholder">Already Created</string>
+    <!-- Action to skip creating a restricted profile. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_skip_action">Skip</string>
+    <!-- Action to create pin for a restricted profile. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_create_pin_action">Create PIN</string>
+
+    <!-- Title of preference screen to create a restricted profile. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_enter_preference_screen">Enter restricted profile?</string>
+    <!-- Placeholder to indicated restricted profile is not found. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_enter_not_found_placeholder">No restricted profile</string>
+    <!-- Placeholder to indicated restricted profile is already entered. [CHAR LIMIT=30] -->
+    <string name="restricted_profile_enter_already_entered_placeholder">Already entered</string>
+
     <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
     <string name="restriction_description" ><xliff:g id="description">%1$s</xliff:g>\n<xliff:g id="value">%2$s</xliff:g></string>
     <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
     <string name="app_sees_restricted_accounts_and_controlled_by">This app can access your accounts. Controlled by <xliff:g id="app">%1$s</xliff:g></string>
-
     <!-- PIN UX -->
     <eat-comment />
     <string name="font" translatable="false">sans-serif</string>
@@ -2659,6 +2679,10 @@
     <string name="resolution_slice_uri" translatable="false"/>
     <!-- Slice uri for hdr and color format -->
     <string name="hdr_and_color_format_slice_uri" translatable="false"/>
+    <!-- Slice uri for Color format in Advanced display settings -->
+    <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 general information -->
     <string name="general_info_slice_uri" translatable="false"/>
@@ -2765,6 +2789,11 @@
     <!-- Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
     <string name="progress_scanning">Searching</string>
 
+    <!-- Message of a dialog shown to inform that the account intent is not available. [CHAR LIMIT=100] -->
+    <string name="add_account_intent_not_available_dialog_message">Failed to retrieve add account intent from authenticator.</string>
+    <!-- Message of a dialog shown to inform that the account type is not available or failed to add account. [CHAR LIMIT=100] -->
+    <string name="add_account_failed_dialog_message">Failed to add account or the account type is not available.</string>
+
     <!-- Placeholder font for compiling. The real font will be provided by RRO. -->
     <string name="preference_title_text_font" translatable="false" />
 
@@ -2833,4 +2862,13 @@
     <string name="energy_mode_eco_hint">Note that this mode may increase the power consumption of the device.</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>
+
+    <!-- Title for find my remote preference -->
+    <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_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>
 </resources>
diff --git a/Settings/res/xml/advanced_display.xml b/Settings/res/xml/advanced_display.xml
index 86abd02d9..b6fe53450 100644
--- a/Settings/res/xml/advanced_display.xml
+++ b/Settings/res/xml/advanced_display.xml
@@ -32,4 +32,14 @@
         android:key="hdr_format_selection"
         android:persistent="true"
         android:title="@string/hdr_format_selection_title"/>
+    <com.android.tv.twopanelsettings.slices.EmbeddedSlicePreference
+        android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
+        android:key="advanced_color_format"
+        custom:uri="@string/advanced_color_format_slice_uri"
+        custom:isPreferenceVisible="false" />
+    <com.android.tv.twopanelsettings.slices.EmbeddedSlicePreference
+        android:fragment="com.android.tv.twopanelsettings.slices.SliceFragment"
+        android:key="advanced_dolby_vision_mode"
+        custom:uri="@string/advanced_dolby_vision_mode_slice_uri"
+        custom:isPreferenceVisible="false" />
 </PreferenceScreen>
diff --git a/Settings/res/xml/create_restricted_profile.xml b/Settings/res/xml/create_restricted_profile.xml
new file mode 100644
index 000000000..b45c95f65
--- /dev/null
+++ b/Settings/res/xml/create_restricted_profile.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2023 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/restricted_profile_create_preference_screen">
+    <Preference
+        android:key="restricted_profile_already_created"
+        android:title="@string/restricted_profile_already_created_placeholder"
+        android:enabled="false" />
+    <Preference
+        android:key="restricted_profile_skip"
+        android:title="@string/restricted_profile_skip_action" />
+    <Preference
+        android:key="restricted_profile_create"
+        android:title="@string/restricted_profile_create_pin_action" />
+
+</PreferenceScreen>
diff --git a/Settings/res/xml/device_info_settings_vendor.xml b/Settings/res/xml/device_info_settings_vendor.xml
index 2601621d3..d6029d863 100644
--- a/Settings/res/xml/device_info_settings_vendor.xml
+++ b/Settings/res/xml/device_info_settings_vendor.xml
@@ -16,6 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:custom="http://schemas.android.com/apk/res-auto"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/about_preference">
 
@@ -116,4 +117,9 @@
         android:title="@string/selinux_status"
         android:summary="@string/selinux_status_enforcing"/>
 
+    <!-- General information for arbitrary content -->
+    <com.android.tv.twopanelsettings.slices.EmbeddedSlicePreference
+        android:key="general_info"
+        custom:uri="@string/general_info_slice_uri"
+        custom:isPreferenceVisible="false" />
 </PreferenceScreen>
diff --git a/Settings/res/xml/enter_restricted_profile.xml b/Settings/res/xml/enter_restricted_profile.xml
new file mode 100644
index 000000000..1e0c78ef9
--- /dev/null
+++ b/Settings/res/xml/enter_restricted_profile.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2023 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/restricted_profile_enter_preference_screen">
+    <Preference
+        android:key="restricted_profile_not_found"
+        android:title="@string/restricted_profile_enter_not_found_placeholder"
+        android:enabled="false" />
+    <Preference
+        android:key="restricted_profile_already_entered"
+        android:title="@string/restricted_profile_enter_already_entered_placeholder"
+        android:enabled="false" />
+    <Preference
+        android:key="restricted_profile_skip"
+        android:title="@string/restricted_profile_skip_action" />
+    <Preference
+        android:key="restricted_profile_enter"
+        android:title="@string/restricted_profile_switch_to" />
+
+</PreferenceScreen>
diff --git a/Settings/res/xml/help_and_feedback_x.xml b/Settings/res/xml/help_and_feedback_x.xml
index 95f28d745..1c657fa53 100644
--- a/Settings/res/xml/help_and_feedback_x.xml
+++ b/Settings/res/xml/help_and_feedback_x.xml
@@ -21,8 +21,10 @@
         android:key="feedback"
         android:icon="@drawable/ic_send_feedback"
         android:title="@string/send_feedback">
-        <intent
-            android:action="com.google.android.apps.tv.launcherx.feedback.LAUNCH_FEEDBACK_UI" />
+        <intent android:action="com.google.android.apps.tv.launcherx.feedback.LAUNCH_FEEDBACK_UI">
+            <!-- A screenshot would only show the Settings screen, so don't take it. -->
+            <extra android:name="FEEDBACK_CAPTURE_SCREENSHOT" android:value="false" />
+        </intent>
     </Preference>
     <Preference
         android:key="help_center"
diff --git a/Settings/res/xml/main_prefs_vendor.xml b/Settings/res/xml/main_prefs_vendor.xml
index 75707e34b..399fd4b63 100644
--- a/Settings/res/xml/main_prefs_vendor.xml
+++ b/Settings/res/xml/main_prefs_vendor.xml
@@ -40,7 +40,7 @@
         android:order="2">
 
         <Preference
-            android:icon="@drawable/ic_photo_size_select_actual"
+            android:icon="@drawable/ic_settings_channels_and_inputs"
             android:key="channels_and_inputs"
             android:title="@string/channels_and_inputs_title"
             android:summary="@string/channels_and_inputs_summary"
@@ -48,7 +48,7 @@
             <!-- This is an example. Change to your intent for display and preview-->
         </Preference>
         <com.android.tv.twopanelsettings.slices.SlicePreference
-            android:icon="@drawable/ic_photo_size_select_actual"
+            android:icon="@drawable/ic_settings_channels_and_inputs"
             android:key="channels_and_inputs_slice"
             android:title="@string/channels_and_inputs_title"
             android:summary="@string/channels_and_inputs_summary"
diff --git a/Settings/res/xml/main_prefs_x.xml b/Settings/res/xml/main_prefs_x.xml
index 6309b82f4..4ba941a52 100644
--- a/Settings/res/xml/main_prefs_x.xml
+++ b/Settings/res/xml/main_prefs_x.xml
@@ -41,7 +41,7 @@
         android:order="2">
 
         <com.android.tv.twopanelsettings.slices.SlicePreference
-            android:icon="@drawable/ic_photo_size_select_actual"
+            android:icon="@drawable/ic_settings_channels_and_inputs"
             android:key="channels_and_inputs_slice"
             android:title="@string/channels_and_inputs_title"
             android:summary="@string/channels_and_inputs_summary"
diff --git a/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java b/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java
index f5ce41b45..ab4829ee3 100644
--- a/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java
+++ b/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java
@@ -61,11 +61,25 @@ public class ActionDisabledByAdminDialog extends FragmentActivity
             return admin;
         }
         admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+        int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+
+        Bundle adminDetails = null;
+        if (admin.component == null) {
+            DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
+            adminDetails = devicePolicyManager.getEnforcingAdminAndUserDetails(userId,
+                    getRestrictionFromIntent(intent));
+            if (adminDetails != null) {
+                admin.component = adminDetails.getParcelable(
+                        DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+            }
+        }
 
         if (intent.hasExtra(Intent.EXTRA_USER)) {
             admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
         } else {
-            int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            if (adminDetails != null) {
+                userId = adminDetails.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            }
             if (userId == UserHandle.USER_NULL) {
                 admin.user = null;
             } else {
diff --git a/Settings/src/com/android/tv/settings/BootReceiver.java b/Settings/src/com/android/tv/settings/BootReceiver.java
index 3ee0db185..c963bc943 100644
--- a/Settings/src/com/android/tv/settings/BootReceiver.java
+++ b/Settings/src/com/android/tv/settings/BootReceiver.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.util.Log;
 
 import com.android.tv.settings.accessories.BluetoothDevicesService;
+import com.android.tv.settings.device.display.daydream.EnergySaverFragment;
 import com.android.tv.settings.device.eco.EnergyModesHelper;
 
 /** The {@BroadcastReceiver} for performing actions upon device boot. */
@@ -50,5 +51,7 @@ public class BootReceiver extends BroadcastReceiver {
 
         EnergyModesHelper energyModesHelper = new EnergyModesHelper(context);
         energyModesHelper.updateEnergyMode();
+
+        EnergySaverFragment.resetAttentiveTimeoutIfHidden(context);
     }
 }
diff --git a/Settings/src/com/android/tv/settings/RestrictedPreferenceAdapter.java b/Settings/src/com/android/tv/settings/RestrictedPreferenceAdapter.java
index 024965d58..a483ec685 100644
--- a/Settings/src/com/android/tv/settings/RestrictedPreferenceAdapter.java
+++ b/Settings/src/com/android/tv/settings/RestrictedPreferenceAdapter.java
@@ -56,9 +56,10 @@ public class RestrictedPreferenceAdapter<T extends Preference> {
     private final Context mContext;
     private final T mOriginalPreference;
     private final List<String> mUserRestrictions;
-    private final boolean mRestricted;
-    private final EnforcedAdmin mEnforcingAdmin;
-    private final RestrictedPreference mRestrictedPreference;
+    private boolean mRestricted;
+    private EnforcedAdmin mEnforcingAdmin;
+    private RestrictedPreference mRestrictedPreference;
+    private boolean mIsApSaved;
 
     public RestrictedPreferenceAdapter(Context context, T originalPreference,
             List<String> userRestrictions) {
@@ -125,6 +126,15 @@ public class RestrictedPreferenceAdapter<T extends Preference> {
         return false;
     }
 
+    /**
+     * Returns {@code true} if given restriction applies to this preference,
+     * {@code false} otherwise.
+     */
+    public boolean isRestricted(String restriction) {
+        UserManager userManager = UserManager.get(mContext);
+        return userManager.hasUserRestriction(restriction);
+    }
+
     private EnforcedAdmin isRestrictedByAdmin() {
         if (mUserRestrictions == null) {
             return null;
@@ -156,6 +166,11 @@ public class RestrictedPreferenceAdapter<T extends Preference> {
         screen.addPreference(mRestrictedPreference);
     }
 
+    /** Set access point saved or not. */
+    public void setApSaved(boolean saved) {
+        mIsApSaved = saved;
+    }
+
     /**
      * Returns the preference to be inserted into the preference screen.
      *
@@ -164,7 +179,8 @@ public class RestrictedPreferenceAdapter<T extends Preference> {
      * the original preference.
      */
     public Preference getPreference() {
-        if (mRestrictedPreference != null) {
+        if (mRestrictedPreference != null && (isRestricted(UserManager.DISALLOW_CONFIG_WIFI)
+                || (isRestricted(UserManager.DISALLOW_ADD_WIFI_CONFIG) && !mIsApSaved))) {
             return mRestrictedPreference;
         }
 
@@ -194,8 +210,19 @@ public class RestrictedPreferenceAdapter<T extends Preference> {
      * Call this after making direct changes to the original preference.
      */
     public void updatePreference() {
-        if (mRestricted) {
+        mRestricted = isRestricted();
+        mEnforcingAdmin = isRestrictedByAdmin();
+        if (mEnforcingAdmin != null) {
+            if (mRestrictedPreference == null) {
+                mRestrictedPreference = new RestrictedPreference(mContext);
+            }
+        } else {
+            mRestrictedPreference = null;
+        }
+        if (mRestricted && isRestricted(UserManager.DISALLOW_CONFIG_WIFI)) {
             mOriginalPreference.setEnabled(false);
+        } else {
+            mOriginalPreference.setEnabled(true);
         }
         updateRestrictedPreference();
     }
@@ -204,8 +231,8 @@ public class RestrictedPreferenceAdapter<T extends Preference> {
         if (mRestrictedPreference == null) {
             return;
         }
-
         mRestrictedPreference.setKey(mOriginalPreference.getKey());
+        mRestrictedPreference.setOrder(mOriginalPreference.getOrder());
         mRestrictedPreference.setTitle(mOriginalPreference.getTitle());
         mRestrictedPreference.setSummary(mOriginalPreference.getSummary());
         mRestrictedPreference.setIcon(mOriginalPreference.getIcon());
diff --git a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
index 33c06d945..28a94fff6 100644
--- a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
@@ -54,6 +54,7 @@ import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.tv.settings.library.instrumentation.InstrumentedPreferenceFragment;
 import com.android.tv.settings.overlay.FlavorUtils;
 import com.android.tv.settings.util.SettingsPreferenceUtil;
 import com.android.tv.settings.widget.SettingsViewModel;
@@ -66,7 +67,7 @@ import java.util.Collections;
  * A {@link LeanbackPreferenceFragmentCompat} that has hooks to observe fragment lifecycle events
  * and allow for instrumentation.
  */
-public abstract class SettingsPreferenceFragment extends LeanbackPreferenceFragmentCompat
+public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceFragment
         implements LifecycleOwner,
         TwoPanelSettingsFragment.PreviewableComponentCallback {
     private final Lifecycle mLifecycle = new Lifecycle(this);
diff --git a/Settings/src/com/android/tv/settings/TvSettingsActivity.java b/Settings/src/com/android/tv/settings/TvSettingsActivity.java
index a3ab44211..e80b04c87 100644
--- a/Settings/src/com/android/tv/settings/TvSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/TvSettingsActivity.java
@@ -94,7 +94,7 @@ public abstract class TvSettingsActivity extends FragmentActivity {
                         .setCustomAnimations(android.R.animator.fade_in,
                                 android.R.animator.fade_out)
                         .add(android.R.id.content, fragment, SETTINGS_FRAGMENT_TAG)
-                        .commitNow();
+                        .commitNowAllowingStateLoss();
                 return;
             }
 
@@ -114,7 +114,7 @@ public abstract class TvSettingsActivity extends FragmentActivity {
                                 getSupportFragmentManager().beginTransaction()
                                         .add(android.R.id.content, fragment,
                                                 SETTINGS_FRAGMENT_TAG)
-                                        .commitNow();
+                                        .commitNowAllowingStateLoss();
                             });
 
                             final Slide slide = new Slide(Gravity.END);
@@ -144,7 +144,7 @@ public abstract class TvSettingsActivity extends FragmentActivity {
             final Scene scene = new Scene(root);
             scene.setEnterAction(() -> getSupportFragmentManager().beginTransaction()
                     .remove(fragment)
-                    .commitNow());
+                    .commitNowAllowingStateLoss());
             final Slide slide = new Slide(Gravity.END);
             slide.setSlideFraction(
                     getResources().getDimension(R.dimen.lb_settings_pane_width) / root.getWidth());
@@ -217,7 +217,7 @@ public abstract class TvSettingsActivity extends FragmentActivity {
                                     android.R.id.content,
                                     createSettingsFragment(),
                                     SETTINGS_FRAGMENT_TAG)
-                            .commitNow();
+                            .commitNowAllowingStateLoss();
                 }
             } else {
                 Log.v(TAG, "Startup verification cancelled or failed.");
diff --git a/Settings/src/com/android/tv/settings/about/MacAddressPreferenceController.java b/Settings/src/com/android/tv/settings/about/MacAddressPreferenceController.java
new file mode 100644
index 000000000..b8a31dc25
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/about/MacAddressPreferenceController.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2017 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.about;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController;
+
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Collections;
+
+/**
+ * Concrete subclass of WIFI MAC address preference controller
+ */
+public class MacAddressPreferenceController extends AbstractWifiMacAddressPreferenceController {
+    private static final String TAG = "MacAddressPC";
+
+    private final ConnectivityManager mConnectivityManager;
+    private Preference mMacAddress;
+
+    public MacAddressPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context, lifecycle);
+        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mMacAddress = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    protected void updateConnectivity() {
+        Network activeNetwork = mConnectivityManager.getActiveNetwork();
+        NetworkCapabilities networkCapabilities = activeNetwork != null
+                ? mConnectivityManager.getNetworkCapabilities(activeNetwork) : null;
+        LinkProperties linkProperties = activeNetwork != null
+                ? mConnectivityManager.getLinkProperties(activeNetwork) : null;
+        if (mMacAddress == null || networkCapabilities == null || linkProperties == null
+                || linkProperties.getInterfaceName() == null
+                || !networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
+            super.updateConnectivity();
+            return;
+        }
+
+        // Find ethernet mac address from system.
+        try {
+            for (NetworkInterface networkInterface :
+                    Collections.list(NetworkInterface.getNetworkInterfaces())) {
+                byte[] mac = networkInterface.getHardwareAddress();
+                if (mac != null && linkProperties.getInterfaceName().equalsIgnoreCase(
+                        networkInterface.getName())) {
+                    StringBuilder macString = new StringBuilder();
+                    for (byte b : mac) {
+                        macString.append(String.format(macString.length() == 0
+                                ? "%02X" : ":%02X", b));
+                    }
+                    mMacAddress.setSummary(macString);
+                    return;
+                }
+
+            }
+        } catch (SocketException e) {
+            Log.e(TAG, "Unable to list network interfaces", e);
+        }
+
+        super.updateConnectivity();
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/about/StatusFragment.java b/Settings/src/com/android/tv/settings/about/StatusFragment.java
index e6d0db050..5c7df850a 100644
--- a/Settings/src/com/android/tv/settings/about/StatusFragment.java
+++ b/Settings/src/com/android/tv/settings/about/StatusFragment.java
@@ -61,7 +61,7 @@ public class StatusFragment extends PreferenceControllerFragment {
         controllers.add(new UptimePreferenceController(context, lifecycle));
         controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
         controllers.add(new IpAddressPreferenceController(context, lifecycle));
-        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
+        controllers.add(new MacAddressPreferenceController(context, lifecycle));
         controllers.add(new ImsStatusPreferenceController(context, lifecycle));
 
         return controllers;
diff --git a/Settings/src/com/android/tv/settings/about/WifiMacAddressPreferenceController.java b/Settings/src/com/android/tv/settings/about/WifiMacAddressPreferenceController.java
deleted file mode 100644
index f234a2b5f..000000000
--- a/Settings/src/com/android/tv/settings/about/WifiMacAddressPreferenceController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2017 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.about;
-
-import android.content.Context;
-
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController;
-
-/**
- * Concrete subclass of WIFI MAC address preference controller
- */
-public class WifiMacAddressPreferenceController extends AbstractWifiMacAddressPreferenceController {
-    public WifiMacAddressPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context, lifecycle);
-    }
-
-    // This space intentionally left blank
-}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityColorCorrectionActivity.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityColorCorrectionActivity.java
index d80f95f01..dd0d34b33 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityColorCorrectionActivity.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityColorCorrectionActivity.java
@@ -25,7 +25,7 @@ public class AccessibilityColorCorrectionActivity extends TvSettingsActivity {
                         AccessibilityColorCorrectionSettingsFragment.newInstance())
                 .add(android.R.id.content,
                         AccessibilityColorCorrectionPreviewFragment.newInstance())
-                .commit();
+                .commitAllowingStateLoss();
         return null;
     }
 }
\ No newline at end of file
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
index 682368443..4ce9290dd 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
@@ -61,10 +61,12 @@ public class AccessibilityFragment extends SettingsPreferenceFragment {
     private static final String TOGGLE_BOLD_TEXT_KEY = "toggle_bold_text";
     private static final String COLOR_CORRECTION_TWOPANEL_KEY = "color_correction_only_twopanel";
     private static final String COLOR_CORRECTION_CLASSIC_KEY = "color_correction_only_classic";
+    private static final String ACCESSIBILITY_SHORTCUT_KEY = "accessibility_shortcut";
     private static final int BOLD_TEXT_ADJUSTMENT = 500;
     private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = -1;
 
     PreferenceCategory mServicesPrefCategory;
+    PreferenceCategory mControlsPrefCategory;
 
     private final Map<ComponentName, PreferenceCategory>
             mServiceComponentNameToPreferenceCategoryMap = new ArrayMap<>();
@@ -154,6 +156,7 @@ public class AccessibilityFragment extends SettingsPreferenceFragment {
         colorCorrectionPreferenceToSetVisible.setVisible(true);
 
         mServicesPrefCategory = findPreference(AccessibilityCategory.SERVICES.getKey());
+        mControlsPrefCategory = findPreference(AccessibilityCategory.INTERACTION_CONTROLS.getKey());
         populateServiceToPreferenceCategoryMaps();
         refreshServices();
         AccessibilityManager am = (AccessibilityManager)
@@ -216,6 +219,13 @@ public class AccessibilityFragment extends SettingsPreferenceFragment {
         final List<String> permittedServices = dpm.getPermittedAccessibilityServices(
                 UserHandle.myUserId());
 
+        if (installedServiceInfos.size() == 0) {
+            Preference pref = mControlsPrefCategory.findPreference(ACCESSIBILITY_SHORTCUT_KEY);
+            if (pref != null) {
+                mControlsPrefCategory.removePreference(pref);
+            }
+        }
+
         final boolean accessibilityEnabled = Settings.Secure.getInt(
                 getActivity().getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
@@ -278,6 +288,7 @@ public class AccessibilityFragment extends SettingsPreferenceFragment {
             prefCategory.addPreference(servicePref);
         }
         mServicesPrefCategory.setVisible(mServicesPrefCategory.getPreferenceCount() != 0);
+        mControlsPrefCategory.setVisible(mControlsPrefCategory.getPreferenceCount() != 0);
     }
 
     @Override
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
index f90e66e42..1f0c66ff8 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceConfirmationFragment.java
@@ -85,21 +85,29 @@ public class AccessibilityServiceConfirmationFragment extends GuidedStepSupportF
     @Override
     public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
         final CharSequence label = getArguments().getCharSequence(ARG_LABEL);
+        String sanitizedLabel = label.toString()
+                .replace("\t", "")
+                .replace("\r", "")
+                .replace("\n", "")
+                .codePoints().limit(32)
+                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                .toString();
+
         if (getArguments().getBoolean(ARG_ENABLING)) {
             return new GuidanceStylist.Guidance(
                     getString(R.string.system_accessibility_service_on_confirm_title,
-                            label),
+                            sanitizedLabel),
                     getString(R.string.system_accessibility_service_on_confirm_desc,
-                            label),
+                            sanitizedLabel),
                     null,
                     getActivity().getDrawable(R.drawable.ic_accessibility_new_132dp)
             );
         } else {
             return new GuidanceStylist.Guidance(
                     getString(R.string.system_accessibility_service_off_confirm_title,
-                            label),
+                            sanitizedLabel),
                     getString(R.string.system_accessibility_service_off_confirm_desc,
-                            label),
+                            sanitizedLabel),
                     null,
                     getActivity().getDrawable(R.drawable.ic_accessibility_new_132dp)
             );
diff --git a/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java b/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
index 78db61cce..0c0be9573 100644
--- a/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
@@ -19,7 +19,6 @@ package com.android.tv.settings.accessories;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -194,7 +193,7 @@ public class AccessoriesFragment extends SettingsPreferenceFragment {
             return willBeProcessed ? R.drawable.ic_headset_raw : R.drawable.ic_headset;
         } else if ((devClass & InputDeviceCriteria.MINOR_DEVICE_CLASS_POINTING) != 0) {
             return willBeProcessed ? R.drawable.ic_mouse_raw : R.drawable.ic_mouse;
-        } else if (isA2dpSource(dev) && willBeProcessed) {
+        } else if (AccessoryUtils.isA2dpSource(dev) && willBeProcessed) {
             return R.drawable.ic_a2dp_raw;
         } else if ((devClass & InputDeviceCriteria.MINOR_DEVICE_CLASS_REMOTE) != 0) {
             return willBeProcessed ? R.drawable.ic_games_raw : R.drawable.ic_games;
@@ -209,9 +208,4 @@ public class AccessoriesFragment extends SettingsPreferenceFragment {
         // Default for now
         return willBeProcessed ? R.drawable.ic_bluetooth_raw : R.drawable.ic_bluetooth;
     }
-
-    private static boolean isA2dpSource(BluetoothDevice device) {
-        return device != null && device.getBluetoothClass() != null
-            && device.getBluetoothClass().doesClassMatch(BluetoothProfile.A2DP);
-    }
 }
diff --git a/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java b/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
index 560e91ecd..44defba8b 100644
--- a/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
+++ b/Settings/src/com/android/tv/settings/accessories/AccessoryUtils.java
@@ -19,6 +19,7 @@ package com.android.tv.settings.accessories;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.text.Html;
 import android.util.Log;
@@ -167,6 +168,53 @@ final class AccessoryUtils {
         return Html.escapeHtml(bluetoothDevice.getName());
     }
 
+    public static boolean isBluetoothHeadset(BluetoothDevice device) {
+        if (device == null) {
+            return false;
+        }
+        final BluetoothClass bluetoothClass = device.getBluetoothClass();
+        final int devClass = bluetoothClass.getDeviceClass();
+        return (devClass == BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET
+                || devClass == BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES
+                || devClass == BluetoothClass.Device.AUDIO_VIDEO_LOUDSPEAKER
+                || devClass == BluetoothClass.Device.AUDIO_VIDEO_PORTABLE_AUDIO
+                || devClass == BluetoothClass.Device.AUDIO_VIDEO_HIFI_AUDIO);
+    }
+
+    static boolean isA2dpSource(BluetoothDevice device) {
+        return device != null && device.getBluetoothClass() != null
+                && device.getBluetoothClass().doesClassMatch(BluetoothProfile.A2DP);
+    }
+
+    /** Returns true if the BluetoothDevice is the active audio output, false otherwise. */
+    static boolean isActiveAudioOutput(BluetoothDevice device) {
+        if (device != null) {
+            final BluetoothAdapter btAdapter = getDefaultBluetoothAdapter();
+            if (btAdapter != null) {
+                return btAdapter.getActiveDevices(BluetoothProfile.A2DP).contains(device);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Sets the specified BluetoothDevice as the active audio output. Passing `null`
+     * resets the active audio output to the default. Returns false on immediate error,
+     * true otherwise.
+     */
+    static boolean setActiveAudioOutput(BluetoothDevice device) {
+        // null is an accepted value for unsetting the active audio output
+        final BluetoothAdapter btAdapter = getDefaultBluetoothAdapter();
+        if (btAdapter != null) {
+            if (device == null) {
+                return btAdapter.removeActiveDevice(BluetoothAdapter.ACTIVE_DEVICE_AUDIO);
+            } else {
+                return btAdapter.setActiveDevice(device, BluetoothAdapter.ACTIVE_DEVICE_AUDIO);
+            }
+        }
+        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 54d235084..255f134f4 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
@@ -132,20 +132,25 @@ public class AddAccessoryActivity extends FragmentActivity
             }
             switch (msg.what) {
                 case MSG_UPDATE_VIEW:
+                    Log.d(TAG, "handleMessage: MSG_UPDATE_VIEW");
                     activity.updateView();
                     break;
                 case MSG_REMOVE_CANCELED:
+                    Log.d(TAG, "handleMessage: MSG_REMOVE_CANCELED");
                     activity.mCancelledAddress = ADDRESS_NONE;
                     activity.updateView();
                     break;
                 case MSG_PAIRING_COMPLETE:
+                    Log.d(TAG, "handleMessage: MSG_PAIRING_COMPLETE");
                     activity.finish();
                     break;
                 case MSG_OP_TIMEOUT:
+                    Log.d(TAG, "handleMessage: MSG_OP_TIMEOUT");
                     activity.handlePairingTimeout();
                     break;
                 case MSG_RESTART:
                     if (activity.mBluetoothPairer != null) {
+                        Log.d(TAG, "handleMessage: MSG_RESTART");
                         activity.mBluetoothPairer.start();
                         activity.mBluetoothPairer.cancelPairing();
                     }
@@ -232,7 +237,7 @@ public class AddAccessoryActivity extends FragmentActivity
             fm.beginTransaction()
                     .add(R.id.action_fragment, mPreferenceFragment)
                     .add(R.id.content_fragment, mContentFragment)
-                    .commit();
+                    .commitAllowingStateLoss();
         } else {
             mPreferenceFragment = (AddAccessoryPreferenceFragment)
                     fm.getFragment(savedInstanceState,
@@ -265,15 +270,15 @@ public class AddAccessoryActivity extends FragmentActivity
     @Override
     protected void onStart() {
         super.onStart();
-
-        if (DEBUG) {
-            Log.d(TAG, "onStart() mPairingInBackground = " + mPairingInBackground);
-        }
+        Log.d(TAG, "onStart() mPairingInBackground = " + mPairingInBackground);
 
         // Only do the following if we are not coming back to this activity from
         // the Secure Pairing activity.
         if (!mPairingInBackground) {
             startBluetoothPairer();
+            // bluetooth devices list is empty at this point, clear preferences
+            // to avoid delayed animation jank
+            mPreferenceFragment.clearList();
         }
 
         mPairingInBackground = false;
@@ -299,9 +304,7 @@ public class AddAccessoryActivity extends FragmentActivity
 
     @Override
     public void onStop() {
-        if (DEBUG) {
-            Log.d(TAG, "onStop()");
-        }
+        Log.d(TAG, "onStop()");
         if (!mPairingBluetooth) {
             stopBluetoothPairer();
             mMsgHandler.removeCallbacksAndMessages(null);
@@ -316,6 +319,7 @@ public class AddAccessoryActivity extends FragmentActivity
 
     @Override
     protected void onDestroy() {
+        Log.d(TAG, "onDestroy()");
         super.onDestroy();
         stopBluetoothPairer();
         mMsgHandler.removeCallbacksAndMessages(null);
@@ -403,8 +407,9 @@ public class AddAccessoryActivity extends FragmentActivity
 
         int prevNumDevices = mPreferenceFragment.getPreferenceScreen().getPreferenceCount();
 
-        mPreferenceFragment.updateList(mBluetoothDevices, mCurrentTargetAddress,
-                mCurrentTargetStatus, mCancelledAddress);
+
+        mPreferenceFragment.updateList(mPreferenceFragment.getPreferenceScreen(),
+                mBluetoothDevices, mCurrentTargetAddress, mCurrentTargetStatus, mCancelledAddress);
 
         if (mNoInputMode) {
             if (DEBUG) Log.d(TAG, "stopping auto-exit timer");
@@ -426,9 +431,11 @@ public class AddAccessoryActivity extends FragmentActivity
            }
         }
 
-        TransitionManager.beginDelayedTransition(findViewById(R.id.content_frame));
-
-        rearrangeViews();
+        final boolean prevEmpty = (prevNumDevices == 0);
+        if (prevEmpty != mBluetoothDevices.isEmpty()) {
+            TransitionManager.beginDelayedTransition(findViewById(R.id.content_frame));
+            rearrangeViews();
+        }
     }
 
     private void rearrangeViews() {
@@ -455,15 +462,16 @@ public class AddAccessoryActivity extends FragmentActivity
         // Cancel countdown
         mMsgHandler.removeMessages(MSG_AUTOPAIR_TICK);
         mMsgHandler.removeMessages(MSG_START_AUTOPAIR_COUNTDOWN);
-        setPairingText(null);
     }
 
     private void setTimeout(int timeout) {
+        Log.d(TAG, "setTimeout(" + timeout + ")");
         cancelTimeout();
         mMsgHandler.sendEmptyMessageDelayed(MSG_OP_TIMEOUT, timeout);
     }
 
     private void cancelTimeout() {
+        Log.d(TAG, "cancelTimeout()");
         mMsgHandler.removeMessages(MSG_OP_TIMEOUT);
     }
 
@@ -485,9 +493,7 @@ public class AddAccessoryActivity extends FragmentActivity
                 }
                 for (BluetoothDevice target : mBluetoothDevices) {
                     if (target.getAddress().equalsIgnoreCase(clickedAddress)) {
-                        if (DEBUG) {
-                            Log.d(TAG, "Found it!");
-                        }
+                        Log.i(TAG, "Starting pairing on " + clickedAddress);
                         mCancelledAddress = ADDRESS_NONE;
                         setPairingBluetooth(true);
                         mBluetoothPairer.startPairing(target);
@@ -499,6 +505,7 @@ public class AddAccessoryActivity extends FragmentActivity
     }
 
     private void cancelBtPairing() {
+        Log.i(TAG, "cancelBtPairing()");
         // cancel current request to pair
         if (mBluetoothPairer != null) {
             if (mBluetoothPairer.getTargetDevice() != null) {
@@ -521,6 +528,7 @@ public class AddAccessoryActivity extends FragmentActivity
     }
 
     private void startBluetoothPairer() {
+        Log.i(TAG, "startBluetoothPairer()");
         stopBluetoothPairer();
         mBluetoothPairer = new BluetoothDevicePairer(this, this);
         mBluetoothPairer.start();
@@ -533,6 +541,7 @@ public class AddAccessoryActivity extends FragmentActivity
 
     private void stopBluetoothPairer() {
         if (mBluetoothPairer != null) {
+            Log.i(TAG, "stopBluetoothPairer()");
             mBluetoothPairer.setListener(null);
             mBluetoothPairer.dispose();
             mBluetoothPairer = null;
@@ -575,35 +584,37 @@ public class AddAccessoryActivity extends FragmentActivity
         String address = mBluetoothPairer.getTargetDevice() == null ? ADDRESS_NONE :
                 mBluetoothPairer.getTargetDevice().getAddress();
 
-        if (DEBUG) {
-            String state = "?";
-            switch (status) {
-                case BluetoothDevicePairer.STATUS_NONE:
-                    state = "BluetoothDevicePairer.STATUS_NONE";
-                    break;
-                case BluetoothDevicePairer.STATUS_SCANNING:
-                    state = "BluetoothDevicePairer.STATUS_SCANNING";
-                    break;
-                case BluetoothDevicePairer.STATUS_WAITING_TO_PAIR:
-                    state = "BluetoothDevicePairer.STATUS_WAITING_TO_PAIR";
-                    break;
-                case BluetoothDevicePairer.STATUS_PAIRING:
-                    state = "BluetoothDevicePairer.STATUS_PAIRING";
-                    break;
-                case BluetoothDevicePairer.STATUS_CONNECTING:
-                    state = "BluetoothDevicePairer.STATUS_CONNECTING";
-                    break;
-                case BluetoothDevicePairer.STATUS_ERROR:
-                    state = "BluetoothDevicePairer.STATUS_ERROR";
-                    break;
-                case BluetoothDevicePairer.STATUS_SUCCEED_BREDRMOUSE:
-                    state = "BluetoothDevicePairer.STATUS_SUCCEED_BREDRMOUSE";
-                    break;
-            }
-            long time = mBluetoothPairer.getNextStageTime() - SystemClock.elapsedRealtime();
-            Log.d(TAG, "Update received, number of devices:" + numDevices + " state: " +
-                    state + " target device: " + address + " time to next event: " + time);
+        String state = "?";
+        switch (status) {
+            case BluetoothDevicePairer.STATUS_NONE:
+                state = "BluetoothDevicePairer.STATUS_NONE";
+                break;
+            case BluetoothDevicePairer.STATUS_SCANNING:
+                state = "BluetoothDevicePairer.STATUS_SCANNING";
+                break;
+            case BluetoothDevicePairer.STATUS_WAITING_TO_PAIR:
+                state = "BluetoothDevicePairer.STATUS_WAITING_TO_PAIR";
+                break;
+            case BluetoothDevicePairer.STATUS_PAIRING:
+                state = "BluetoothDevicePairer.STATUS_PAIRING";
+                break;
+            case BluetoothDevicePairer.STATUS_CONNECTING:
+                state = "BluetoothDevicePairer.STATUS_CONNECTING";
+                break;
+            case BluetoothDevicePairer.STATUS_ERROR:
+                state = "BluetoothDevicePairer.STATUS_ERROR";
+                break;
+            case BluetoothDevicePairer.STATUS_SUCCEED_BREDRMOUSE:
+                state = "BluetoothDevicePairer.STATUS_SUCCEED_BREDRMOUSE";
+                break;
         }
+        long time = mBluetoothPairer.getNextStageTime() - SystemClock.elapsedRealtime();
+
+        Log.d(TAG, "statusChanged(): " + "Update received, number of devices:"
+                +
+                numDevices + " state: " + state + " target device: " + address
+                +
+                " time to next event: " + time);
 
         mBluetoothDevices.clear();
         mBluetoothDevices.addAll(mBluetoothPairer.getAvailableDevices());
@@ -629,9 +640,7 @@ public class AddAccessoryActivity extends FragmentActivity
                         // to close the activity
                         return;
                     }
-                    if (DEBUG) {
-                        Log.d(TAG, "Invalidating and restarting.");
-                    }
+                    Log.i(TAG, "Invalidating and restarting.");
 
                     mBluetoothPairer.invalidateDevice(mBluetoothPairer.getTargetDevice());
                     mBluetoothPairer.start();
@@ -681,14 +690,13 @@ public class AddAccessoryActivity extends FragmentActivity
         mCurrentTargetAddress = address;
         mCurrentTargetStatus = getMessageForStatus(status);
         mMsgHandler.sendEmptyMessage(MSG_UPDATE_VIEW);
+        Log.e(TAG, "statusChanged(): setting status to \"" + mCurrentTargetStatus + "\"");
     }
 
     /**
      * Announce device names as they become visible.
      */
     private void announceNewDevicesForA11y() {
-        Log.d(TAG, "announceNewDevicesForA11y");
-
         // Filter out the already announced devices from the visible list
         List<BluetoothDevice> newDevicesToAnnounce =
                 mBluetoothDevices
@@ -704,15 +712,18 @@ public class AddAccessoryActivity extends FragmentActivity
         getWindow().getDecorView().setAccessibilityPaneTitle(sb.toString());
 
         mA11yAnnouncedDevices = new ArrayList<>(mBluetoothDevices);
+        Log.d(TAG, "announceNewDevicesForA11y: " + sb.toString());
     }
 
     private void clearDeviceList() {
+        Log.d(TAG, "clearDeviceList()");
         mBluetoothDevices.clear();
         mBluetoothPairer.clearDeviceList();
     }
 
     private void handlePairingTimeout() {
         if (mPairingInBackground) {
+            Log.w(TAG, "handlePairingTimeout(): timing out background pairing");
             finish();
         } else {
             // Either Pairing or Connecting timeout out.
@@ -724,6 +735,7 @@ public class AddAccessoryActivity extends FragmentActivity
             mCurrentTargetStatus = getString(R.string.accessory_state_error);
             mMsgHandler.sendEmptyMessage(MSG_UPDATE_VIEW);
             mMsgHandler.sendEmptyMessageDelayed(MSG_RESTART, RESTART_DELAY);
+            Log.e(TAG, "handlePairingTimeout(): " + mCurrentTargetStatus);
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
index 6712eb000..60731a228 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
@@ -61,26 +61,23 @@ public class AddAccessoryPreferenceFragment extends BaseLeanbackPreferenceFragme
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         final AddAccessoryActivity activity = (AddAccessoryActivity) getActivity();
-        updateList(activity.getBluetoothDevices(), activity.getCurrentTargetAddress(),
+        final Context themedContext = getPreferenceManager().getContext();
+
+        PreferenceScreen screen =
+                getPreferenceManager().createPreferenceScreen(themedContext);
+        updateList(screen, activity.getBluetoothDevices(), activity.getCurrentTargetAddress(),
                 activity.getCurrentTargetStatus(), activity.getCancelledAddress());
     }
 
-    public void updateList(List<BluetoothDevice> devices, String currentTargetAddress,
-            String currentTargetStatus, String cancelledAddress) {
+    public void updateList(PreferenceScreen screen, List<BluetoothDevice> devices,
+                           String currentTargetAddress, String currentTargetStatus,
+                           String cancelledAddress) {
         final Context themedContext = getPreferenceManager().getContext();
-
-        PreferenceScreen screen = getPreferenceScreen();
-        if (screen == null) {
-            screen = getPreferenceManager().createPreferenceScreen(themedContext);
-            setPreferenceScreen(screen);
-        } else {
-            screen.removeAll();
-        }
+        screen.removeAll();
 
         if (devices == null) {
             return;
         }
-
         // Add entries for the discovered Bluetooth devices
         for (BluetoothDevice bt : devices) {
             final Preference preference = new Preference(themedContext);
@@ -92,11 +89,19 @@ public class AddAccessoryPreferenceFragment extends BaseLeanbackPreferenceFragme
             } else {
                 preference.setSummary(bt.getAddress());
             }
+            preference.setIcon(getDeviceDrawable(bt));
             preference.setKey(bt.getAddress());
             preference.setTitle(bt.getName());
-            preference.setIcon(getDeviceDrawable(bt));
             screen.addPreference(preference);
         }
+        setPreferenceScreen(screen);
+    }
+
+    public void clearList() {
+        PreferenceScreen screen = getPreferenceScreen();
+        if (screen != null) {
+            screen.removeAll();
+        }
     }
 
     private Drawable getDeviceDrawable(BluetoothDevice device) {
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothA2dpConnector.java b/Settings/src/com/android/tv/settings/accessories/BluetoothA2dpConnector.java
index 0d4059638..3c92e92f2 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothA2dpConnector.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothA2dpConnector.java
@@ -51,6 +51,7 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
         public void handleMessage(Message m) {
             switch (m.what) {
                 case MSG_CONNECT_TIMEOUT:
+                    Log.w(TAG, "handleMessage(MSG_CONNECT_TIMEOUT)");
                     failed();
                     break;
                 case MSG_CONNECT:
@@ -60,9 +61,11 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
                     // must set CONNECTION_POLICY_ALLOWED or auto-connection will not
                     // occur, however this setting does not appear to be sticky
                     // across a reboot
+                    Log.i(TAG, "handleMessage(MSG_CONNECT)");
                     mA2dpProfile.setConnectionPolicy(mTarget, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
                     break;
                 default:
+                    Log.d(TAG, "handleMessage(" + m.what + "): unhandled");
                     break;
             }
         }
@@ -101,9 +104,10 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
 
                 if (previousState == BluetoothA2dp.STATE_CONNECTING) {
                     if (state == BluetoothA2dp.STATE_CONNECTED) {
+                        Log.i(TAG, "onReceive(): connected");
                         succeeded();
                     } else if (state == BluetoothA2dp.STATE_DISCONNECTED) {
-                        Log.d(TAG, "Failed to connect");
+                        Log.e(TAG, "onReceive(): Failed to connect");
                         failed();
                     }
 
@@ -115,11 +119,13 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
     };
 
     private void succeeded() {
+        Log.d(TAG, "succeeded()");
         mHandler.removeCallbacksAndMessages(null);
         mOpenConnectionCallback.succeeded();
     }
 
     private void failed() {
+        Log.e(TAG, "failed()");
         mHandler.removeCallbacksAndMessages(null);
         mOpenConnectionCallback.failed();
     }
@@ -129,9 +135,7 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
 
         @Override
         public void onServiceDisconnected(int profile) {
-            if (DEBUG) {
-                Log.d(TAG, "Service disconnected");
-            }
+            Log.d(TAG, "onServiceDisconnected(" + profile + ")");
             unregisterConnectionStateReceiver();
         }
 
@@ -141,9 +145,9 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
                 Log.d(TAG, "Connection made to bluetooth proxy." );
             }
             mA2dpProfile = (BluetoothA2dp) proxy;
-            if (DEBUG) {
-                Log.d(TAG, "Connecting to target: " + mTarget.getAddress());
-            }
+            Log.d(TAG, "onServiceConnected(" + profile
+                    +
+                    ", ...): Connecting to target: " + mTarget.getAddress());
 
             registerConnectionStateReceiver();
             // We initiate SDP because connecting to A2DP before services are discovered leads to
@@ -192,7 +196,7 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
     }
 
     private void registerConnectionStateReceiver() {
-        if (DEBUG) Log.d(TAG, "registerConnectionStateReceiver()");
+        Log.d(TAG, "registerConnectionStateReceiver()");
         IntentFilter filter = new IntentFilter(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(BluetoothDevice.ACTION_UUID);
         mContext.registerReceiver(mConnectionStateReceiver, filter);
@@ -201,7 +205,7 @@ public class BluetoothA2dpConnector implements BluetoothDevicePairer.BluetoothCo
 
     private void unregisterConnectionStateReceiver() {
         if (mConnectionStateReceiverRegistered) {
-            if (DEBUG) Log.d(TAG, "unregisterConnectionStateReceiver()");
+            Log.d(TAG, "unregisterConnectionStateReceiver()");
             mContext.unregisterReceiver(mConnectionStateReceiver);
             mConnectionStateReceiverRegistered = false;
         }
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothDevicesService.java b/Settings/src/com/android/tv/settings/accessories/BluetoothDevicesService.java
index c8ca4fca6..eb56ca432 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothDevicesService.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothDevicesService.java
@@ -134,6 +134,7 @@ public class BluetoothDevicesService extends Service {
                 switch(action) {
                     case BluetoothHidHost.ACTION_CONNECTION_STATE_CHANGED:
                         if (device.getBondState() == BluetoothDevice.BOND_BONDED) {
+                            Log.i(TAG, "bonded " + device);
                             mHandler.post(() -> onDeviceUpdated(device));
                         }
                         break;
@@ -211,6 +212,7 @@ public class BluetoothDevicesService extends Service {
             CachedBluetoothDevice cachedDevice =
                     AccessoryUtils.getCachedBluetoothDevice(this, device);
             if (cachedDevice != null) {
+                Log.i(TAG, "connectDevice: " + device);
                 cachedDevice.connect();
             }
         }
@@ -221,6 +223,7 @@ public class BluetoothDevicesService extends Service {
             CachedBluetoothDevice cachedDevice =
                     AccessoryUtils.getCachedBluetoothDevice(this, device);
             if (cachedDevice != null) {
+                Log.i(TAG, "disconnectDevice: " + device);
                 cachedDevice.disconnect();
             }
         }
@@ -248,16 +251,23 @@ public class BluetoothDevicesService extends Service {
                 text = String.format(resStr, deviceName);
                 Toast.makeText(BluetoothDevicesService.this.getApplicationContext(),
                         text, Toast.LENGTH_SHORT).show();
+                Log.d(TAG, "onA2dpConnectionStateChanged: Connected, toasting: " + text);
                 break;
             case BluetoothProfile.STATE_DISCONNECTED:
                 resStr = getResources().getString(R.string.bluetooth_device_disconnected_toast);
                 text = String.format(resStr, deviceName);
                 Toast.makeText(BluetoothDevicesService.this.getApplicationContext(),
                         text, Toast.LENGTH_SHORT).show();
+                Log.d(TAG, "onA2dpConnectionStateChanged: Disconnected, toasting: " + text);
                 break;
             case BluetoothProfile.STATE_CONNECTING:
+                Log.d(TAG, "onA2dpConnectionStateChanged: Connecting");
+                break;
             case BluetoothProfile.STATE_DISCONNECTING:
+                Log.d(TAG, "onA2dpConnectionStateChanged: Disconnecting");
+                break;
             default:
+                Log.d(TAG, "onA2dpConnectionStateChanged: " + connectionStatus);
                 break;
         }
     }
diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java
index 59b8a926a..6f6e0d252 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java
@@ -16,11 +16,20 @@
 
 package com.android.tv.settings.accessories;
 
+import static android.content.Intent.FLAG_INCLUDE_STOPPED_PACKAGES;
+import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
+import static android.content.Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND;
+
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceProvider.KEY_EXTRAS_DEVICE;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.DIRECTION_BACK;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.EXTRAS_DIRECTION;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.EXTRAS_SLICE_URI;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.notifyDeviceChanged;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.notifyToGoBack;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.setFindMyRemoteButtonEnabled;
 
+import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -36,24 +45,53 @@ public class ConnectedDevicesSliceBroadcastReceiver extends BroadcastReceiver {
 
     private static final String TAG = "ConnectedSliceReceiver";
 
+    static final String ACTION_FIND_MY_REMOTE = "com.google.android.tv.FIND_MY_REMOTE";
     static final String ACTION_TOGGLE_CHANGED =
             "com.android.tv.settings.accessories.TOGGLE_CHANGED";
-    // The extra to specify toggle type. Currently, there is only Bluetooth toggle.
+    // The extra to specify toggle type.
     static final String EXTRA_TOGGLE_TYPE = "TOGGLE_TYPE";
+    static final String EXTRA_TOGGLE_STATE = "TOGGLE_STATE";
     // Bluetooth off is handled differently by ResponseActivity with confirmation dialog.
     static final String BLUETOOTH_ON = "BLUETOOTH_ON";
+    static final String ACTIVE_AUDIO_OUTPUT = "ACTIVE_AUDIO_OUTPUT";
 
     @Override
     public void onReceive(Context context, Intent intent) {
         // Handle CEC control toggle.
         final String action = intent.getAction();
         if (ACTION_TOGGLE_CHANGED.equals(action)) {
-            if (BLUETOOTH_ON.equals(intent.getStringExtra(EXTRA_TOGGLE_TYPE))) {
-                if (AccessoryUtils.getDefaultBluetoothAdapter() != null) {
-                    AccessoryUtils.getDefaultBluetoothAdapter().enable();
+            final boolean isChecked = intent.getBooleanExtra(EXTRA_TOGGLE_STATE, false);
+            final String toggleType = intent.getStringExtra(EXTRA_TOGGLE_TYPE);
+            if (toggleType != null) {
+                switch (toggleType) {
+                    case BLUETOOTH_ON -> {
+                        if (AccessoryUtils.getDefaultBluetoothAdapter() != null) {
+                            AccessoryUtils.getDefaultBluetoothAdapter().enable();
+                        }
+                        return;
+                    }
+                    case ACTIVE_AUDIO_OUTPUT -> {
+                        boolean enable = intent.getBooleanExtra(EXTRA_TOGGLE_STATE, false);
+                        BluetoothDevice device = intent.getParcelableExtra(KEY_EXTRAS_DEVICE,
+                                BluetoothDevice.class);
+                        AccessoryUtils.setActiveAudioOutput(enable ? device : null);
+                        // refresh device
+                        notifyDeviceChanged(context, device);
+                    }
+                    case FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING -> {
+                        setFindMyRemoteButtonEnabled(context, isChecked);
+                        context.getContentResolver().notifyChange(
+                                ConnectedDevicesSliceUtils.FIND_MY_REMOTE_SLICE_URI, null);
+                    }
                 }
-                return;
             }
+        } else if (ACTION_FIND_MY_REMOTE.equals(action)) {
+            context.sendBroadcast(
+                    new Intent(ACTION_FIND_MY_REMOTE)
+                            .putExtra("reason", "SETTINGS")
+                            .setFlags(FLAG_INCLUDE_STOPPED_PACKAGES | FLAG_RECEIVER_FOREGROUND
+                                    | FLAG_RECEIVER_INCLUDE_BACKGROUND),
+                    "com.google.android.tv.permission.FIND_MY_REMOTE");
         }
 
         // Notify TvSettings to go back to the previous level.
diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
index 699119061..99bb6d25f 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
@@ -16,26 +16,37 @@
 
 package com.android.tv.settings.accessories;
 
+
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
+import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
+
 import static com.android.tv.settings.accessories.AddAccessoryActivity.ACTION_CONNECT_INPUT;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceBroadcastReceiver.ACTION_FIND_MY_REMOTE;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceBroadcastReceiver.ACTION_TOGGLE_CHANGED;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceBroadcastReceiver.ACTIVE_AUDIO_OUTPUT;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceBroadcastReceiver.BLUETOOTH_ON;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceBroadcastReceiver.EXTRA_TOGGLE_STATE;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceBroadcastReceiver.EXTRA_TOGGLE_TYPE;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.EXTRAS_SLICE_URI;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING;
+import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.isFindMyRemoteButtonEnabled;
 
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.app.tvsettings.TvSettingsEnums;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.StrictMode;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -51,6 +62,7 @@ import androidx.slice.SliceProvider;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.media.flags.Flags;
 import com.android.tv.settings.R;
 import com.android.tv.twopanelsettings.slices.builders.PreferenceSliceBuilder;
 import com.android.tv.twopanelsettings.slices.builders.PreferenceSliceBuilder.RowBuilder;
@@ -70,7 +82,7 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
     private static final String TAG = "ConnectedDevices";
     private static final boolean DEBUG = false;
     private static final boolean DISCONNECT_PREFERENCE_ENABLED = false;
-
+    private static final int ACTIVE_AUDIO_OUTPUT_INTENT_REQUEST_CODE = 9;
     private final Map<Uri, Integer> mPinnedUris = new ArrayMap<>();
     private final Handler mHandler = new Handler(Looper.getMainLooper());
 
@@ -79,9 +91,10 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
 
     private final BluetoothDeviceProvider mLocalBluetoothDeviceProvider =
             new LocalBluetoothDeviceProvider() {
-        BluetoothDeviceProvider getHostBluetoothDeviceProvider() {
-            return getBluetoothDeviceProvider();
-        }
+                @Override
+                BluetoothDeviceProvider getHostBluetoothDeviceProvider() {
+                    return getBluetoothDeviceProvider();
+                }
     };
 
     private final ServiceConnection mBtDeviceServiceConnection =
@@ -114,6 +127,8 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
     static final String KEY_RENAME = "rename";
     static final String KEY_FORGET = "forget";
     static final String KEY_EXTRAS_DEVICE = "extra_devices";
+    static final String KEY_FIND_MY_REMOTE_TOGGLE = "fmr_toggle";
+    static final String KEY_TOGGLE_ACTIVE_AUDIO_OUTPUT = "toggle_active_audio_output";
 
     static final int YES = R.string.general_action_yes;
     static final int NO = R.string.general_action_no;
@@ -157,10 +172,20 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         if (DEBUG) {
             Log.d(TAG, "onBindSlice: " + sliceUri);
         }
-        if (ConnectedDevicesSliceUtils.isGeneralPath(sliceUri)) {
-            return createGeneralSlice(sliceUri);
-        } else if (ConnectedDevicesSliceUtils.isBluetoothDevicePath(sliceUri)) {
-            return createBluetoothDeviceSlice(sliceUri);
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+        try {
+            // Prevent StrictMode from throwing on access to shared preferences.
+            StrictMode.setThreadPolicy(
+                new StrictMode.ThreadPolicy.Builder(oldPolicy).permitDiskReads().build());
+            if (ConnectedDevicesSliceUtils.isGeneralPath(sliceUri)) {
+                return createGeneralSlice(sliceUri);
+            } else if (ConnectedDevicesSliceUtils.isBluetoothDevicePath(sliceUri)) {
+                return createBluetoothDeviceSlice(sliceUri);
+            } else if (ConnectedDevicesSliceUtils.isFindMyRemotePath(sliceUri)) {
+                return createFindMyRemoteSlice(sliceUri);
+            }
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
         }
         return null;
     }
@@ -207,6 +232,7 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         updatePairingButton(psb);
         updateConnectedDevices(psb);
         updateOfficialRemoteSettings(psb);
+        updateFmr(psb);
         return psb.build();
     }
 
@@ -230,9 +256,40 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
 
         Bundle extras;
         Intent i;
+        // Update "Use for TV audio".
+        // Set as active audio output device only connected devices that have audio capabilities
+        if (Flags.enableTvMediaOutputDialog()
+                && cachedDevice != null && !cachedDevice.isBusy()
+                && AccessoryUtils.isConnected(device) && cachedDevice.isConnected()
+                && AccessoryUtils.isBluetoothHeadset(device)) {
+            boolean isActive = AccessoryUtils.isActiveAudioOutput(device);
+
+            Intent intent = new Intent(ACTION_TOGGLE_CHANGED);
+            intent.setClass(context, ConnectedDevicesSliceBroadcastReceiver.class);
+            intent.putExtra(EXTRA_TOGGLE_TYPE, ACTIVE_AUDIO_OUTPUT);
+            intent.putExtra(EXTRA_TOGGLE_STATE, !isActive);
+            intent.putExtra(KEY_EXTRAS_DEVICE, device);
+
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(context,
+                    ACTIVE_AUDIO_OUTPUT_INTENT_REQUEST_CODE, intent,
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+
+            // Update set/unset active audio output preference
+            RowBuilder activeAudioOutputPref = new RowBuilder()
+                    .setKey(KEY_TOGGLE_ACTIVE_AUDIO_OUTPUT)
+                    .setTitle(getString(R.string.bluetooth_toggle_active_audio_output_title))
+                    .setActionId(
+                            TvSettingsEnums.CONNECTED_SLICE_DEVICE_ENTRY_TOGGLE_ACTIVE_AUDIO_OUTPUT)
+                    .addSwitch(pendingIntent,
+                            context.getText(R.string.bluetooth_toggle_active_audio_output_title),
+                            isActive);
+
+            psb.addPreference(activeAudioOutputPref);
+        }
+
         // Update "connect/disconnect preference"
         if (cachedDevice != null && !cachedDevice.isBusy()) {
-            // Whether the device is actually connected from CachedBluetoothDevice's perceptive.
+            // Whether the device is actually connected from CachedBluetoothDevice's perspective.
             boolean isConnected = AccessoryUtils.isConnected(device) && cachedDevice.isConnected();
 
             if (!isConnected || showDisconnectButton(device, context)) {
@@ -337,7 +394,6 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         RowBuilder infoPref = new RowBuilder()
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_baseline_info_24dp));
 
-        BluetoothDeviceProvider provider = mLocalBluetoothDeviceProvider;
         infoPref.addInfoItem(getString(R.string.bluetooth_serial_number_label), deviceAddr);
         psb.addPreference(infoPref);
         return psb.build();
@@ -489,6 +545,20 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         }
     }
 
+    private void updateFmr(PreferenceSliceBuilder psb) {
+        List<ResolveInfo> receivers = getContext().getPackageManager().queryBroadcastReceivers(
+                new Intent(ACTION_FIND_MY_REMOTE), 0);
+        if (receivers.isEmpty()) {
+            return;
+        }
+
+        psb.addPreference(new RowBuilder()
+                .setKey(KEY_FIND_MY_REMOTE_TOGGLE)
+                .setTitle(getString(R.string.settings_find_my_remote_title))
+                .setSubtitle(getString(R.string.settings_find_my_remote_description))
+                .setTargetSliceUri(ConnectedDevicesSliceUtils.FIND_MY_REMOTE_SLICE_URI.toString()));
+    }
+
     private void createAndAddBtDeviceSlicePreferenceFromSet(
             PreferenceSliceBuilder psb,
             Set<String> addresses,
@@ -582,4 +652,43 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         return !AccessoryUtils.isRemoteClass(device)
                 && !AccessoryUtils.isKnownDevice(context, device);
     }
+
+    private Slice createFindMyRemoteSlice(Uri sliceUri) {
+        Context context = getContext();
+        final PreferenceSliceBuilder psb = new PreferenceSliceBuilder(context, sliceUri);
+        psb.addScreenTitle(new RowBuilder()
+                .setTitle(getString(R.string.settings_find_my_remote_title))
+                .setSubtitle(getString(R.string.find_my_remote_slice_description)));
+
+        if (context.getResources().getBoolean(R.bool.config_find_my_remote_integration_enabled)) {
+            boolean isButtonEnabled = isFindMyRemoteButtonEnabled(context);
+            Intent intent = new Intent(ACTION_TOGGLE_CHANGED);
+            intent.putExtra(EXTRA_TOGGLE_TYPE, FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING);
+            intent.putExtra(EXTRA_TOGGLE_STATE, !isButtonEnabled);
+            intent.setClass(context, ConnectedDevicesSliceBroadcastReceiver.class);
+            psb.addPreference(new RowBuilder()
+                    .setKey(FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING)
+                    .setTitle(getString(R.string.find_my_remote_integration_title))
+                    .setSubtitle(getString(R.string.find_my_remote_integration_hint))
+                    .addSwitch(
+                            PendingIntent.getBroadcast(
+                                    context, 0, intent, FLAG_IMMUTABLE | FLAG_UPDATE_CURRENT),
+                            !isButtonEnabled));
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(
+                context, 0,
+                new Intent(context, ConnectedDevicesSliceBroadcastReceiver.class)
+                        .setAction(ACTION_FIND_MY_REMOTE)
+                        .setFlags(FLAG_RECEIVER_FOREGROUND),
+                FLAG_IMMUTABLE | FLAG_UPDATE_CURRENT);
+
+        psb.addPreference(new RowBuilder()
+                .setKey(ACTION_FIND_MY_REMOTE)
+                .setTitle(getString(R.string.find_my_remote_play_sound))
+                .setPendingIntent(pendingIntent)
+                .setIcon(IconCompat.createWithResource(context, R.drawable.ic_play_arrow))
+                .setIconNeedsToBeProcessed(true));
+        return psb.build();
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceUtils.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceUtils.java
index 939cfdd8e..5723aeff2 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceUtils.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceUtils.java
@@ -16,9 +16,11 @@
 
 package com.android.tv.settings.accessories;
 
+import android.bluetooth.BluetoothDevice;
 import android.content.ContentProviderClient;
 import android.content.Context;
 import android.net.Uri;
+import android.provider.Settings;
 
 import com.android.tv.twopanelsettings.slices.SlicesConstants;
 
@@ -30,11 +32,23 @@ public final class ConnectedDevicesSliceUtils {
     static final String BLUETOOTH_DEVICE_PATH = "device";
     static final String EXTRAS_DIRECTION = "extras_direction";
     static final String EXTRAS_SLICE_URI = "extras_slice_uri";
+    static final String FIND_MY_REMOTE_PATH = "find_my_remote";
     static final String DIRECTION_BACK = "direction_back";
     public static final Uri GENERAL_SLICE_URI =
             Uri.parse("content://" + AUTHORITY + "/" + GENERAL_PATH);
     static final Uri BLUETOOTH_DEVICE_SLICE_URI =
             Uri.parse("content://" + AUTHORITY + "/" + BLUETOOTH_DEVICE_PATH);
+    static final Uri FIND_MY_REMOTE_SLICE_URI =
+            Uri.parse("content://" + AUTHORITY + "/" + FIND_MY_REMOTE_PATH);
+
+    /**
+     * The {@link Settings.Global} integer setting name.
+     *
+     * <p>The settings tells whether the physical button integration for Find My Remote feature
+     * is enabled. Default value: 1.
+     */
+    static final String FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING =
+            "find_my_remote_physical_button_enabled";
 
     static String getDeviceAddr(Uri uri) {
         if (uri.getPathSegments().size() >= 2) {
@@ -51,6 +65,10 @@ public final class ConnectedDevicesSliceUtils {
         return BLUETOOTH_DEVICE_PATH.equals(getFirstSegment(uri));
     }
 
+    static boolean isFindMyRemotePath(Uri uri) {
+        return FIND_MY_REMOTE_PATH.equals(getFirstSegment(uri));
+    }
+
     /** Check if slice provider exists. */
     static boolean isSliceProviderValid(Context context, String uri) {
         if (uri == null) {
@@ -87,7 +105,25 @@ public final class ConnectedDevicesSliceUtils {
         context.getContentResolver().notifyChange(appendedUri, null);
     }
 
+    static void notifyDeviceChanged(Context context, BluetoothDevice device) {
+        if (device != null) {
+            context.getContentResolver().notifyChange(
+                    getDeviceUri(device.getAddress(), device.getAlias()), null);
+        }
+    }
+
     private ConnectedDevicesSliceUtils() {
         // do not allow instantiation
     }
+
+    public static boolean isFindMyRemoteButtonEnabled(Context context) {
+        return Settings.Global.getInt(context.getContentResolver(),
+                FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING, 1) != 0;
+    }
+
+    static void setFindMyRemoteButtonEnabled(Context context, boolean enabled) {
+        Settings.Global.putInt(context.getContentResolver(),
+                FIND_MY_REMOTE_PHYSICAL_BUTTON_ENABLED_SETTING,
+                enabled ? 1 : 0);
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
index 1d746efe0..7b3ee423d 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
@@ -46,7 +46,6 @@ import androidx.preference.PreferenceGroup;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 import com.android.tv.settings.R;
 import com.android.tv.settings.SettingsPreferenceFragment;
-
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
@@ -142,17 +141,22 @@ public class AccountSyncFragment extends SettingsPreferenceFragment implements
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.account_preference, null);
 
-        getPreferenceScreen().setTitle(mAccount.name);
-
-        final Preference removeAccountPref = findPreference(KEY_REMOVE_ACCOUNT);
-        removeAccountPref.setIntent(new Intent(getActivity(), RemoveAccountDialog.class)
-                .putExtra(AccountSyncActivity.EXTRA_ACCOUNT, mAccount.name));
-        removeAccountPref.setOnPreferenceClickListener(
-                preference -> {
-                    logEntrySelected(TvSettingsEnums.ACCOUNT_CLASSIC_REG_ACCOUNT_REMOVE_ACCOUNT);
-                    return false;
-                });
-
+        if (accountExists(mAccount)) {
+            getPreferenceScreen().setTitle(mAccount.name);
+
+            final Preference removeAccountPref = findPreference(KEY_REMOVE_ACCOUNT);
+            removeAccountPref.setIntent(new Intent(getActivity(), RemoveAccountDialog.class)
+                    .putExtra(AccountSyncActivity.EXTRA_ACCOUNT, mAccount.name));
+            removeAccountPref.setOnPreferenceClickListener(
+                    preference -> {
+                        logEntrySelected(
+                                TvSettingsEnums.ACCOUNT_CLASSIC_REG_ACCOUNT_REMOVE_ACCOUNT);
+                        return false;
+                    });
+        } else {
+            // Set a new message on the error screen.
+            getPreferenceScreen().setTitle(R.string.unknown_account);
+        }
         mSyncCategory = (PreferenceGroup) findPreference(KEY_SYNC_ADAPTERS);
     }
 
@@ -262,7 +266,9 @@ public class AccountSyncFragment extends SettingsPreferenceFragment implements
     }
 
     private boolean accountExists(Account account) {
-        if (account == null) return false;
+        if (account == null || account.type == null || account.name == null) {
+            return false;
+        }
 
         Account[] accounts = AccountManager.get(getActivity()).getAccountsByTypeAsUser(
                 account.type, mUserHandle);
@@ -279,18 +285,14 @@ public class AccountSyncFragment extends SettingsPreferenceFragment implements
         if (!isResumed()) {
             return;
         }
-        if (!accountExists(mAccount)) {
-            // The account was deleted
-            if (!getFragmentManager().popBackStackImmediate()) {
-                getActivity().finish();
-            }
-            return;
-        }
-        updateAccountSwitches();
         onSyncStateUpdated();
     }
 
     private void onSyncStateUpdated() {
+        if (!accountExists(mAccount)) {
+            // Error screen doesn't need to be updated.
+            return;
+        }
         // iterate over all the preferences, setting the state properly for each
         final int userId = mUserHandle.getIdentifier();
         List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncsAsUser(userId);
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
index 546cfa07c..e3c0c11eb 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
@@ -31,6 +31,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
@@ -40,6 +41,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.widget.FooterPreference;
 import com.android.tv.settings.R;
 import com.android.tv.settings.SettingsPreferenceFragment;
 import com.android.tv.settings.overlay.FlavorUtils;
@@ -70,6 +72,21 @@ public class AccountsFragment extends SettingsPreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.accounts, null);
+        refreshAllPreferences();
+    }
+
+    private void refreshAllPreferences() {
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+        for (int i = 0; i < prefScreen.getPreferenceCount();) {
+            final Preference preference = prefScreen.getPreference(i);
+            final String key = preference.getKey();
+            if (TextUtils.equals(KEY_ADD_ACCOUNT, key)
+                    || TextUtils.equals(KEY_DEVICE_OWNER_FOOTER, key)) {
+                i++;
+            } else {
+                prefScreen.removePreference(preference);
+            }
+        }
     }
 
     @Override
@@ -160,13 +177,19 @@ public class AccountsFragment extends SettingsPreferenceFragment {
         }
 
         // Show device managed footer information if DO active
-        final Preference footerPref = findPreference(KEY_DEVICE_OWNER_FOOTER);
+        final FooterPreference footerPref = findPreference(KEY_DEVICE_OWNER_FOOTER);
         if (footerPref != null) {
             final CharSequence deviceOwnerDisclosure = FlavorUtils.getFeatureFactory(
                     getContext()).getEnterprisePrivacyFeatureProvider(
                     getContext()).getDeviceOwnerDisclosure();
             footerPref.setTitle(deviceOwnerDisclosure);
             footerPref.setOrder(ORDER_FOOTER);
+            final Context context = getContext();
+            footerPref.setLearnMoreAction(view ->
+                context.startActivity(new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS))
+            );
+            final String learnMoreText = context.getString(R.string.learn_more);
+            footerPref.setLearnMoreText(learnMoreText);
             footerPref.setVisible(deviceOwnerDisclosure != null);
         }
     }
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsUtil.java b/Settings/src/com/android/tv/settings/accounts/AccountsUtil.java
index 9074872f0..39eeda22d 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountsUtil.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountsUtil.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.Log;
 
 import androidx.annotation.IntDef;
 
@@ -50,6 +51,7 @@ public class AccountsUtil {
     public static final int ACCOUNTS_FRAGMENT_RESTRICTED = 4;
 
     private static final String ACTION_ACCOUNTS = "com.android.tv.settings.ACCOUNTS";
+    private static final String TAG = "AccountsUtil";
 
     /**
      *  Get the correct accounts settings fragment based on restrictions and other features.
@@ -61,9 +63,13 @@ public class AccountsUtil {
             return ACCOUNTS_FRAGMENT_RESTRICTED;
         }
 
-        if (FlavorUtils.getFeatureFactory(context).getBasicModeFeatureProvider()
+        try {
+            if (FlavorUtils.getFeatureFactory(context).getBasicModeFeatureProvider()
                 .isBasicMode(context)) {
-            return ACCOUNTS_BASIC_MODE_FRAGMENT;
+                return ACCOUNTS_BASIC_MODE_FRAGMENT;
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Unable to determine basic mode", e);
         }
 
         // If the intent can be handled, use it.
diff --git a/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java b/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
index 8483b35ff..f03cc2bf9 100644
--- a/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
+++ b/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
@@ -24,6 +24,8 @@ import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -31,6 +33,7 @@ import android.util.Log;
 
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.tv.settings.R;
 import com.android.tv.settings.overlay.FlavorUtils;
 
 import java.io.IOException;
@@ -56,13 +59,34 @@ public class AddAccountWithTypeActivity extends FragmentActivity {
                         .getParcelable(AccountManager.KEY_INTENT);
                 if (addAccountIntent == null) {
                     Log.e(TAG, "Failed to retrieve add account intent from authenticator");
-                    setResultAndFinish(Activity.RESULT_CANCELED);
+                    AlertDialog dialog = new AlertDialog.Builder(
+                            AddAccountWithTypeActivity.this)
+                            .setMessage(R.string.add_account_intent_not_available_dialog_message)
+                            .setNegativeButton(android.R.string.ok,
+                                    new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            setResultAndFinish(Activity.RESULT_CANCELED);
+                                        }
+                                    })
+                            .create();
+                    dialog.show();
                 } else {
                     startActivityForResult(new Intent(addAccountIntent), REQUEST_ADD_ACCOUNT);
                 }
             } catch (IOException|AuthenticatorException|OperationCanceledException e) {
                 Log.e(TAG, "Failed to get add account intent: ", e);
-                setResultAndFinish(Activity.RESULT_CANCELED);
+                AlertDialog dialog = new AlertDialog.Builder(AddAccountWithTypeActivity.this)
+                        .setMessage(R.string.add_account_failed_dialog_message)
+                        .setNegativeButton(android.R.string.ok,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        setResultAndFinish(Activity.RESULT_CANCELED);
+                                    }
+                                })
+                        .create();
+                dialog.show();
             }
         }
     };
diff --git a/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java b/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
index b8c84fbff..0820b5740 100644
--- a/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
+++ b/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
@@ -151,7 +151,8 @@ public class AutofillPickerFragment extends SettingsPreferenceFragment {
                 currentPref.setChecked(true);
                 currentPref.clearOtherRadioPreferences(getPreferenceScreen());
                 CharSequence confirmationMessage = Html.fromHtml(getContext().getString(
-                        R.string.autofill_confirmation_message, newPref.getTitle()));
+                        R.string.autofill_confirmation_message,
+                        Html.escapeHtml(newPref.getTitle())));
                 displayAlert(confirmationMessage, (dialog, which) -> {
                     RadioPreference pref = (RadioPreference) findPreference(newKey);
                     if (pref != null) {
diff --git a/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java b/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
index 3b77e2c7a..370e96eb3 100644
--- a/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
@@ -215,7 +215,7 @@ public class AddWifiNetworkActivity extends InstrumentedActivity
                 updateTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
             }
             updateTransaction.replace(R.id.wifi_container, fragment, TAG);
-            updateTransaction.commit();
+            updateTransaction.commitAllowingStateLoss();
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
index f75527580..cb46d3faf 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
 import android.net.EthernetManager;
 import android.net.EthernetManager.InterfaceStateListener;
 import android.net.IpConfiguration;
@@ -40,36 +41,28 @@ import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.UiThread;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
 import com.android.settingslib.utils.ThreadUtils;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.tv.settings.library.network.AccessPoint;
+import com.android.tv.settings.library.network.WifiTracker;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import java.util.Objects;
 
-import android.net.ConnectivityManager.NetworkCallback;
-import android.os.Handler;
-
 /**
  * Listens for changes to the current connectivity status.
  */
-public class ConnectivityListener implements WifiTracker.WifiListener, LifecycleObserver, OnStart,
-        OnStop {
-
+public class ConnectivityListener implements WifiTracker.WifiListener {
     private static final String TAG = "ConnectivityListener";
 
     private final Context mContext;
     private final Listener mListener;
-    private boolean mStarted;
 
     private WifiTracker mWifiTracker;
 
@@ -104,14 +97,6 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
     private final ArrayMap<String, IpConfiguration> mAvailableInterfaces = new ArrayMap<>();
     private final Handler mUiHandler = ThreadUtils.getUiThreadHandler();
 
-    /**
-     * @deprecated use the constructor that provides a {@link Lifecycle} instead
-     */
-    @Deprecated
-    public ConnectivityListener(Context context, Listener listener) {
-        this(context, listener, null);
-    }
-
     public ConnectivityListener(Context context, Listener listener, Lifecycle lifecycle) {
         mContext = context;
         mConnectivityManager = (ConnectivityManager) mContext.getSystemService(
@@ -120,12 +105,20 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         mEthernetManager = mContext.getSystemService(EthernetManager.class);
         mListener = listener;
         if (mWifiManager != null) {
-            if (lifecycle != null) {
-                lifecycle.addObserver(this);
-                mWifiTracker = new WifiTracker(context, this, lifecycle, true, true);
-            } else {
-                mWifiTracker = new WifiTracker(context, this, true, true);
-            }
+            lifecycle.addObserver(new DefaultLifecycleObserver() {
+                @Override
+                public void onStart(LifecycleOwner owner) {
+                    start();
+                }
+
+                @Override
+                public void onStop(@NonNull LifecycleOwner owner) {
+                    stop();
+                }
+            });
+
+            mWifiTracker = new WifiTracker(context, this, lifecycle, mWifiManager,
+                    mConnectivityManager);
         }
         mEthernetListener = (iface, state, role, configuration) -> {
             if (state == EthernetManager.STATE_LINK_UP) {
@@ -141,86 +134,39 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         updateConnectivityStatus();
     }
 
-    /**
-     * Starts {@link ConnectivityListener}.
-     * This should be called only from main thread.
-     * @deprecated not needed when a {@link Lifecycle} is provided
-     */
-    @UiThread
-    @Deprecated
-    public void start() {
-        if (!mStarted && mWifiTracker != null) {
-            mWifiTracker.onStart();
-        }
-        onStart();
-    }
+    private void start() {
+        updateConnectivityStatus();
+        IntentFilter networkIntentFilter = new IntentFilter();
+        networkIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        networkIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
+        networkIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        networkIntentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
 
-    @Override
-    public void onStart() {
-        if (!mStarted) {
-            mStarted = true;
-            updateConnectivityStatus();
-            IntentFilter networkIntentFilter = new IntentFilter();
-            networkIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-            networkIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-            networkIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-            networkIntentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-
-            mContext.registerReceiver(mNetworkReceiver, networkIntentFilter);
-            final TelephonyManager telephonyManager = mContext
-                    .getSystemService(TelephonyManager.class);
-            if (telephonyManager != null) {
-                telephonyManager.listen(mPhoneStateListener,
-                        PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
-            }
-            mConnectivityManager.registerDefaultNetworkCallback(mNetworkCallback, mHandler);
-            if (mEthernetManager != null) {
-                mEthernetManager.addInterfaceStateListener(r -> mUiHandler.post(r),
-                        mEthernetListener);
-            }
+        mContext.registerReceiver(mNetworkReceiver, networkIntentFilter);
+        final TelephonyManager telephonyManager = mContext
+                .getSystemService(TelephonyManager.class);
+        if (telephonyManager != null) {
+            telephonyManager.listen(mPhoneStateListener,
+                    PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
         }
-    }
-
-    /**
-     * Stops {@link ConnectivityListener}.
-     * This should be called only from main thread.
-     * @deprecated not needed when a {@link Lifecycle} is provided
-     */
-    @UiThread
-    @Deprecated
-    public void stop() {
-        if (mStarted && mWifiTracker != null) {
-            mWifiTracker.onStop();
+        mConnectivityManager.registerDefaultNetworkCallback(mNetworkCallback, mHandler);
+        if (mEthernetManager != null) {
+            mEthernetManager.addInterfaceStateListener(r -> mUiHandler.post(r),
+                    mEthernetListener);
         }
-        onStop();
     }
 
-    @Override
-    public void onStop() {
-        if (mStarted) {
-            mStarted = false;
-            mContext.unregisterReceiver(mNetworkReceiver);
-            mWifiListener = null;
-            final TelephonyManager telephonyManager = mContext
-                    .getSystemService(TelephonyManager.class);
-            if (telephonyManager != null) {
-                telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-            }
-            mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-            if (mEthernetManager != null) {
-                mEthernetManager.removeInterfaceStateListener(mEthernetListener);
-            }
+    private void stop() {
+        mContext.unregisterReceiver(mNetworkReceiver);
+        mWifiListener = null;
+        final TelephonyManager telephonyManager = mContext
+                .getSystemService(TelephonyManager.class);
+        if (telephonyManager != null) {
+            telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
         }
-    }
-
-    /**
-     * Causes the background thread to quit.
-     * @deprecated not needed when a {@link Lifecycle} is provided
-     */
-    @Deprecated
-    public void destroy() {
-        if (mWifiTracker != null) {
-            mWifiTracker.onDestroy();
+        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
+        if (mEthernetManager != null) {
+            mEthernetManager.removeInterfaceStateListener(mEthernetListener);
         }
     }
 
@@ -263,12 +209,16 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         return "";
     }
 
-    /** Return whether the connected Wifi supports MAC address randomization. */
+    /**
+     * Return whether the connected Wifi supports MAC address randomization.
+     */
     public boolean isMacAddressRandomizationSupported() {
         return mWifiManager.isConnectedMacRandomizationSupported();
     }
 
-    /** Return whether the MAC address of the currently connected Wifi AP is randomized. */
+    /**
+     * Return whether the MAC address of the currently connected Wifi AP is randomized.
+     */
     public int getWifiMacRandomizationSetting(AccessPoint ap) {
         if (ap == null || ap.getConfig() == null) {
             return WifiConfiguration.RANDOMIZATION_NONE;
@@ -276,12 +226,16 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         return ap.getConfig().macRandomizationSetting;
     }
 
-    /** Return whether the randomized MAC address is used. */
+    /**
+     * Return whether the randomized MAC address is used.
+     */
     public boolean isWifiMacAddressRandomized(AccessPoint ap) {
         return getWifiMacRandomizationSetting(ap) != WifiConfiguration.RANDOMIZATION_NONE;
     }
 
-    /** Apply the setting of whether to use MAC address randimization. */
+    /**
+     * Apply the setting of whether to use MAC address randimization.
+     */
     public void applyMacRandomizationSetting(AccessPoint ap, boolean enable) {
         if (ap != null && ap.getConfig() != null) {
             ap.getConfig().macRandomizationSetting = enable
@@ -525,7 +479,7 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
             if (mLateLp != null) {
                 if (!Objects.equals(mLateLp, lp)) {
                     if ((lp.hasIpv4Address() && !mLateLp.hasIpv4Address())
-                           ||(lp.hasGlobalIpv6Address() && !mLateLp.hasGlobalIpv6Address())) {
+                            || (lp.hasGlobalIpv6Address() && !mLateLp.hasGlobalIpv6Address())) {
                         onIpAddrChanged();
                     }
                 }
@@ -540,6 +494,7 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
 
     /**
      * Get the SSID of current connected network.
+     *
      * @return SSID
      */
     public String getSsid() {
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java b/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
index a47f4ae1c..5814c6b1f 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
@@ -152,7 +152,7 @@ public class EditIpSettingsActivity extends InstrumentedActivity implements
                 updateTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
             }
             updateTransaction.replace(R.id.wifi_container, fragment, TAG);
-            updateTransaction.commit();
+            updateTransaction.commitAllowingStateLoss();
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java b/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
index ee5b29f2b..34adc5c47 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
@@ -149,7 +149,7 @@ public class EditProxySettingsActivity extends InstrumentedActivity implements
                 updateTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
             }
             updateTransaction.replace(R.id.wifi_container, fragment, TAG);
-            updateTransaction.commit();
+            updateTransaction.commitAllowingStateLoss();
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
index 9d3c0c60d..900963789 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
@@ -37,6 +37,7 @@ import android.os.Handler;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.view.View;
 
 import androidx.annotation.Keep;
 import androidx.preference.Preference;
@@ -45,7 +46,7 @@ import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
 
 import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.wifi.AccessPoint;
+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;
@@ -55,9 +56,12 @@ import com.android.tv.settings.util.SliceUtils;
 import com.android.tv.settings.widget.CustomContentDescriptionSwitchPreference;
 import com.android.tv.settings.widget.TvAccessPointPreference;
 import com.android.tv.twopanelsettings.slices.SlicePreference;
+import com.android.wifitrackerlib.WifiEntry;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -215,7 +219,18 @@ public class NetworkFragment extends SettingsPreferenceFragment implements
         }
 
         final UserManager userManager = UserManager.get(getContext());
-        if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)) {
+
+        mAddPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_WIFI);
+        mAddEasyConnectPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_WIFI);
+
+        if (!mAddPref.isDisabledByAdmin()) {
+            mAddPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
+            mAddEasyConnectPref.checkRestrictionAndSetDisabled(
+                    UserManager.DISALLOW_ADD_WIFI_CONFIG);
+        }
+
+        if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)
+                || userManager.hasUserRestriction(UserManager.DISALLOW_ADD_WIFI_CONFIG)) {
             mAddPref.setFragment(null);
             mAddEasyConnectPref.setFragment(null);
 
@@ -252,8 +267,13 @@ public class NetworkFragment extends SettingsPreferenceFragment implements
                 return true;
             case KEY_WIFI_COLLAPSE:
                 final boolean collapse = !mWifiNetworksCategory.isCollapsed();
-                mCollapsePref.setTitle(collapse
+                View collapsePrefView = getListView().getChildAt(mCollapsePref.getOrder());
+                String wifiCollapseTitle = getContext().getString(collapse
                         ? R.string.wifi_setting_see_all : R.string.wifi_setting_see_fewer);
+                mCollapsePref.setTitle(wifiCollapseTitle);
+                if (collapsePrefView != null) {
+                    collapsePrefView.setAccessibilityPaneTitle(wifiCollapseTitle);
+                }
                 mWifiNetworksCategory.setCollapsed(collapse);
                 logEntrySelected(
                         collapse
@@ -396,10 +416,15 @@ public class NetworkFragment extends SettingsPreferenceFragment implements
             if (restrictedPref == null) {
                 pref = new TvAccessPointPreference(accessPoint, themedContext, mUserBadgeCache,
                         false);
+                List<String> userRestrictions = new ArrayList<>();
+                userRestrictions.add(UserManager.DISALLOW_CONFIG_WIFI);
+                userRestrictions.add(UserManager.DISALLOW_ADD_WIFI_CONFIG);
                 restrictedPref = new RestrictedPreferenceAdapter(themedContext, pref,
-                        UserManager.DISALLOW_CONFIG_WIFI);
+                        userRestrictions);
+                restrictedPref.setApSaved(accessPoint.isSaved());
                 accessPoint.setTag(restrictedPref);
             } else {
+                restrictedPref.setApSaved(accessPoint.isSaved());
                 toRemove.remove(restrictedPref.getPreference());
                 pref = restrictedPref.getOriginalPreference();
             }
@@ -418,12 +443,19 @@ public class NetworkFragment extends SettingsPreferenceFragment implements
                             return false;
                         });
             }
-            pref.setVisible(!restrictedPref.isRestricted() || accessPoint.isSaved());
+            pref.setVisible(!restrictedPref.isRestricted(UserManager.DISALLOW_CONFIG_WIFI)
+                    || accessPoint.isSaved());
             pref.setOrder(index++);
+            pref.setSummary(accessPoint.isActive()? R.string.connected : R.string.not_connected);
             restrictedPref.updatePreference();
 
-            // Double-adding is harmless
-            mWifiNetworksCategory.addPreference(restrictedPref.getPreference());
+            Preference restrictedChild = restrictedPref.getPreference();
+            if (restrictedChild.getParent() != null &&
+                restrictedChild.getParent() != mWifiNetworksCategory) {
+                // Remove first if added to parent from old fragment.
+                restrictedChild.getParent().removePreference(restrictedChild);
+            }
+            mWifiNetworksCategory.addPreference(restrictedChild);
         }
 
         for (final Preference preference : toRemove) {
@@ -434,7 +466,7 @@ public class NetworkFragment extends SettingsPreferenceFragment implements
     }
 
     private boolean isCaptivePortal(AccessPoint accessPoint) {
-        if (accessPoint.getDetailedState() != NetworkInfo.DetailedState.CONNECTED) {
+        if (accessPoint.getWifiEntry().getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {
             return false;
         }
         NetworkCapabilities nc = mConnectivityManager.getNetworkCapabilities(
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java b/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java
index e726304d7..aa5585350 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkRequestDialogFragment.java
@@ -49,9 +49,9 @@ import androidx.appcompat.app.AlertDialog;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.ObservableDialogFragment;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.tv.settings.library.network.AccessPoint;
+import com.android.tv.settings.library.network.WifiTracker;
+import com.android.tv.settings.library.network.WifiTrackerFactory;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java b/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
index f35e25620..e7448cc84 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConfigHelper.java
@@ -32,7 +32,7 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.util.WifiSecurityUtil;
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
index dc3011035..3f4705f8e 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
@@ -31,7 +31,7 @@ import androidx.lifecycle.ViewModelProviders;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.wifi.AccessPoint;
+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;
@@ -47,6 +47,7 @@ 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.util.DataBinder;
 
 /**
  * Add a wifi network where we already know the ssid/security; normal post-install settings.
@@ -57,11 +58,15 @@ public class WifiConnectionActivity extends InstrumentedActivity implements
 
     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) {
+        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)
-                .putExtra(EXTRA_WIFI_SSID, result.getSsidStr())
-                .putExtra(EXTRA_WIFI_SECURITY_NAME, security);
+                .putExtras(bundle);
     }
 
     public static Intent createIntent(Context context, AccessPoint result) {
@@ -69,14 +74,6 @@ public class WifiConnectionActivity extends InstrumentedActivity implements
         return createIntent(context, result, security);
     }
 
-    public static Intent createIntent(Context context, WifiConfiguration configuration) {
-        final int security = WifiSecurityUtil.getSecurity(configuration);
-        final String ssid = configuration.getPrintableSsid();
-        return new Intent(context, WifiConnectionActivity.class)
-                .putExtra(EXTRA_WIFI_SSID, ssid)
-                .putExtra(EXTRA_WIFI_SECURITY_NAME, security);
-    }
-
     private WifiConfiguration mConfiguration;
     private int mWifiSecurity;
     private StateMachine mStateMachine;
@@ -199,6 +196,8 @@ public class WifiConnectionActivity extends InstrumentedActivity implements
                     ViewModelProviders.of(this).get(UserChoiceInfo.class);
         userChoiceInfo.setWifiConfiguration(mConfiguration);
         userChoiceInfo.setWifiSecurity(mWifiSecurity);
+        userChoiceInfo.setWifiEntry(DataBinder.getData(
+                getIntent().getExtras().getBinder(EXTRA_WIFI_ENTRY)));
 
         WifiConfiguration.NetworkSelectionStatus networkStatus =
                 mConfiguration.getNetworkSelectionStatus();
@@ -227,7 +226,7 @@ public class WifiConnectionActivity extends InstrumentedActivity implements
                 updateTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
             }
             updateTransaction.replace(R.id.wifi_container, fragment, TAG);
-            updateTransaction.commit();
+            updateTransaction.commitAllowingStateLoss();
         }
     }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
index 92d21c8e6..a7c8f44b1 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
@@ -25,6 +25,7 @@ import android.net.IpConfiguration.ProxySettings;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
@@ -39,9 +40,10 @@ import androidx.preference.Preference;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.settings.library.util.DataBinder;
 
 import java.util.List;
 
@@ -77,19 +79,23 @@ public class WifiDetailsFragment extends SettingsPreferenceFragment
     private ConnectivityListener mConnectivityListener;
     private AccessPoint mAccessPoint;
 
+    private static class AccessPointBinder extends Binder {
+        final AccessPoint accessPoint;
+
+        public AccessPointBinder(AccessPoint accessPoint) {
+            this.accessPoint = accessPoint;
+        }
+    }
+
     public static void prepareArgs(@NonNull Bundle args, AccessPoint accessPoint) {
-        final Bundle apBundle = new Bundle();
-        accessPoint.saveWifiState(apBundle);
-        args.putParcelable(ARG_ACCESS_POINT_STATE, apBundle);
+        args.putBinder(ARG_ACCESS_POINT_STATE, DataBinder.with(accessPoint));
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         mConnectivityListener = new ConnectivityListener(
                 getContext(), this, getSettingsLifecycle());
-
-        mAccessPoint = new AccessPoint(getContext(),
-                getArguments().getBundle(ARG_ACCESS_POINT_STATE));
+        mAccessPoint = DataBinder.getData(getArguments().getBinder(ARG_ACCESS_POINT_STATE));
         super.onCreate(savedInstanceState);
     }
 
@@ -243,7 +249,7 @@ public class WifiDetailsFragment extends SettingsPreferenceFragment
         // For saved Passpoint network, framework doesn't have the field to keep the MAC choice
         // persistently, so Passpoint network will always use the default value so far, which is
         // randomized MAC address, so don't need to modify title.
-        if (mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig()) {
+        if (mAccessPoint.isPasspoint()) {
             return;
         }
         mMacAddressPref.setTitle(
@@ -256,8 +262,7 @@ public class WifiDetailsFragment extends SettingsPreferenceFragment
         mRandomMacPref.setVisible(mConnectivityListener.isMacAddressRandomizationSupported());
         boolean isMacRandomized = mConnectivityListener.isWifiMacAddressRandomized(mAccessPoint);
         mRandomMacPref.setValue(isMacRandomized ? VALUE_MAC_RANDOM : VALUE_MAC_DEVICE);
-        if (mAccessPoint.isEphemeral() || mAccessPoint.isPasspoint()
-                || mAccessPoint.isPasspointConfig()) {
+        if (!mAccessPoint.getWifiEntry().canSetPrivacy()) {
             mRandomMacPref.setSelectable(false);
             mRandomMacPref.setSummary(R.string.mac_address_ephemeral_summary);
         } else {
@@ -285,15 +290,12 @@ public class WifiDetailsFragment extends SettingsPreferenceFragment
         private AccessPoint mAccessPoint;
 
         public static void prepareArgs(@NonNull Bundle args, AccessPoint accessPoint) {
-            final Bundle apBundle = new Bundle();
-            accessPoint.saveWifiState(apBundle);
-            args.putParcelable(ARG_ACCESS_POINT_STATE, apBundle);
+            args.putBinder(ARG_ACCESS_POINT_STATE, DataBinder.with(accessPoint));
         }
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
-            mAccessPoint = new AccessPoint(getContext(),
-                    getArguments().getBundle(ARG_ACCESS_POINT_STATE));
+            mAccessPoint = DataBinder.getData(getArguments().getBinder(ARG_ACCESS_POINT_STATE));
             super.onCreate(savedInstanceState);
         }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java b/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java
index 27a5c89da..5dda3f578 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiUtils.java
@@ -19,7 +19,7 @@ import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.text.TextUtils;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 
 /** Helper class for Wifi configuration. */
 public class 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 c622d9aeb..8065ed79c 100644
--- a/Settings/src/com/android/tv/settings/connectivity/security/WifiSecurityHelper.java
+++ b/Settings/src/com/android/tv/settings/connectivity/security/WifiSecurityHelper.java
@@ -25,7 +25,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.leanback.widget.GuidedAction;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.setup.AdvancedOptionsFlowInfo;
 import com.android.tv.settings.connectivity.setup.UserChoiceInfo;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java b/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java
deleted file mode 100644
index 0ea48b199..000000000
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkState.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 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.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
-
-import com.android.tv.settings.R;
-import com.android.tv.settings.connectivity.WifiConfigHelper;
-import com.android.tv.settings.connectivity.util.State;
-import com.android.tv.settings.connectivity.util.StateMachine;
-import com.android.tv.settings.connectivity.util.WifiSecurityUtil;
-
-/**
- * State responsible for adding page based on network.
- */
-public class AddPageBasedOnNetworkState implements State {
-    private final StateMachine mStateMachine;
-    private final UserChoiceInfo mUserChoiceInfo;
-    private final FragmentActivity mActivity;
-    private Fragment mFragment;
-
-    public AddPageBasedOnNetworkState(FragmentActivity activity) {
-        mActivity = activity;
-        mUserChoiceInfo = ViewModelProviders.of(mActivity).get(UserChoiceInfo.class);
-        mStateMachine = ViewModelProviders.of(mActivity).get(StateMachine.class);
-    }
-
-    @Override
-    public void processForward() {
-        mFragment = null;
-        if (mUserChoiceInfo.choiceChosen(
-                getString(R.string.other_network), UserChoiceInfo.SELECT_WIFI)) {
-            mStateMachine.getListener().onComplete(StateMachine.OTHER_NETWORK);
-        } else {
-            ScanResult scanResult = mUserChoiceInfo.getChosenNetwork();
-            String chosenNetwork = mUserChoiceInfo.getChosenNetwork().SSID;
-            WifiConfiguration prevWifiConfig = mUserChoiceInfo.getWifiConfiguration();
-            if (mUserChoiceInfo.getPageSummary(UserChoiceInfo.PASSWORD) != null
-                    && (prevWifiConfig == null
-                    || !chosenNetwork.equals(prevWifiConfig.getPrintableSsid()))) {
-                mUserChoiceInfo.removePageSummary(UserChoiceInfo.PASSWORD);
-            }
-            int wifiSecurity = WifiSecurityUtil.getSecurity(scanResult);
-            WifiConfiguration wifiConfiguration = WifiConfigHelper.getConfiguration(
-                    mActivity,
-                    scanResult.SSID,
-                    wifiSecurity);
-            mUserChoiceInfo.setWifiSecurity(wifiSecurity);
-            mUserChoiceInfo.setWifiConfiguration(wifiConfiguration);
-            if (WifiConfigHelper.isNetworkSaved(wifiConfiguration)) {
-                mStateMachine.getListener().onComplete(StateMachine.KNOWN_NETWORK);
-            } else {
-                mStateMachine.getListener().onComplete(StateMachine.ADD_START);
-            }
-        }
-    }
-
-    private String getString(int id) {
-        return mActivity.getString(id);
-    }
-
-    @Override
-    public void processBackward() {
-        mStateMachine.back();
-    }
-
-    @Override
-    public Fragment getFragment() {
-        return mFragment;
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java b/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java
index d219581c6..6c57e2fb1 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AddStartState.java
@@ -16,17 +16,12 @@
 
 package com.android.tv.settings.connectivity.setup;
 
-import android.net.wifi.WifiConfiguration;
-import android.text.TextUtils;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.settingslib.wifi.AccessPoint;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
-import com.android.tv.settings.connectivity.util.WifiSecurityUtil;
 
 /**
  * State responsible for starting the network configuration.
@@ -46,17 +41,10 @@ public class AddStartState implements State {
     @Override
     public void processForward() {
         mFragment = null;
-        int wifiSecurity = mUserChoiceInfo.getWifiSecurity();
-        WifiConfiguration configuration = mUserChoiceInfo.getWifiConfiguration();
-        if ((wifiSecurity == AccessPoint.SECURITY_WEP
-                && TextUtils.isEmpty(configuration.wepKeys[0]))
-                || ((!WifiSecurityUtil.isOpen(wifiSecurity) && !WifiSecurityUtil.isEnhancedOpen(wifiSecurity))
-                && wifiSecurity != AccessPoint.SECURITY_WEP
-                && TextUtils.isEmpty(configuration.preSharedKey))) {
-            mStateMachine.getListener().onComplete(StateMachine.PASSWORD);
-        } else {
-            mStateMachine.getListener().onComplete(StateMachine.CONNECT);
-        }
+        mStateMachine.getListener().onComplete(
+                mUserChoiceInfo.getWifiEntry().shouldEditBeforeConnect()
+                        || mUserChoiceInfo.getWifiEntry().needsWifiConfiguration()
+                ? StateMachine.PASSWORD : StateMachine.CONNECT);
     }
 
     @Override
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java
index 476027b98..2765e40df 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ChooseSecurityState.java
@@ -24,7 +24,7 @@ import androidx.leanback.widget.GuidanceStylist;
 import androidx.leanback.widget.GuidedAction;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.security.WifiSecurityHelper;
 import com.android.tv.settings.connectivity.util.State;
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 3542fffac..1959d3ee7 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ConnectState.java
@@ -41,7 +41,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.settingslib.wifi.AccessPoint;
+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;
@@ -126,8 +126,8 @@ public class ConnectState implements State {
         public void onCreate(Bundle icicle) {
             super.onCreate(icicle);
             mUserChoiceInfo = ViewModelProviders.of(getActivity()).get(UserChoiceInfo.class);
-            mConnectivityListener = new ConnectivityListener(getActivity(), null);
-            mConnectivityListener.start();
+            mConnectivityListener = new ConnectivityListener(getActivity(), null,
+                    getLifecycle());
             mConnectivityManager = (ConnectivityManager) getActivity().getSystemService(
                     Context.CONNECTIVITY_SERVICE);
 
@@ -192,8 +192,6 @@ public class ConnectState implements State {
                 mWifiManager.disconnect();
             }
 
-            mConnectivityListener.stop();
-            mConnectivityListener.destroy();
             mHandler.removeMessages(MSG_TIMEOUT);
             super.onDestroy();
         }
@@ -221,15 +219,14 @@ public class ConnectState implements State {
                 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);
-                    } else if (wifiNetworkCapabilities.hasCapability(
-                            NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL)) {
-                        notifyListener(StateMachine.RESULT_CAPTIVE_PORTAL);
                     }
-
                 }
             } else {
                 switch (configuration.getNetworkSelectionStatus()
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java b/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java
deleted file mode 100644
index b3e2eafd0..000000000
--- a/Settings/src/com/android/tv/settings/connectivity/setup/NetworkListInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 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 androidx.lifecycle.ViewModel;
-
-import com.android.settingslib.wifi.WifiTracker;
-
-/**
- * Class that stores the network list info.
- */
-public class NetworkListInfo extends ViewModel {
-    private static final int NETWORK_REFRESH_BUFFER_DURATION = 5000;
-    private WifiTracker mWifiTracker;
-    private boolean mShowSkipNetwork;
-    private long mNextNetworkRefreshTime;
-
-    public boolean isShowSkipNetwork() {
-        return mShowSkipNetwork;
-    }
-
-    public void setShowSkipNetwork(boolean showSkipNetwork) {
-        this.mShowSkipNetwork = showSkipNetwork;
-    }
-
-    public long getNextNetworkRefreshTime() {
-        return mNextNetworkRefreshTime;
-    }
-
-    /**
-     * Update the next network refresh time.
-     */
-    public void updateNextNetworkRefreshTime() {
-        mNextNetworkRefreshTime = System.currentTimeMillis() + NETWORK_REFRESH_BUFFER_DURATION;
-    }
-
-    /**
-     * Initialize the network refresh time to current system time.
-     */
-    public void initNetworkRefreshTime() {
-        mNextNetworkRefreshTime = System.currentTimeMillis();
-    }
-
-    public WifiTracker getWifiTracker() {
-        return mWifiTracker;
-    }
-
-    public void setWifiTracker(WifiTracker wifiTracker) {
-        this.mWifiTracker = wifiTracker;
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java b/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java
index 040699637..db637dd32 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/SelectFromListWizardFragment.java
@@ -44,7 +44,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SortedList;
 import androidx.recyclerview.widget.SortedListAdapterCallback;
 
-import com.android.settingslib.wifi.AccessPoint;
+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.tv.settings.util.AccessibilityHelper;
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java b/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java
deleted file mode 100644
index 8e03fee32..000000000
--- a/Settings/src/com/android/tv/settings/connectivity/setup/SelectWifiState.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (C) 2017 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.wifi.ScanResult;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Pair;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.leanback.widget.GuidanceStylist;
-import androidx.leanback.widget.GuidedAction;
-import androidx.leanback.widget.GuidedActionsStylist;
-import androidx.lifecycle.ViewModelProviders;
-
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.tv.settings.R;
-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 java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * State responsible for selecting Wi-Fi.
- */
-public class SelectWifiState implements State {
-    private Fragment mFragment;
-    private FragmentActivity mActivity;
-
-    public SelectWifiState(FragmentActivity wifiSetupActivity) {
-        mActivity = wifiSetupActivity;
-    }
-
-    @Override
-    public void processForward() {
-        mFragment = new SelectWifiFragment();
-        FragmentChangeListener listener = (FragmentChangeListener) mActivity;
-        if (listener != null) {
-            listener.onFragmentChange(mFragment, true);
-        }
-    }
-
-    @Override
-    public void processBackward() {
-        mFragment = new SelectWifiFragment();
-        FragmentChangeListener listener = (FragmentChangeListener) mActivity;
-        if (listener != null) {
-            listener.onFragmentChange(mFragment, false);
-        }
-    }
-
-    @Override
-    public Fragment getFragment() {
-        return mFragment;
-    }
-
-    /**
-     * Fragment that shows a list of Wi-Fi for users to choose from.
-     */
-    public static class SelectWifiFragment extends WifiConnectivityGuidedStepFragment {
-        private static final int RESULT_NETWORK_SKIPPED = 3;
-        private NetworkListInfo mNetworkListInfo;
-        private StateMachine mStateMachine;
-        private UserChoiceInfo mUserChoiceInfo;
-        private WifiGuidedActionComparator mWifiComparator = new WifiGuidedActionComparator();
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            mNetworkListInfo = ViewModelProviders.of(getActivity())
-                    .get(NetworkListInfo.class);
-            mUserChoiceInfo = ViewModelProviders
-                    .of(getActivity())
-                    .get(UserChoiceInfo.class);
-            mStateMachine = ViewModelProviders
-                    .of(getActivity())
-                    .get(StateMachine.class);
-            super.onCreate(savedInstanceState);
-        }
-
-        void updateNetworkList() {
-            int lastSelectedActionPosition = getSelectedActionPosition();
-            CharSequence lastWifiTitle = null;
-            if (lastSelectedActionPosition != -1) {
-                lastWifiTitle = getActions().get(lastSelectedActionPosition).getTitle();
-            }
-            List<WifiGuidedAction> newWifiActionList = getNetworks();
-            List<GuidedAction> list = new ArrayList<>(newWifiActionList);
-            setActions(list);
-            moveToPosition(lastWifiTitle);
-        }
-
-        private void moveToPosition(CharSequence title) {
-            if (title == null) return;
-            for (int i = 0; i < getActions().size(); i++) {
-                if (TextUtils.equals(getActions().get(i).getTitle(), title)) {
-                    setSelectedActionPosition(i);
-                    break;
-                }
-            }
-        }
-
-        @NonNull
-        @Override
-        public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
-            return new GuidanceStylist.Guidance(
-                    getString(R.string.title_select_wifi_network),
-                    null,
-                    null,
-                    null);
-        }
-
-        @Override
-        public GuidedActionsStylist onCreateActionsStylist() {
-            GuidedActionsStylist guidedActionsStylist = new GuidedActionsStylist() {
-                @Override
-                public void onBindViewHolder(ViewHolder vh, GuidedAction action) {
-                    super.onBindViewHolder(vh, action);
-                    WifiGuidedAction wifiAction = (WifiGuidedAction) action;
-                    boolean hasIconLevel = wifiAction.hasIconLevel();
-                    if (hasIconLevel) {
-                        vh.getIconView().setImageLevel(wifiAction.getIconLevel());
-                    }
-                }
-            };
-            return guidedActionsStylist;
-        }
-
-        @Override
-        public void onCreateActions(@NonNull List<GuidedAction> actions,
-                Bundle savedInstanceState) {
-            actions.addAll(getNetworks());
-        }
-
-        private ArrayList<WifiGuidedAction> getNetworks() {
-            Context context = getActivity();
-            ArrayList<WifiGuidedAction> actions = new ArrayList<>();
-
-            final List<ScanResult> results =
-                    mNetworkListInfo.getWifiTracker().getManager().getScanResults();
-            final HashMap<Pair<String, Integer>, ScanResult> consolidatedScanResults =
-                    new HashMap<>();
-            if (results == null) return new ArrayList<>();
-            for (ScanResult result : results) {
-                if (TextUtils.isEmpty(result.SSID)) {
-                    continue;
-                }
-
-                Pair<String, Integer> key =
-                        new Pair<>(result.SSID, WifiSecurityUtil.getSecurity(result));
-                ScanResult existing = consolidatedScanResults.get(key);
-                if (existing == null || existing.level < result.level) {
-                    consolidatedScanResults.put(key, result);
-                }
-            }
-            for (ScanResult result : consolidatedScanResults.values()) {
-                int iconResource = AccessPoint.SECURITY_NONE == WifiSecurityUtil.getSecurity(result)
-                        ? R.drawable.setup_wifi_signal_open
-                        : R.drawable.setup_wifi_signal_lock;
-                actions.add(new WifiGuidedAction.Builder(context)
-                        .title(result.SSID)
-                        .icon(iconResource)
-                        .setHasIconLevel(true)
-                        .setIconLevel(WifiManager.calculateSignalLevel(result.level, 4))
-                        .setScanResult(result)
-                        .build());
-            }
-
-            actions.sort(mWifiComparator);
-
-            if (mNetworkListInfo.isShowSkipNetwork()) {
-                actions.add(new WifiGuidedAction.Builder(context)
-                        .title(R.string.skip_network)
-                        .id(GuidedAction.ACTION_ID_CANCEL)
-                        .icon(R.drawable.ic_arrow_forward)
-                        .setHasIconLevel(false)
-                        .build());
-            }
-
-            actions.add(new WifiGuidedAction.Builder(context)
-                    .title(R.string.other_network)
-                    .icon(R.drawable.ic_wifi_add)
-                    .setHasIconLevel(false)
-                    .build());
-
-            return actions;
-        }
-
-        @Override
-        public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            CharSequence title = mUserChoiceInfo.getPageSummary(UserChoiceInfo.SELECT_WIFI);
-            if (title != null) {
-                moveToPosition(title);
-            }
-        }
-
-        @Override
-        public void onGuidedActionFocused(GuidedAction action) {
-            mNetworkListInfo.updateNextNetworkRefreshTime();
-        }
-
-        @Override
-        public void onGuidedActionClicked(GuidedAction action) {
-            if (action.getId() == GuidedAction.ACTION_ID_CANCEL) {
-                mStateMachine.finish(RESULT_NETWORK_SKIPPED);
-            } else {
-                mUserChoiceInfo.put(UserChoiceInfo.SELECT_WIFI, action.getTitle().toString());
-                mUserChoiceInfo.setChosenNetwork(((WifiGuidedAction) action).getScanResult());
-
-                mStateMachine.getListener().onComplete(
-                        StateMachine.ADD_PAGE_BASED_ON_NETWORK_CHOICE);
-            }
-        }
-
-        private static class WifiGuidedActionComparator implements Comparator<WifiGuidedAction> {
-            @Override
-            public int compare(WifiGuidedAction o1, WifiGuidedAction o2) {
-                int levelDiff = o2.getIconLevel() - o1.getIconLevel();
-                if (levelDiff != 0) {
-                    return levelDiff;
-                }
-                return o1.getTitle().toString().compareTo(o2.getTitle().toString());
-            }
-        }
-
-        private static class WifiGuidedAction extends GuidedAction {
-            ScanResult mScanResult;
-            int mIconLevel;
-            boolean mHasIconLevel;
-
-            ScanResult getScanResult() {
-                return mScanResult;
-            }
-
-            void setScanResult(ScanResult scanResult) {
-                this.mScanResult = scanResult;
-            }
-
-            int getIconLevel() {
-                return mIconLevel;
-            }
-
-            void setIconLevel(int iconLevel) {
-                this.mIconLevel = iconLevel;
-            }
-
-            void setHasIconLevel(boolean hasIconLevel) {
-                this.mHasIconLevel = hasIconLevel;
-            }
-
-            boolean hasIconLevel() {
-                return mHasIconLevel;
-            }
-
-            static class Builder extends BuilderBase<Builder> {
-                ScanResult mScanResult;
-                int mIconLevel;
-                boolean mHasIconLevel;
-
-                private Builder(Context context) {
-                    super(context);
-                }
-
-                Builder setScanResult(ScanResult scanResult) {
-                    this.mScanResult = scanResult;
-                    return this;
-                }
-
-                Builder setIconLevel(int iconLevel) {
-                    this.mIconLevel = iconLevel;
-                    return this;
-                }
-
-                Builder setHasIconLevel(boolean hasIconLevel) {
-                    this.mHasIconLevel = hasIconLevel;
-                    return this;
-                }
-
-                SelectWifiState.SelectWifiFragment.WifiGuidedAction build() {
-                    SelectWifiState.SelectWifiFragment.WifiGuidedAction
-
-                            action = new SelectWifiState.SelectWifiFragment.WifiGuidedAction();
-                    action.setScanResult(mScanResult);
-                    action.setHasIconLevel(mHasIconLevel);
-                    action.setIconLevel(mIconLevel);
-                    applyValues(action);
-                    return action;
-                }
-            }
-        }
-    }
-}
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 5f447bef9..5cac0cacf 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/UserChoiceInfo.java
@@ -24,6 +24,8 @@ import android.util.ArrayMap;
 import androidx.annotation.IntDef;
 import androidx.lifecycle.ViewModel;
 
+import com.android.wifitrackerlib.WifiEntry;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
@@ -51,9 +53,10 @@ public class UserChoiceInfo extends ViewModel {
     private int mWifiSecurity;
     private ScanResult mChosenNetwork;
     private String mConnectedNetwork;
-    private boolean mIsPasswordHidden = false;
+    private boolean mIsPasswordHidden = true;
     private ConnectionFailedStatus mConnectionFailedStatus;
     private int mEasyConnectNetworkId = -1;
+    private WifiEntry wifiEntry;
 
     /**
      * Store the page summary into a HashMap.
@@ -142,7 +145,7 @@ public class UserChoiceInfo extends ViewModel {
 
     /**
      * Get WifiSecurity category. The category value is defined in
-     * {@link com.android.settingslib.wifi.AccessPoint}
+     * {@link com.android.tv.settings.library.network.AccessPoint}
      */
     public int getWifiSecurity() {
         return mWifiSecurity;
@@ -152,7 +155,7 @@ public class UserChoiceInfo extends ViewModel {
      * Set WifiSecurity
      *
      * @param wifiSecurity WifiSecurity category defined in
-     *                     {@link com.android.settingslib.wifi.AccessPoint}.
+     *                     {@link com.android.tv.settings.library.network.AccessPoint}.
      */
     public void setWifiSecurity(int wifiSecurity) {
         this.mWifiSecurity = wifiSecurity;
@@ -202,6 +205,14 @@ public class UserChoiceInfo extends ViewModel {
         mConnectionFailedStatus = status;
     }
 
+    public WifiEntry getWifiEntry() {
+        return wifiEntry;
+    }
+
+    public void setWifiEntry(WifiEntry wifiEntry) {
+        this.wifiEntry = wifiEntry;
+    }
+
     /**
      * Initialize all the information.
      */
@@ -211,7 +222,7 @@ public class UserChoiceInfo extends ViewModel {
         mWifiSecurity = 0;
         mChosenNetwork = null;
         mChosenNetwork = null;
-        mIsPasswordHidden = false;
+        mIsPasswordHidden = true;
     }
 
     public void setVisible(@PAGE int page, boolean visible) {
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java b/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
deleted file mode 100644
index 05f41aa18..000000000
--- a/Settings/src/com/android/tv/settings/connectivity/setup/WifiSetupActivity.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (C) 2017 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.animation.Animator;
-import android.animation.AnimatorInflater;
-import android.animation.ObjectAnimator;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.ViewModelProviders;
-
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.tv.settings.R;
-import com.android.tv.settings.connectivity.util.State;
-import com.android.tv.settings.connectivity.util.StateMachine;
-import com.android.tv.settings.util.ThemeHelper;
-import com.android.tv.settings.util.TransitionUtils;
-
-/**
- * Wi-Fi settings during initial setup for a large no-touch device.
- */
-public class WifiSetupActivity extends FragmentActivity implements State.FragmentChangeListener {
-    private static final String TAG = "WifiSetupActivity";
-    private static final String EXTRA_SHOW_SUMMARY = "extra_show_summary";
-    private static final String EXTRA_SHOW_SKIP_NETWORK = "extra_show_skip_network";
-    private static final String EXTRA_MOVING_FORWARD = "movingForward";
-
-    private boolean mShowFirstFragmentForwards;
-    private boolean mResultOk = false;
-    private final StateMachine.Callback mStateMachineCallback = new StateMachine.Callback() {
-        @Override
-        public void onFinish(int result) {
-            // Setting user_initiated allows TV Setup to identify crashes.
-            //   -- a RESULT_CANCELLED result without user_initiated gets interpreted as a crash.
-            //   -- a RESULT_CANCELLED result with user_initiated gets interpreted as a back-out.
-            setResult(result, new Intent().putExtra("user_initiated", true));
-            mResultOk = result == Activity.RESULT_OK;
-            finish();
-        }
-    };
-    private WifiTracker mWifiTracker;
-    private NetworkListInfo mNetworkListInfo;
-    private UserChoiceInfo mUserChoiceInfo;
-    private StateMachine mStateMachine;
-    private State mChooseSecurityState;
-    private State mConnectFailedState;
-    private State mConnectState;
-    private State mEnterPasswordState;
-    private State mEnterSsidState;
-    private State mKnownNetworkState;
-    private State mSelectWifiState;
-    private State mSuccessState;
-    private State mSummaryConnectedNonWifiState;
-    private State mSummaryConnectedWifiState;
-    private State mSummaryNotConnectedState;
-    private State mOptionsOrConnectState;
-    private State mAddPageBasedOnNetworkChoiceState;
-    private State mAddStartState;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        final UserManager userManager = UserManager.get(this);
-        if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)) {
-            EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(this,
-                    UserManager.DISALLOW_CONFIG_WIFI, UserHandle.myUserId());
-            if (admin != null) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(this, admin);
-            }
-            doFinish();
-            return;
-        }
-
-        setContentView(R.layout.wifi_container);
-        // fade in
-        ObjectAnimator animator = TransitionUtils.createActivityFadeInAnimator(getResources(),
-                true);
-        animator.setTarget(findViewById(R.id.wifi_container));
-        animator.start();
-
-        mStateMachine = ViewModelProviders.of(this).get(StateMachine.class);
-        mStateMachine.setCallback(mStateMachineCallback);
-        mNetworkListInfo = ViewModelProviders.of(this).get(NetworkListInfo.class);
-        mNetworkListInfo.initNetworkRefreshTime();
-        mUserChoiceInfo = ViewModelProviders.of(this).get(UserChoiceInfo.class);
-
-        WifiTracker.WifiListener wifiListener = new WifiTracker.WifiListener() {
-            @Override
-            public void onWifiStateChanged(int state) {
-
-            }
-
-            @Override
-            public void onConnectedChanged() {
-
-            }
-
-            @Override
-            public void onAccessPointsChanged() {
-                long currentTime = System.currentTimeMillis();
-                if (mStateMachine.getCurrentState() == mSelectWifiState
-                        && currentTime >= mNetworkListInfo.getNextNetworkRefreshTime()) {
-                    ((SelectWifiState.SelectWifiFragment) mSelectWifiState.getFragment())
-                            .updateNetworkList();
-                    mNetworkListInfo.updateNextNetworkRefreshTime();
-                }
-            }
-        };
-        mWifiTracker = new WifiTracker(this, wifiListener, true, true);
-        mNetworkListInfo.setWifiTracker(mWifiTracker);
-        boolean showSummary = getIntent().getBooleanExtra(EXTRA_SHOW_SUMMARY, false);
-        mNetworkListInfo.setShowSkipNetwork(
-                getIntent().getBooleanExtra(EXTRA_SHOW_SKIP_NETWORK, false));
-
-        // If we are not moving forwards during the setup flow, we need to show the first fragment
-        // with the reverse animation.
-        mShowFirstFragmentForwards = getIntent().getBooleanExtra(EXTRA_MOVING_FORWARD, true);
-
-        mKnownNetworkState = new KnownNetworkState(this);
-        mSelectWifiState = new SelectWifiState(this);
-        mEnterSsidState = new EnterSsidState(this);
-        mChooseSecurityState = new ChooseSecurityState(this);
-        mEnterPasswordState = new EnterPasswordState(this);
-        mConnectState = new ConnectState(this);
-        mConnectFailedState = new ConnectFailedState(this);
-        mSuccessState = new SuccessState(this);
-        mOptionsOrConnectState = new OptionsOrConnectState(this);
-        mAddPageBasedOnNetworkChoiceState = new AddPageBasedOnNetworkState(this);
-        mAddStartState = new AddStartState(this);
-        mSelectWifiState = new SelectWifiState(this);
-
-        if (showSummary) {
-            addSummaryState();
-        } else {
-            mStateMachine.setStartState(mSelectWifiState);
-        }
-
-        AdvancedWifiOptionsFlow.createFlow(this, true, false, null,
-                mOptionsOrConnectState, mConnectState, AdvancedWifiOptionsFlow.START_DEFAULT_PAGE);
-
-        // Define the transition between different states.
-        /* KnownNetwork */
-        mStateMachine.addState(
-                mKnownNetworkState,
-                StateMachine.ADD_START,
-                mAddStartState);
-        mStateMachine.addState(
-                mKnownNetworkState,
-                StateMachine.SELECT_WIFI,
-                mSelectWifiState);
-
-        /* Add start page */
-        mStateMachine.addState(
-                mAddStartState,
-                StateMachine.PASSWORD,
-                mEnterPasswordState);
-        mStateMachine.addState(
-                mAddStartState,
-                StateMachine.CONNECT,
-                mConnectState);
-
-        /* Select Wi-Fi */
-        mStateMachine.addState(
-                mSelectWifiState,
-                StateMachine.ADD_PAGE_BASED_ON_NETWORK_CHOICE,
-                mAddPageBasedOnNetworkChoiceState);
-
-        /* Add page based on network choice*/
-        mStateMachine.addState(
-                mAddPageBasedOnNetworkChoiceState,
-                StateMachine.OTHER_NETWORK,
-                mEnterSsidState);
-        mStateMachine.addState(
-                mAddPageBasedOnNetworkChoiceState,
-                StateMachine.KNOWN_NETWORK,
-                mKnownNetworkState);
-        mStateMachine.addState(
-                mAddPageBasedOnNetworkChoiceState,
-                StateMachine.ADD_START,
-                mAddStartState);
-
-        /* Enter SSID */
-        mStateMachine.addState(
-                mEnterSsidState,
-                StateMachine.CONTINUE,
-                mChooseSecurityState);
-
-        /* Choose Security */
-        mStateMachine.addState(
-                mChooseSecurityState,
-                StateMachine.OPTIONS_OR_CONNECT,
-                mOptionsOrConnectState);
-        mStateMachine.addState(
-                mChooseSecurityState,
-                StateMachine.PASSWORD,
-                mEnterPasswordState);
-
-        /* Enter Password */
-        mStateMachine.addState(
-                mEnterPasswordState,
-                StateMachine.OPTIONS_OR_CONNECT,
-                mOptionsOrConnectState);
-
-        /* Options or Connect */
-        mStateMachine.addState(
-                mOptionsOrConnectState,
-                StateMachine.CONNECT,
-                mConnectState
-        );
-        mStateMachine.addState(
-                mOptionsOrConnectState,
-                StateMachine.RESTART,
-                mEnterSsidState);
-
-        /* Connect */
-        mStateMachine.addState(
-                mConnectState,
-                StateMachine.RESULT_FAILURE,
-                mConnectFailedState);
-        mStateMachine.addState(
-                mConnectState,
-                StateMachine.RESULT_SUCCESS,
-                mSuccessState);
-
-        /* Connect Failed */
-        mStateMachine.addState(
-                mConnectFailedState,
-                StateMachine.TRY_AGAIN,
-                mOptionsOrConnectState
-        );
-        mStateMachine.addState(
-                mConnectFailedState,
-                StateMachine.SELECT_WIFI,
-                mSelectWifiState
-        );
-
-        /* Summary Not Connected */
-        mStateMachine.addState(
-                mSummaryNotConnectedState,
-                StateMachine.SELECT_WIFI,
-                mSelectWifiState);
-
-        /* Summary Connected */
-        mStateMachine.addState(
-                mSummaryConnectedWifiState,
-                StateMachine.SELECT_WIFI,
-                mSelectWifiState);
-
-        mStateMachine.start(mShowFirstFragmentForwards);
-    }
-
-    @Override
-    public void onBackPressed() {
-        mStateMachine.back();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mWifiTracker != null) {
-            mWifiTracker.onStart();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mWifiTracker != null) {
-            mWifiTracker.onStop();
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mWifiTracker != null) {
-            mWifiTracker.onDestroy();
-        }
-    }
-
-    @Override
-    public void finish() {
-        Animator animator;
-
-        // Choose finish animation based on whether we are in Setup or Settings and really
-        // finish this activity when the animation is complete.
-        if (ThemeHelper.fromSetupWizard(getIntent())) {
-            animator = mResultOk
-                    ? AnimatorInflater.loadAnimator(this, R.anim.setup_fragment_open_out)
-                    : AnimatorInflater.loadAnimator(this, R.anim.setup_fragment_close_out);
-        } else {
-            animator = TransitionUtils.createActivityFadeOutAnimator(getResources(), true);
-        }
-
-        animator.setTarget(findViewById(R.id.wifi_container));
-        animator.addListener(new Animator.AnimatorListener() {
-
-            @Override
-            public void onAnimationStart(Animator animation) {
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                doFinish();
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-            }
-        });
-        animator.start();
-    }
-
-    private void doFinish() {
-        super.finish();
-    }
-
-    private void addSummaryState() {
-        ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-        NetworkInfo currentConnection = connectivityManager.getActiveNetworkInfo();
-        boolean isConnected = (currentConnection != null) && currentConnection.isConnected();
-        mSummaryConnectedWifiState = new SummaryConnectedWifiState(this);
-        mSummaryConnectedNonWifiState = new SummaryConnectedNonWifiState(this);
-        mSummaryNotConnectedState = new SummaryNotConnectedState(this);
-
-        if (isConnected) {
-            if (currentConnection.getType() == ConnectivityManager.TYPE_WIFI) {
-                WifiInfo currentWifiConnection = mWifiTracker.getManager().getConnectionInfo();
-                String connectedNetwork = WifiInfo.sanitizeSsid(
-                        currentWifiConnection.getSSID());
-                if (connectedNetwork == null) {
-                    connectedNetwork = getString(R.string.wifi_summary_unknown_network);
-                }
-                mUserChoiceInfo.setConnectedNetwork(connectedNetwork);
-                mStateMachine.setStartState(mSummaryConnectedWifiState);
-            } else {
-                mStateMachine.setStartState(mSummaryConnectedNonWifiState);
-            }
-        } else {
-            mStateMachine.setStartState(mSummaryNotConnectedState);
-        }
-    }
-
-    private void updateView(Fragment fragment, boolean movingForward) {
-        if (fragment != null) {
-            FragmentTransaction updateTransaction = getSupportFragmentManager().beginTransaction();
-            if (movingForward) {
-                updateTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
-            } else {
-                updateTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE);
-            }
-            updateTransaction.replace(R.id.wifi_container, fragment, TAG);
-            updateTransaction.commit();
-        }
-        // TODO: Add accessiblity titles
-    }
-
-    @Override
-    public void onFragmentChange(Fragment newFragment, boolean movingForward) {
-        updateView(newFragment, movingForward);
-    }
-}
diff --git a/Settings/src/com/android/tv/settings/connectivity/util/WifiSecurityUtil.java b/Settings/src/com/android/tv/settings/connectivity/util/WifiSecurityUtil.java
index 3127dd2ca..f800879fa 100644
--- a/Settings/src/com/android/tv/settings/connectivity/util/WifiSecurityUtil.java
+++ b/Settings/src/com/android/tv/settings/connectivity/util/WifiSecurityUtil.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 
 /**
diff --git a/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java b/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java
index 87d732308..8dc313cb4 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ClearCachePreference.java
@@ -21,14 +21,17 @@ import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected
 import android.app.tvsettings.TvSettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.format.Formatter;
 
 import androidx.annotation.NonNull;
 import androidx.leanback.widget.GuidanceStylist;
 
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.tv.settings.R;
-
 public class ClearCachePreference extends AppActionPreference {
     private boolean mClearingCache;
 
@@ -37,6 +40,18 @@ public class ClearCachePreference extends AppActionPreference {
 
         refresh();
         ConfirmationFragment.prepareArgs(getExtras(), mEntry.info.packageName);
+
+        UserManager userManager = getContext().getSystemService(UserManager.class);
+        if (userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL)) {
+            final RestrictedLockUtils.EnforcedAdmin admin =
+                    RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
+                            UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
+            if (admin != null) {
+                setDisabledByAdmin(admin);
+            } else {
+                setEnabled(false);
+            }
+        }
     }
 
     public void refresh() {
diff --git a/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java b/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java
index 144db0c32..7c0a349a4 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ClearDataPreference.java
@@ -21,11 +21,15 @@ import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected
 import android.app.tvsettings.TvSettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.format.Formatter;
 
 import androidx.annotation.NonNull;
 import androidx.leanback.widget.GuidanceStylist;
 
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.tv.settings.R;
 
@@ -37,6 +41,17 @@ public class ClearDataPreference extends AppActionPreference {
 
         refresh();
         ConfirmationFragment.prepareArgs(getExtras(), mEntry.info.packageName);
+        UserManager userManager = getContext().getSystemService(UserManager.class);
+        if (userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL)) {
+            final RestrictedLockUtils.EnforcedAdmin admin =
+                    RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
+                            UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
+            if (admin != null) {
+                setDisabledByAdmin(admin);
+            } else {
+                setEnabled(false);
+            }
+        }
     }
 
     public void refresh() {
diff --git a/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java b/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java
index a2f6aa6ac..db97a75b5 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ClearDefaultsPreference.java
@@ -27,14 +27,16 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.os.UserManager;
 
 import androidx.annotation.NonNull;
 import androidx.leanback.widget.GuidanceStylist;
 
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.tv.settings.R;
-
 public class ClearDefaultsPreference extends AppActionPreference {
     private final IUsbManager mUsbManager;
     private final PackageManager mPackageManager;
@@ -48,6 +50,18 @@ public class ClearDefaultsPreference extends AppActionPreference {
 
         refresh();
         ConfirmationFragment.prepareArgs(getExtras(), mEntry.info.packageName);
+        UserManager userManager = getContext().getSystemService(UserManager.class);
+        if (userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL)) {
+            final RestrictedLockUtils.EnforcedAdmin admin =
+                    RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
+                            UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
+            if (admin != null) {
+                setDisabledByAdmin(admin);
+            } else {
+                setEnabled(false);
+            }
+        }
+
     }
 
     public void refresh() {
diff --git a/Settings/src/com/android/tv/settings/device/apps/ConfirmationActivity.java b/Settings/src/com/android/tv/settings/device/apps/ConfirmationActivity.java
index 6de5287dc..7fe71869c 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ConfirmationActivity.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ConfirmationActivity.java
@@ -26,6 +26,7 @@ import androidx.leanback.widget.GuidanceStylist;
 import androidx.leanback.widget.GuidedAction;
 
 import com.android.tv.settings.util.GuidedActionsAlignUtil;
+import com.android.tv.settings.util.SafeIntents;
 
 import java.util.List;
 
@@ -94,12 +95,13 @@ public class ConfirmationActivity extends FragmentActivity {
 
         @Override
         public void onGuidedActionClicked(GuidedAction action) {
+            Intent sanitizedIntent = SafeIntents.forCallback(mIntent);
             switch ((int) action.getId()) {
                 case ID_OK:
-                    getActivity().setResult(RESULT_OK, mIntent);
+                    getActivity().setResult(RESULT_OK, sanitizedIntent);
                     break;
                 case ID_CANCEL:
-                    getActivity().setResult(RESULT_CANCELED, mIntent);
+                    getActivity().setResult(RESULT_CANCELED, sanitizedIntent);
                     break;
             }
             getActivity().finish();
diff --git a/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java b/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
index 47c7bb61d..ce6e88edd 100644
--- a/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
+++ b/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
@@ -86,7 +86,7 @@ public class MoveAppActivity extends FragmentActivity implements MoveAppStepFrag
             final Fragment fragment = MoveAppStepFragment.newInstance(packageName, packageDesc);
             getSupportFragmentManager().beginTransaction()
                     .add(android.R.id.content, fragment)
-                    .commit();
+                    .commitAllowingStateLoss();
         }
     }
 
@@ -118,7 +118,7 @@ public class MoveAppActivity extends FragmentActivity implements MoveAppStepFrag
 
         getSupportFragmentManager().beginTransaction()
                 .replace(android.R.id.content, fragment)
-                .commit();
+                .commitAllowingStateLoss();
     }
 
 }
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java
index 6cac531af..97a2f11bd 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ManageApplicationsController.java
@@ -29,7 +29,9 @@ import com.android.settingslib.applications.ApplicationsState;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * A class to manage a list of apps in a {@link PreferenceGroup}. The list is configured by passing
@@ -121,7 +123,14 @@ public class ManageApplicationsController implements LifecycleObserver {
         }
     }
 
-    private void updateAppList(ArrayList<ApplicationsState.AppEntry> apps) {
+    private void updateAppList(List<ApplicationsState.AppEntry> appsWithDuplicates) {
+        List<ApplicationsState.AppEntry> apps = appsWithDuplicates
+                .stream()
+                .collect(Collectors.toMap(app ->
+                        app.info.packageName, app -> app, (v1, v2) -> v1, LinkedHashMap::new))
+                .values()
+                .stream()
+                .toList();
         mApps = apps;
         PreferenceGroup group = mCallback.getAppPreferenceGroup();
         final List<Preference> newList = new ArrayList<>(apps.size() + 1);
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/TurnScreenOn.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/TurnScreenOn.java
index 1cf6cb6ac..d3d69e296 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/TurnScreenOn.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/TurnScreenOn.java
@@ -65,11 +65,6 @@ public class TurnScreenOn extends ManageAppOp {
         updateAppList();
     }
 
-    private boolean hasTurnScreenOnPermission(ApplicationInfo appInfo) {
-        return getContext().getPackageManager().checkPermission(Manifest.permission.TURN_SCREEN_ON,
-                appInfo.packageName) == PackageManager.PERMISSION_GRANTED;
-    }
-
     @NonNull
     @Override
     public Preference bindPreference(@NonNull Preference preference,
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java b/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java
index 7bc732de6..8e0e612bd 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java
@@ -23,10 +23,13 @@ import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected
 
 import android.app.AlertDialog;
 import android.app.tvsettings.TvSettingsEnums;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.text.format.DateUtils;
+import android.util.Log;
 
 import androidx.annotation.Keep;
 import androidx.preference.ListPreference;
@@ -46,27 +49,30 @@ public class EnergySaverFragment extends SettingsPreferenceFragment implements
     private static final String TAG = "EnergySaverFragment";
     private static final String KEY_SLEEP_TIME = "sleepTime";
     private static final String KEY_ATTENTIVE_TIME = "attentiveTime";
+
+    private static final String SHARED_PREFS_NAME = "energy_saver";
+    private static final String PREF_RESET_ATTENTIVE_TIMEOUT = "reset_attentive_timeout";
+
     private static final int DEFAULT_SLEEP_TIME_MS = (int) (20 * DateUtils.MINUTE_IN_MILLIS);
-    private static final int DEFAULT_ATTENTIVE_TIME_MS = (int) (4 * DateUtils.HOUR_IN_MILLIS);
     private static final int WARNING_THRESHOLD_SLEEP_TIME_MS =
             (int) (20 * DateUtils.MINUTE_IN_MILLIS);
     private static final int WARNING_THRESHOLD_ATTENTIVE_TIME_MS =
             (int) (4 * DateUtils.HOUR_IN_MILLIS);
+
     private ListPreference mSleepTimePref;
     private ListPreference mAttentiveTimePref;
     private RestrictedPreferenceAdapter<ListPreference> mRestrictedSleepTime;
     private RestrictedPreferenceAdapter<ListPreference> mRestrictedAttentiveTime;
+    private int mDefaultAttentiveTimeoutConfig;
 
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
         setPreferencesFromResource(R.xml.energy_saver, null);
+
+        mDefaultAttentiveTimeoutConfig = getResources()
+            .getInteger(com.android.internal.R.integer.config_attentiveTimeout);
+
         mSleepTimePref = findPreference(KEY_SLEEP_TIME);
-        mAttentiveTimePref = findPreference(KEY_ATTENTIVE_TIME);
-        int validatedAttentiveSleepTime = getValidatedTimeout(getAttentiveSleepTime(), false);
-        mAttentiveTimePref.setValue(String.valueOf(validatedAttentiveSleepTime));
-        if (getAttentiveSleepTime() != validatedAttentiveSleepTime) {
-            setAttentiveSleepTime(validatedAttentiveSleepTime);
-        }
         int validatedSleepTime = getValidatedTimeout(getSleepTime(), true);
         mSleepTimePref.setValue(String.valueOf(validatedSleepTime));
         if (getSleepTime() != validatedSleepTime) {
@@ -79,19 +85,27 @@ public class EnergySaverFragment extends SettingsPreferenceFragment implements
                     return false;
                 });
 
+        mAttentiveTimePref = findPreference(KEY_ATTENTIVE_TIME);
         mAttentiveTimePref.setOnPreferenceChangeListener(this);
 
         mRestrictedSleepTime = RestrictedPreferenceAdapter.adapt(
                 mSleepTimePref, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT);
         mRestrictedAttentiveTime = RestrictedPreferenceAdapter.adapt(
                 mAttentiveTimePref, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT);
-        if (!showStandbyTimeout()) {
+
+        if (!showAttentiveSleepTimeoutSetting()) {
             mAttentiveTimePref.setVisible(false);
             mRestrictedAttentiveTime.updatePreference();
+        } else {
+            int validatedAttentiveSleepTime = getValidatedTimeout(getAttentiveSleepTime(), false);
+            mAttentiveTimePref.setValue(String.valueOf(validatedAttentiveSleepTime));
+            if (getAttentiveSleepTime() != validatedAttentiveSleepTime) {
+                setAttentiveSleepTime(validatedAttentiveSleepTime);
+            }
         }
     }
 
-    private boolean showStandbyTimeout() {
+    private boolean showAttentiveSleepTimeoutSetting() {
         return getResources().getBoolean(R.bool.config_show_standby_timeout);
     }
 
@@ -103,7 +117,7 @@ public class EnergySaverFragment extends SettingsPreferenceFragment implements
                 if (getSleepTimeEntryId(newSleepTime) != -1) {
                     logEntrySelected(getSleepTimeEntryId(newSleepTime));
                 }
-                if (showStandbyTimeout() && isTimeLargerThan(
+                if (showAttentiveSleepTimeoutSetting() && isTimeLargerThan(
                         newSleepTime, getAttentiveSleepTime())) {
                     new AlertDialog.Builder(getContext())
                             .setMessage(R.string.device_energy_saver_validation_sleep)
@@ -189,13 +203,16 @@ public class EnergySaverFragment extends SettingsPreferenceFragment implements
                 DEFAULT_SLEEP_TIME_MS);
     }
 
+    private void setSleepTime(int ms) {
+        Settings.Secure.putInt(getActivity().getContentResolver(), SLEEP_TIMEOUT, ms);
+    }
+
     private int getAttentiveSleepTime() {
-        return Settings.Secure.getInt(getActivity().getContentResolver(), ATTENTIVE_TIMEOUT,
-                DEFAULT_SLEEP_TIME_MS);
+        return getAttentiveSleepTime(mDefaultAttentiveTimeoutConfig);
     }
 
-    private void setSleepTime(int ms) {
-        Settings.Secure.putInt(getActivity().getContentResolver(), SLEEP_TIMEOUT, ms);
+    private int getAttentiveSleepTime(int def) {
+        return Settings.Secure.getInt(getActivity().getContentResolver(), ATTENTIVE_TIMEOUT, def);
     }
 
     private void setAttentiveSleepTime(int ms) {
@@ -206,7 +223,8 @@ public class EnergySaverFragment extends SettingsPreferenceFragment implements
     // value to make sure that we select from the predefined options. If the value from overlay is
     // not one of the predefined options, we round it to the closest predefined value, except -1.
     private int getValidatedTimeout(int purposedTimeout, boolean isSleepTimeout) {
-        int validatedTimeout = isSleepTimeout ? DEFAULT_SLEEP_TIME_MS : DEFAULT_ATTENTIVE_TIME_MS;
+        int validatedTimeout =
+                isSleepTimeout ? DEFAULT_SLEEP_TIME_MS : mDefaultAttentiveTimeoutConfig;
         if (purposedTimeout < 0) {
             return -1;
 
@@ -263,4 +281,35 @@ public class EnergySaverFragment extends SettingsPreferenceFragment implements
     protected int getPageId() {
         return TvSettingsEnums.SYSTEM_ENERGYSAVER;
     }
+
+    /**
+     * Fix for b/286356445:
+     * The attentive timeout was previously set incorrectly when this Fragment was created.
+     * This method resets the attentive timeout setting to its default value if the setting
+     * is not supposed to be shown and this hasn't been run before.
+     */
+    public static void resetAttentiveTimeoutIfHidden(Context context) {
+        //
+        boolean showAttentiveSleepTimeoutSetting = context.getResources().getBoolean(
+                R.bool.config_show_standby_timeout);
+        if (showAttentiveSleepTimeoutSetting) {
+            // Keep current setting, as user can change it and may have changed it
+            return;
+        }
+
+        try {
+            final SharedPreferences sharedPreferences = context.getSharedPreferences(
+                    SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+            boolean hasResetAttentiveTimeout = sharedPreferences.getBoolean(
+                    PREF_RESET_ATTENTIVE_TIMEOUT, false);
+            if (!hasResetAttentiveTimeout) {
+                Settings.Secure.putString(context.getContentResolver(), ATTENTIVE_TIMEOUT, "");
+                sharedPreferences.edit()
+                        .putBoolean(PREF_RESET_ATTENTIVE_TIMEOUT, true)
+                        .apply();
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Failed to reset attentive timeout", e);
+        }
+    }
 }
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/FontScalePreferenceFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/FontScalePreferenceFragment.java
index c57975678..b37dba1ef 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/FontScalePreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/FontScalePreferenceFragment.java
@@ -38,7 +38,7 @@ import com.android.tv.settings.overlay.FlavorUtils;
  */
 @Keep
 public class FontScalePreferenceFragment extends SettingsPreferenceFragment implements
-                Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener {
     private static final String FONT_SCALE_RADIO_GROUP = "font_scale_radio_group";
     private static final String FONT_SCALE_GROUP = "font_scale_group";
 
@@ -58,9 +58,9 @@ public class FontScalePreferenceFragment extends SettingsPreferenceFragment impl
 
         for (int i = 0; i < entryValues.length; i++) {
             final RadioPreference preference = new RadioPreference(themedContext);
+            preference.setOnPreferenceChangeListener(this);
             preference.setPersistent(false);
             preference.setRadioGroup(FONT_SCALE_RADIO_GROUP);
-            preference.setOnPreferenceChangeListener(this);
             preference.setKey(entryValues[i]);
             int scaleValue = (int) (Float.valueOf(entryValues[i]) * 100);
             String summary = getContext().getResources()
@@ -68,21 +68,26 @@ public class FontScalePreferenceFragment extends SettingsPreferenceFragment impl
             preference.setSummaryOff(summary);
             preference.setSummaryOn(summary);
             preference.setTitle(entries[i]);
-            if (FlavorUtils.isTwoPanel(getContext())) {
-                preference.setFragment(FontScalePreviewFragment.class.getName());
-            }
-            Bundle extras = preference.getExtras();
-            extras.putString(FontScalePreviewFragment.PREVIEW_FONT_SCALE_VALUE, entryValues[i]);
-            extras.putFloat(
-                    FontScalePreviewFragment.CURRENT_FONT_SCALE_VALUE, mCurrentFontScaleValue);
-
             if (Float.compare(mCurrentFontScaleValue, Float.parseFloat(entryValues[i])) == 0) {
                 preference.setChecked(true);
             }
+            initPreview(preference, Float.parseFloat(entryValues[i]));
             fontScaleGroup.addPreference(preference);
         }
     }
 
+    private void initPreview(RadioPreference preference, float previewFontScaleValue) {
+        if (FlavorUtils.isTwoPanel(getContext())) {
+            preference.setFragment(FontScalePreviewFragment.class.getName());
+        }
+        Bundle extras = preference.getExtras();
+        extras.putString(FontScalePreviewFragment.PREVIEW_FONT_SCALE_VALUE,
+                String.valueOf(previewFontScaleValue));
+        extras.putFloat(
+                FontScalePreviewFragment.CURRENT_FONT_SCALE_VALUE, mCurrentFontScaleValue);
+    }
+
+
     private void initFontScaleValue(Context context) {
         final ContentResolver resolver = getContext().getContentResolver();
         mCurrentFontScaleValue =
@@ -99,6 +104,8 @@ public class FontScalePreferenceFragment extends SettingsPreferenceFragment impl
         radioPreference.clearOtherRadioPreferences(fontScaleGroup);
         mCurrentFontScaleValue = Float.parseFloat(preference.getKey());
         commit();
+        initPreview(radioPreference, mCurrentFontScaleValue);
+        radioPreference.setChecked(true);
         logNewFontScaleSelection(preference.getKey());
         return 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 22252079b..e244de785 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/HdrFormatPreferenceController.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/HdrFormatPreferenceController.java
@@ -127,7 +127,7 @@ public class HdrFormatPreferenceController extends AbstractPreferenceController
             // 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.getHdrConversionModeSetting().getPreferredHdrOutputType()
+            if (mDisplayManager.getHdrConversionMode().getPreferredHdrOutputType()
                     == mHdrType) {
                 mDisplayManager.setHdrConversionMode(
                         new HdrConversionMode(HdrConversionMode.HDR_CONVERSION_SYSTEM));
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeForceFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeForceFragment.java
index f4d2e09d4..c269f0f08 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeForceFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/PreferredDynamicRangeForceFragment.java
@@ -151,7 +151,9 @@ public class PreferredDynamicRangeForceFragment extends SettingsPreferenceFragme
     }
 
     private void createHdrPreference() {
+        Set<Integer> hdrTypesSet = new HashSet<>();
         for (int i = 0; i < mHdrTypes.length; i++) {
+            hdrTypesSet.add(mHdrTypes[i]);
             RadioPreference pref = new RadioPreference(getContext());
             pref.setTitle(getContext().getString(
                     R.string.preferred_dynamic_range_selection_force_hdr_title,
@@ -174,7 +176,8 @@ public class PreferredDynamicRangeForceFragment extends SettingsPreferenceFragme
 
         final int selectedHdrType =
                 mDisplayManager.getHdrConversionModeSetting().getPreferredHdrOutputType();
-        if (selectedHdrType != Display.HdrCapabilities.HDR_TYPE_INVALID) {
+        if (selectedHdrType != Display.HdrCapabilities.HDR_TYPE_INVALID
+                && hdrTypesSet.contains(selectedHdrType)) {
             pref = findPreference(KEY_HDR_FORMAT_PREFIX + selectedHdrType);
         }
         selectRadioPreference(pref);
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java
index db515ba65..787c4e55c 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragment.java
@@ -19,7 +19,6 @@ package com.android.tv.settings.device.displaysound;
 import static android.content.DialogInterface.OnClickListener;
 import static android.view.Display.HdrCapabilities.HDR_TYPE_DOLBY_VISION;
 import static android.view.Display.HdrCapabilities.HDR_TYPE_INVALID;
-
 import static com.android.tv.settings.device.displaysound.DisplaySoundUtils.createAlertDialog;
 import static com.android.tv.settings.device.displaysound.DisplaySoundUtils.doesCurrentModeNotSupportDvBecauseLimitedTo4k30;
 import static com.android.tv.settings.device.displaysound.DisplaySoundUtils.isHdrFormatSupported;
@@ -46,6 +45,7 @@ import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.tv.settings.PreferenceControllerFragment;
 import com.android.tv.settings.R;
 import com.android.tv.settings.RadioPreference;
+import com.android.tv.settings.overlay.FlavorUtils;
 import com.android.tv.settings.util.ResolutionSelectionUtils;
 
 import java.util.Arrays;
@@ -153,7 +153,7 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment {
                         mAutoMode.getPhysicalWidth(), mAutoMode.getPhysicalHeight()),
                 ResolutionSelectionUtils.getRefreshRateString(mAutoMode.getRefreshRate()));
         pref.setSummary(summary);
-        pref.setFragment(ResolutionSelectionInfo.HDRInfoFragment.class.getName());
+        configureResolutionPreference(pref);
         pref.getExtras().putIntArray(HDR_TYPES_ARRAY, mAutoMode.getSupportedHdrTypes());
         mResolutionPreferenceCategory.addPreference(pref);
 
@@ -175,7 +175,7 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment {
         pref.setTitle(title);
         pref.setSummary(summary);
         pref.setKey(KEY_RESOLUTION_PREFIX + resolution);
-        pref.setFragment(ResolutionSelectionInfo.HDRInfoFragment.class.getName());
+        configureResolutionPreference(pref);
         pref.getExtras().putIntArray(HDR_TYPES_ARRAY, mode.getSupportedHdrTypes());
         return pref;
     }
@@ -195,6 +195,12 @@ public class ResolutionSelectionFragment extends PreferenceControllerFragment {
         radioPreference.clearOtherRadioPreferences(getPreferenceGroup());
     }
 
+    private void configureResolutionPreference(Preference pref) {
+        if (FlavorUtils.isTwoPanel(getContext())) {
+            pref.setFragment(ResolutionSelectionInfo.HDRInfoFragment.class.getName());
+        }
+    }
+
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         String key = preference.getKey();
diff --git a/Settings/src/com/android/tv/settings/device/eco/EnergyModeConfirmationActivity.java b/Settings/src/com/android/tv/settings/device/eco/EnergyModeConfirmationActivity.java
index 9578d179a..6f642e68c 100644
--- a/Settings/src/com/android/tv/settings/device/eco/EnergyModeConfirmationActivity.java
+++ b/Settings/src/com/android/tv/settings/device/eco/EnergyModeConfirmationActivity.java
@@ -67,7 +67,7 @@ public class EnergyModeConfirmationActivity extends FragmentActivity {
                 getSupportFragmentManager()
                         .beginTransaction()
                         .add(android.R.id.content, dialogFragment)
-                        .commit();
+                        .commitAllowingStateLoss();
             }
         }
     }
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 e8ce5efd2..7e00afc92 100644
--- a/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
+++ b/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
@@ -29,6 +29,7 @@ import android.content.res.Resources;
 import android.os.PowerManager;
 import android.os.PowerManager.LowPowerStandbyPolicy;
 import android.provider.DeviceConfig;
+import android.text.TextUtils;
 import android.util.ArraySet;
 
 import com.android.tv.settings.R;
@@ -44,6 +45,7 @@ import java.util.Set;
 public final class EnergyModesHelper {
     public static final String NAMESPACE_LOW_POWER_STANDBY = "low_power_standby";
     public static final String KEY_ENABLE_POLICY = "enable_policy";
+    private static final String LIST_ITEM_BULLET = "\u2022 ";
 
     private final Context mContext;
 
@@ -85,6 +87,20 @@ public final class EnergyModesHelper {
         @ArrayRes
         public final int vendorAllowedFeaturesRes;
 
+        /**
+         * Base mode from which all allowed reasons, allowed features, and exempt packages
+         * will be inherited.
+         */
+        @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,
@@ -92,7 +108,8 @@ public final class EnergyModesHelper {
                 @DrawableRes int ecoHintIconRes, @ArrayRes int baseExemptPackagesRes,
                 @ArrayRes int vendorExemptPackagesRes, @IntegerRes int baseAllowedReasonsRes,
                 @IntegerRes int vendorAllowedReasonsRes, @ArrayRes int baseAllowedFeaturesRes,
-                @ArrayRes int vendorAllowedFeaturesRes) {
+                @ArrayRes int vendorAllowedFeaturesRes, @Nullable EnergyMode baseMode,
+                @StringRes int baseModeFeaturesRes) {
             this.ecoHighlighted = ecoHighlighted;
             this.enableLowPowerStandby = enableLowPowerStandby;
             this.enabledRes = enabledRes;
@@ -111,13 +128,15 @@ public final class EnergyModesHelper {
             this.vendorAllowedReasonsRes = vendorAllowedReasonsRes;
             this.baseAllowedFeaturesRes = baseAllowedFeaturesRes;
             this.vendorAllowedFeaturesRes = vendorAllowedFeaturesRes;
+            this.baseMode = baseMode;
+            this.baseModeFeaturesRes = baseModeFeaturesRes;
         }
     }
 
     public static EnergyMode MODE_LOW_ENERGY = new EnergyMode(
             R.string.energy_mode_low_identifier,
-            true,
-            true,
+            /* ecoHighlighted= */ true,
+            /* enableLowPowerStandby= */ true,
             R.bool.energy_mode_low_enabled,
             R.string.energy_mode_low_title,
             R.string.energy_mode_low_subtitle,
@@ -132,12 +151,13 @@ public final class EnergyModesHelper {
             R.integer.energy_mode_low_baseAllowedReasons,
             R.integer.energy_mode_low_vendorAllowedReasons,
             R.array.energy_mode_low_baseAllowedFeatures,
-            R.array.energy_mode_low_vendorAllowedFeatures);
+            R.array.energy_mode_low_vendorAllowedFeatures,
+            /* baseMode= */ null, /* baseModeFeaturesRes= */ 0);
 
     public static EnergyMode MODE_MODERATE_ENERGY = new EnergyMode(
             R.string.energy_mode_moderate_identifier,
-            false,
-            true,
+            /* ecoHighlighted= */ false,
+            /* enableLowPowerStandby= */ true,
             R.bool.energy_mode_moderate_enabled,
             R.string.energy_mode_moderate_title,
             R.string.energy_mode_moderate_subtitle,
@@ -146,18 +166,20 @@ public final class EnergyModesHelper {
             R.string.energy_mode_moderate_info,
             R.array.energy_mode_moderate_features,
             R.string.energy_mode_moderate_eco_hint,
-            0,
+            /* ecoHintIconRes= */ 0,
             R.array.energy_mode_moderate_baseExemptPackages,
             R.array.energy_mode_moderate_vendorExemptPackages,
             R.integer.energy_mode_moderate_baseAllowedReasons,
             R.integer.energy_mode_moderate_vendorAllowedReasons,
             R.array.energy_mode_moderate_baseAllowedFeatures,
-            R.array.energy_mode_moderate_vendorAllowedFeatures);
+            R.array.energy_mode_moderate_vendorAllowedFeatures,
+            MODE_LOW_ENERGY,
+            R.string.energy_mode_moderate_all_low_features);
 
     public static EnergyMode MODE_HIGH_ENERGY = new EnergyMode(
             R.string.energy_mode_high_identifier,
-            false,
-            true,
+            /* ecoHighlighted= */ false,
+            /* enableLowPowerStandby= */ true,
             R.bool.energy_mode_high_enabled,
             R.string.energy_mode_high_title,
             R.string.energy_mode_high_subtitle,
@@ -172,7 +194,9 @@ public final class EnergyModesHelper {
             R.integer.energy_mode_high_baseAllowedReasons,
             R.integer.energy_mode_high_vendorAllowedReasons,
             R.array.energy_mode_high_baseAllowedFeatures,
-            R.array.energy_mode_high_vendorAllowedFeatures);
+            R.array.energy_mode_high_vendorAllowedFeatures,
+            MODE_MODERATE_ENERGY,
+            R.string.energy_mode_moderate_all_moderate_features);
 
     public static EnergyMode MODE_UNRESTRICTED = new EnergyMode(
             R.string.energy_mode_unrestricted_identifier,
@@ -187,7 +211,8 @@ public final class EnergyModesHelper {
             R.array.energy_mode_high_features,
             R.string.energy_mode_high_eco_hint,
             R.drawable.ic_bolt,
-            0, 0, 0, 0, 0, 0);
+            0, 0, 0, 0, 0, 0, null,
+            R.string.energy_mode_moderate_all_moderate_features);
 
     public static EnergyMode[] ENERGY_MODES = new EnergyMode[] {
             MODE_LOW_ENERGY, MODE_MODERATE_ENERGY, MODE_HIGH_ENERGY, MODE_UNRESTRICTED };
@@ -209,7 +234,7 @@ public final class EnergyModesHelper {
     private boolean areEnergyModesEnabled() {
         boolean enableEnergyModes = mContext.getResources().getBoolean(R.bool.enable_energy_modes);
         boolean customPoliciesEnabled = DeviceConfig.getBoolean(NAMESPACE_LOW_POWER_STANDBY,
-                KEY_ENABLE_POLICY, false);
+                KEY_ENABLE_POLICY, true);
 
         return enableEnergyModes && customPoliciesEnabled && isLowPowerStandbySupported(mContext);
     }
@@ -301,7 +326,7 @@ public final class EnergyModesHelper {
         return summary.toString();
     }
 
-    /** Returns the list of features */
+    /** Returns the list of features formatted for display in the Settings UI */
     @Nullable
     public String getFeaturesList(EnergyMode mode) {
         String[] features = mContext.getResources().getStringArray(mode.featuresRes);
@@ -310,8 +335,18 @@ public final class EnergyModesHelper {
         }
 
         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("\u2022 ");
+            featureList.append(LIST_ITEM_BULLET);
             featureList.append(features[i]);
             if (i < features.length - 1) {
                 featureList.append("\n");
@@ -347,18 +382,28 @@ public final class EnergyModesHelper {
     }
 
     @NonNull
-    private Set<String> getExemptPackages(EnergyMode mode) {
+    private Set<String> getExemptPackages(@NonNull EnergyMode mode) {
         final String identifier = mContext.getString(mode.identifierRes);
         final Set<String> exemptPackages = combineStringArrays(mode.baseExemptPackagesRes,
                 "policy_" + identifier + "_exempt_packages", mode.vendorExemptPackagesRes);
+
+        if (mode.baseMode != null) {
+            exemptPackages.addAll(getExemptPackages(mode.baseMode));
+        }
+
         return exemptPackages;
     }
 
     @NonNull
-    Set<String> getAllowedFeatures(EnergyMode mode) {
+    Set<String> getAllowedFeatures(@NonNull EnergyMode mode) {
         final String identifier = mContext.getString(mode.identifierRes);
         final Set<String> allowedFeatures = combineStringArrays(mode.baseAllowedFeaturesRes,
                 "policy_" + identifier + "_allowed_features", mode.vendorAllowedFeaturesRes);
+
+        if (mode.baseMode != null) {
+            allowedFeatures.addAll(getAllowedFeatures(mode.baseMode));
+        }
+
         return allowedFeatures;
     }
 
@@ -377,7 +422,7 @@ public final class EnergyModesHelper {
         return result;
     }
 
-    private int getAllowedReasons(EnergyMode mode) {
+    private int getAllowedReasons(@NonNull EnergyMode mode) {
         final Resources resources = mContext.getResources();
         final String identifier = mContext.getString(mode.identifierRes);
 
@@ -385,9 +430,14 @@ public final class EnergyModesHelper {
         final int deviceConfigAllowedReasonOverride = DeviceConfig.getInt(
                 NAMESPACE_LOW_POWER_STANDBY, "policy_" + identifier + "_allowed_reasons", -1);
         final int vendorAllowedReasons = resources.getInteger(mode.vendorAllowedReasonsRes);
-        final int allowedReasons = ((deviceConfigAllowedReasonOverride != -1
+        int allowedReasons = ((deviceConfigAllowedReasonOverride != -1
                 ? deviceConfigAllowedReasonOverride
                 : baseAllowedReasons) | vendorAllowedReasons);
+
+        if (mode.baseMode != null) {
+            allowedReasons |= getAllowedReasons(mode.baseMode);
+        }
+
         return allowedReasons;
     }
 
diff --git a/Settings/src/com/android/tv/settings/device/storage/ClearCachedDataPreference.java b/Settings/src/com/android/tv/settings/device/storage/ClearCachedDataPreference.java
index 3ae72cf83..9f3c99fab 100644
--- a/Settings/src/com/android/tv/settings/device/storage/ClearCachedDataPreference.java
+++ b/Settings/src/com/android/tv/settings/device/storage/ClearCachedDataPreference.java
@@ -122,8 +122,7 @@ public class ClearCachedDataPreference extends RestrictedPreference implements
             // Show info fragment only if the UI is TwoPanel.
             return ClearCachedDataInfoFragment.class.getName();
         }
-        // Otherwise, we set the forward fragment as confirmation fragment.
-        return ConfirmationFragment.class.getName();
+        return null;
     }
 
     @Override
@@ -132,7 +131,8 @@ public class ClearCachedDataPreference extends RestrictedPreference implements
         confirmFragment.setOnOkListener(() -> clearCache());
         final Fragment settingsFragment = mFreeUpStorageFragment.getCallbackFragment();
         if (settingsFragment instanceof LeanbackSettingsFragmentCompat) {
-            return;
+            ((LeanbackSettingsFragmentCompat) settingsFragment)
+                    .startImmersiveFragment(confirmFragment);
         } else if (settingsFragment instanceof TwoPanelSettingsFragment) {
             // Show confirmation fragment in TwoPanel UI.
             ((TwoPanelSettingsFragment) settingsFragment)
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java b/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
index 3eaa13612..7e871e369 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
@@ -23,6 +23,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.storage.DiskInfo;
+import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.text.TextUtils;
@@ -71,6 +72,29 @@ public class FormatActivity extends FragmentActivity
     private PackageManager mPackageManager;
     private StorageManager mStorageManager;
 
+    private String mDiskId;
+
+    private final StorageEventListener mDiskChangeListener = new StorageEventListener() {
+        @Override
+        public void onDiskDestroyed(DiskInfo disk) {
+            finishIfDiskGone();
+        }
+
+        @Override
+        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+            finishIfDiskGone();
+        }
+    };
+
+    private void finishIfDiskGone() {
+        if (!TextUtils.isEmpty(mDiskId)) {
+            // If the disk disappears, abort by finishing FormatActivity.
+            if (mStorageManager.findDiskById(mDiskId) == null) {
+                finish();
+            }
+        }
+    }
+
     public static Intent getFormatAsPublicIntent(Context context, String diskId) {
         final Intent i = new Intent(context, FormatActivity.class);
         i.setAction(INTENT_ACTION_FORMAT_AS_PUBLIC);
@@ -101,21 +125,23 @@ public class FormatActivity extends FragmentActivity
             mFormatAsPrivateDiskId =
                     savedInstanceState.getString(SAVE_STATE_FORMAT_PRIVATE_DISK_ID);
             mFormatAsPublicDiskId = savedInstanceState.getString(SAVE_STATE_FORMAT_PUBLIC_DISK_ID);
+            mDiskId =
+                    mFormatAsPrivateDiskId != null ? mFormatAsPrivateDiskId : mFormatAsPublicDiskId;
             mFormatDiskDesc = savedInstanceState.getString(SAVE_STATE_FORMAT_DISK_DESC);
         } else {
-            final String diskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
+            mDiskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
             final String action = getIntent().getAction();
             final Fragment f;
             if (TextUtils.equals(action, INTENT_ACTION_FORMAT_AS_PRIVATE)) {
-                f = FormatAsPrivateStepFragment.newInstance(diskId);
+                f = FormatAsPrivateStepFragment.newInstance(mDiskId);
             } else if (TextUtils.equals(action, INTENT_ACTION_FORMAT_AS_PUBLIC)) {
-                f = FormatAsPublicStepFragment.newInstance(diskId);
+                f = FormatAsPublicStepFragment.newInstance(mDiskId);
             } else {
                 throw new IllegalStateException("No known action specified");
             }
             getSupportFragmentManager().beginTransaction()
                     .add(android.R.id.content, f)
-                    .commit();
+                    .commitAllowingStateLoss();
         }
     }
 
@@ -133,6 +159,18 @@ public class FormatActivity extends FragmentActivity
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        mStorageManager.registerListener(mDiskChangeListener);
+    }
+
+    @Override
+    public void onStop() {
+        mStorageManager.unregisterListener(mDiskChangeListener);
+        super.onStop();
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         LocalBroadcastManager.getInstance(this).unregisterReceiver(mFormatReceiver);
@@ -168,7 +206,7 @@ public class FormatActivity extends FragmentActivity
                 getSupportFragmentManager().beginTransaction()
                         .replace(android.R.id.content,
                                 SlowDriveStepFragment.newInstance())
-                        .commit();
+                        .commitAllowingStateLoss();
                 return;
             }
         }
@@ -240,7 +278,7 @@ public class FormatActivity extends FragmentActivity
         final FormattingProgressFragment fragment = FormattingProgressFragment.newInstance();
         getSupportFragmentManager().beginTransaction()
                 .replace(android.R.id.content, fragment)
-                .commit();
+                .commitAllowingStateLoss();
 
         mFormatAsPrivateDiskId = diskId;
         final List<VolumeInfo> volumes = mStorageManager.getVolumes();
@@ -283,7 +321,7 @@ public class FormatActivity extends FragmentActivity
         final FormattingProgressFragment fragment = FormattingProgressFragment.newInstance();
         getSupportFragmentManager().beginTransaction()
                 .replace(android.R.id.content, fragment)
-                .commit();
+                .commitAllowingStateLoss();
 
         mFormatAsPublicDiskId = diskId;
         if (!TextUtils.isEmpty(volumeId)) {
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
index 89e6d79eb..a3e1ee2a5 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
@@ -104,7 +104,7 @@ public class FormatAsPublicStepFragment extends GuidedStepSupportFragment {
             getFragmentManager().beginTransaction()
                     .replace(android.R.id.content, f)
                     .addToBackStack(null)
-                    .commit();
+                    .commitAllowingStateLoss();
         } else if (id == ACTION_ID_FORMAT) {
             ((Callback) getActivity()).onRequestFormatAsPublic(mDiskId, mVolumeId);
         }
diff --git a/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
index e92cb237a..c9a3e1766 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
@@ -99,7 +99,7 @@ public class MigrateStorageActivity extends FragmentActivity {
             getSupportFragmentManager().beginTransaction()
                     .add(android.R.id.content,
                             MigrateConfirmationStepFragment.newInstance(mTargetVolumeDesc))
-                    .commit();
+                    .commitAllowingStateLoss();
         } else {
             mVolumeInfo = storageManager.findVolumeById(volumeId);
             if (mVolumeInfo == null) {
@@ -110,7 +110,7 @@ public class MigrateStorageActivity extends FragmentActivity {
             getSupportFragmentManager().beginTransaction()
                     .add(android.R.id.content,
                             ChooseStorageStepFragment.newInstance(mVolumeInfo))
-                    .commit();
+                    .commitAllowingStateLoss();
         }
 
         mPackageManager = getPackageManager();
@@ -150,7 +150,7 @@ public class MigrateStorageActivity extends FragmentActivity {
             getSupportFragmentManager().beginTransaction()
                     .replace(android.R.id.content,
                             MigrateProgressFragment.newInstance(mTargetVolumeDesc))
-                    .commitNow();
+                    .commitNowAllowingStateLoss();
         } catch (IllegalArgumentException e) {
             // This will generally happen if there's a move already in progress or completed
             StorageManager sm = (StorageManager) getSystemService(STORAGE_SERVICE);
diff --git a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
index a39c4f1a2..75ddfa44f 100644
--- a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
@@ -82,7 +82,7 @@ public class NewStorageActivity extends FragmentActivity {
 
                 getSupportFragmentManager().beginTransaction()
                         .add(android.R.id.content, MissingStorageFragment.newInstance(fsUuid))
-                        .commit();
+                        .commitAllowingStateLoss();
             } else {
                 final String volumeId = getIntent().getStringExtra(VolumeInfo.EXTRA_VOLUME_ID);
                 final String diskId = getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID);
@@ -93,7 +93,7 @@ public class NewStorageActivity extends FragmentActivity {
 
                 getSupportFragmentManager().beginTransaction()
                         .add(android.R.id.content, NewStorageFragment.newInstance(volumeId, diskId))
-                        .commit();
+                        .commitAllowingStateLoss();
             }
         }
     }
diff --git a/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java b/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
index d6629f3b8..4ebfc3353 100644
--- a/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
@@ -89,35 +89,26 @@ public class StorageFragment extends SettingsPreferenceFragment {
     public void onCreate(Bundle savedInstanceState) {
         mStorageManager = getContext().getSystemService(StorageManager.class);
         mPackageManager = getContext().getPackageManager();
-
-        mVolumeInfo = mStorageManager.findVolumeById(
-                getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID));
-
+        updateVolumeInfo();
         super.onCreate(savedInstanceState);
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        mStorageManager.registerListener(mStorageEventListener);
-        startMeasurement();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
-        mVolumeInfo = mStorageManager.findVolumeById(
-                getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID));
+        updateVolumeInfo();
         if (mVolumeInfo == null || !mVolumeInfo.isMountedReadable()) {
             navigateBack();
         } else {
             refresh();
+            mStorageManager.registerListener(mStorageEventListener);
+            startMeasurement();
         }
     }
 
     @Override
-    public void onStop() {
-        super.onStop();
+    public void onPause() {
+        super.onPause();
         mStorageManager.unregisterListener(mStorageEventListener);
         stopMeasurement();
     }
@@ -155,6 +146,11 @@ public class StorageFragment extends SettingsPreferenceFragment {
         return super.onPreferenceTreeClick(preference);
     }
 
+    private void updateVolumeInfo() {
+        mVolumeInfo = mStorageManager.findVolumeById(
+                getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID));
+    }
+
     private void refresh() {
         boolean showMigrate = false;
         final VolumeInfo currentExternal = mPackageManager.getPrimaryStorageCurrentVolume();
@@ -221,6 +217,10 @@ public class StorageFragment extends SettingsPreferenceFragment {
     }
 
     private void updateDetails(StorageMeasurement.MeasurementDetails details) {
+        if (mVolumeInfo == null) {
+            Log.w(TAG, "Unexpected details update. Volume info is null.");
+            return;
+        }
         final int currentUser = ActivityManager.getCurrentUser();
         final long dcimSize = totalValues(details.mediaSize.get(currentUser),
                 Environment.DIRECTORY_DCIM,
diff --git a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
index 4eb543e2f..a334c027a 100644
--- a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
@@ -85,7 +85,7 @@ public class UnmountActivity extends FragmentActivity {
                 final Fragment fragment = UnmountPrivateStepFragment.newInstance(mUnmountVolumeId);
                 getSupportFragmentManager().beginTransaction()
                         .replace(android.R.id.content, fragment)
-                        .commit();
+                        .commitAllowingStateLoss();
             } else {
                 // Jump straight to unmounting
                 onRequestUnmount();
@@ -104,7 +104,7 @@ public class UnmountActivity extends FragmentActivity {
         final Fragment fragment = UnmountProgressFragment.newInstance(mUnmountVolumeDesc);
         getSupportFragmentManager().beginTransaction()
                 .replace(android.R.id.content, fragment)
-                .commit();
+                .commitAllowingStateLoss();
         // Post this so that it will presumably run after onResume, if we're calling from onCreate()
         mHandler.post(new Runnable() {
             @Override
diff --git a/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java b/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java
index 716b0aa59..7fd966f8d 100644
--- a/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java
+++ b/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java
@@ -46,6 +46,7 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.EventLog;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AppSecurityPermissions;
@@ -117,14 +118,14 @@ public class DeviceAdminAdd extends FragmentActivity {
         mAppOps = getSystemService(AppOpsManager.class);
         PackageManager packageManager = getPackageManager();
 
-        if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
+        if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
             Log.w(TAG, "Cannot start ADD_DEVICE_ADMIN as a new task");
             finish();
             return;
         }
 
         String action = getIntent().getAction();
-        ComponentName who = (ComponentName)getIntent().getParcelableExtra(
+        ComponentName who = (ComponentName) getIntent().getParcelableExtra(
                 DevicePolicyManager.EXTRA_DEVICE_ADMIN);
         if (who == null) {
             String packageName = getIntent().getStringExtra(EXTRA_DEVICE_ADMIN_PACKAGE_NAME);
@@ -182,7 +183,7 @@ public class DeviceAdminAdd extends FragmentActivity {
                     PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
             int count = avail == null ? 0 : avail.size();
             boolean found = false;
-            for (int i=0; i<count; i++) {
+            for (int i = 0; i < count; i++) {
                 ResolveInfo ri = avail.get(i);
                 if (ai.packageName.equals(ri.activityInfo.packageName)
                         && ai.name.equals(ri.activityInfo.name)) {
@@ -404,44 +405,50 @@ public class DeviceAdminAdd extends FragmentActivity {
 
         final View restrictedAction = findViewById(R.id.restricted_action);
         restrictedAction.setFilterTouchesWhenObscured(true);
-        restrictedAction.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                if (!mActionButton.isEnabled()) {
-                    return;
-                }
-                if (mAdding) {
-                    addAndFinish();
-                } else if (mUninstalling) {
-                    mDPM.uninstallPackageWithActiveAdmins(mDeviceAdmin.getPackageName());
-                    finish();
-                } else if (!mWaitingForRemoveMsg) {
-                    try {
-                        // Don't allow the admin to put a dialog up in front
-                        // of us while we interact with the user.
-                        ActivityManager.getService().stopAppSwitches();
-                    } catch (RemoteException e) {
-                    }
-                    mWaitingForRemoveMsg = true;
-                    mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
-                            new RemoteCallback(new RemoteCallback.OnResultListener() {
-                                @Override
-                                public void onResult(Bundle result) {
-                                    CharSequence msg = result != null
-                                            ? result.getCharSequence(
-                                            DeviceAdminReceiver.EXTRA_DISABLE_WARNING)
-                                            : null;
-                                    continueRemoveAction(msg);
-                                }
-                            }, mHandler));
-                    // Don't want to wait too long.
-                    getWindow().getDecorView().getHandler().postDelayed(new Runnable() {
-                        @Override public void run() {
-                            continueRemoveAction(null);
-                        }
-                    }, 2 * 1000);
+        final View.OnClickListener restrictedActionClickListener = v -> {
+            if (!mActionButton.isEnabled()) {
+                return;
+            }
+            if (mAdding) {
+                addAndFinish();
+            } else if (mUninstalling) {
+                mDPM.uninstallPackageWithActiveAdmins(mDeviceAdmin.getPackageName());
+                finish();
+            } else if (!mWaitingForRemoveMsg) {
+                try {
+                    // Don't allow the admin to put a dialog up in front
+                    // of us while we interact with the user.
+                    ActivityManager.getService().stopAppSwitches();
+                } catch (RemoteException e) {
+                    Log.w(TAG, "Unable to stop app switches.", e);
                 }
+                mWaitingForRemoveMsg = true;
+                mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
+                        new RemoteCallback(new RemoteCallback.OnResultListener() {
+                            @Override
+                            public void onResult(Bundle result) {
+                                CharSequence msg = result != null
+                                        ? result.getCharSequence(
+                                        DeviceAdminReceiver.EXTRA_DISABLE_WARNING)
+                                        : null;
+                                continueRemoveAction(msg);
+                            }
+                        }, mHandler));
+                // Don't want to wait too long.
+                getWindow().getDecorView().getHandler().postDelayed(
+                        () -> continueRemoveAction(null), 2 * 1000);
+            }
+        };
+        restrictedAction.setOnKeyListener((view, keyCode, keyEvent) -> {
+            if ((keyEvent.getFlags() & KeyEvent.FLAG_FROM_SYSTEM) == 0) {
+                Log.e(TAG, "Can not activate device-admin with KeyEvent from non-system app.");
+                // Consume event to suppress click.
+                return true;
             }
+            // Fallback to view click handler.
+            return false;
         });
+        restrictedAction.setOnClickListener(restrictedActionClickListener);
     }
 
     void updateInterface() {
diff --git a/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 3c25e8612..7d01415b7 100644
--- a/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/Settings/src/com/android/tv/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -98,9 +98,6 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
         } else {
             disclosure.append(ResourcesUtil.getString(mContext, "do_disclosure_generic"));
         }
-        disclosure.append(ResourcesUtil.getString(mContext, "do_disclosure_learn_more_separator"));
-        disclosure.append(ResourcesUtil.getString(mContext, "learn_more"),
-                new EnterprisePrivacySpan(mContext), 0);
         return disclosure;
     }
 
diff --git a/Settings/src/com/android/tv/settings/inputmethod/TVInputMethodPreference.java b/Settings/src/com/android/tv/settings/inputmethod/TVInputMethodPreference.java
index fb7353d28..5f22b34f4 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/TVInputMethodPreference.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/TVInputMethodPreference.java
@@ -19,7 +19,7 @@ package com.android.tv.settings.inputmethod;
 import android.annotation.UserIdInt;
 import android.content.Context;
 import android.view.inputmethod.InputMethodInfo;
-import android.widget.Switch;
+import android.widget.CompoundButton;
 
 import androidx.preference.Preference;
 
@@ -40,7 +40,7 @@ public class TVInputMethodPreference extends InputMethodPreference {
 
     @Override
     public boolean onPreferenceClick(final Preference preference) {
-        final Switch switchWidget = getSwitch();
+        final CompoundButton switchWidget = getSwitch();
         if (!switchWidget.isEnabled()) {
             return true;
         }
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java b/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java
index d94004e03..7b1e54c23 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSetFragment.java
@@ -17,6 +17,8 @@
 package com.android.tv.settings.name;
 
 import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -29,8 +31,10 @@ import androidx.leanback.widget.GuidanceStylist;
 import androidx.leanback.widget.GuidedAction;
 import androidx.leanback.widget.GuidedActionsStylist;
 
+import com.android.settingslib.dream.DreamBackend;
 import com.android.tv.settings.R;
 import com.android.tv.settings.name.setup.DeviceNameFlowStartActivity;
+import com.android.tv.settings.overlay.FlavorUtils;
 import com.android.tv.settings.util.GuidedActionsAlignUtil;
 
 import java.util.ArrayList;
@@ -61,7 +65,13 @@ public class DeviceNameSetFragment extends GuidedStepSupportFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         View view = super.onCreateView(inflater, container, savedInstanceState);
-        return GuidedActionsAlignUtil.createView(view, this);
+        View guidanceView = GuidedActionsAlignUtil.createView(view, this);
+
+        if (FlavorUtils.isTwoPanel(getContext())) {
+            guidanceView.setBackgroundColor(
+                    getResources().getColor(R.color.tp_preference_panel_background_color));
+        }
+        return guidanceView;
     }
 
     @NonNull
diff --git a/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java b/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java
index a3d2e4b4d..ef461769e 100644
--- a/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java
+++ b/Settings/src/com/android/tv/settings/name/DeviceNameSuggestionActivity.java
@@ -22,6 +22,8 @@ import android.os.Bundle;
 import androidx.fragment.app.FragmentActivity;
 import androidx.leanback.app.GuidedStepSupportFragment;
 
+import com.android.tv.settings.overlay.FlavorUtils;
+
 /**
  * Entry activity for settings suggestions.
  */
@@ -33,5 +35,11 @@ public class DeviceNameSuggestionActivity extends FragmentActivity {
             GuidedStepSupportFragment.addAsRoot(this, DeviceNameSetFragment.newInstance(),
                     android.R.id.content);
         }
+
+        // Activity transitions from two panel settings look weird, disable.
+        if (FlavorUtils.isTwoPanel(this)) {
+            overrideActivityTransition(OVERRIDE_TRANSITION_OPEN, 0, 0);
+            overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, 0);
+        }
     }
 }
diff --git a/Settings/src/com/android/tv/settings/system/BaseSecurityFragment.java b/Settings/src/com/android/tv/settings/system/BaseSecurityFragment.java
new file mode 100644
index 000000000..f5e3a186c
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/system/BaseSecurityFragment.java
@@ -0,0 +1,403 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.tv.settings.system;
+
+import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected;
+
+import android.accounts.AccountManager;
+import android.annotation.SuppressLint;
+import android.app.admin.DevicePolicyManager;
+import android.app.tvsettings.TvSettingsEnums;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.Keep;
+import androidx.fragment.app.Fragment;
+import androidx.leanback.preference.LeanbackSettingsFragmentCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
+import com.android.tv.settings.R;
+import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.settings.dialog.PinDialogFragment;
+import com.android.tv.settings.users.AppRestrictionsFragment;
+import com.android.tv.settings.users.RestrictedProfileModel;
+import com.android.tv.settings.users.RestrictedProfilePinDialogFragment;
+import com.android.tv.settings.users.RestrictedProfilePinStorage;
+import com.android.tv.settings.users.UserSwitchListenerService;
+import com.android.tv.twopanelsettings.TwoPanelSettingsFragment;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+
+/**
+ * Base fragment for security settings.
+ */
+abstract class BaseSecurityFragment extends SettingsPreferenceFragment
+        implements PinDialogFragment.ResultListener {
+
+    private static final String TAG = "BaseSecurityFragment";
+
+    protected static final String KEY_UNKNOWN_SOURCES = "unknown_sources";
+    protected static final String KEY_RESTRICTED_PROFILE_GROUP = "restricted_profile_group";
+    protected static final String KEY_RESTRICTED_PROFILE_ENTER = "restricted_profile_enter";
+    protected static final String KEY_RESTRICTED_PROFILE_EXIT = "restricted_profile_exit";
+    protected static final String KEY_RESTRICTED_PROFILE_APPS = "restricted_profile_apps";
+    protected static final String KEY_RESTRICTED_PROFILE_PIN = "restricted_profile_pin";
+    protected static final String KEY_RESTRICTED_PROFILE_CREATE = "restricted_profile_create";
+    protected static final String KEY_RESTRICTED_PROFILE_DELETE = "restricted_profile_delete";
+    protected static final String KEY_RESTRICTED_PROFILE_SKIP = "restricted_profile_skip";
+    protected static final String KEY_MANAGE_DEVICE_ADMIN = "manage_device_admin";
+    protected static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
+
+    private static final String ACTION_RESTRICTED_PROFILE_CREATED =
+            "SecurityFragment.RESTRICTED_PROFILE_CREATED";
+    private static final String EXTRA_RESTRICTED_PROFILE_INFO =
+            "SecurityFragment.RESTRICTED_PROFILE_INFO";
+    private static final String SAVESTATE_CREATING_RESTRICTED_PROFILE =
+            "SecurityFragment.CREATING_RESTRICTED_PROFILE";
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({PIN_MODE_CHOOSE_LOCKSCREEN,
+            PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT,
+            PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD,
+            PIN_MODE_RESTRICTED_PROFILE_DELETE})
+    private @interface PinMode {}
+    private static final int PIN_MODE_CHOOSE_LOCKSCREEN = 1;
+    private static final int PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT = 2;
+    private static final int PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD = 3;
+    private static final int PIN_MODE_RESTRICTED_PROFILE_DELETE = 4;
+
+
+    protected RestrictedProfileModel mRestrictedProfile;
+
+    private boolean mCreatingRestrictedProfile;
+    private RestrictedProfilePinStorage mRestrictedProfilePinStorage;
+
+    @SuppressLint("StaticFieldLeak")
+    private static CreateRestrictedProfileTask sCreateRestrictedProfileTask;
+    private final BroadcastReceiver mRestrictedProfileReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            UserInfo result = intent.getParcelableExtra(EXTRA_RESTRICTED_PROFILE_INFO);
+            if (isResumed()) {
+                onRestrictedUserCreated(result);
+            }
+        }
+    };
+
+    private Handler mUiThreadHandler;
+    private HandlerThread mBackgroundHandlerThread;
+    private Handler mBackgroundHandler;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        mRestrictedProfile = new RestrictedProfileModel(getContext());
+
+        super.onCreate(savedInstanceState);
+        mCreatingRestrictedProfile = savedInstanceState != null
+                && savedInstanceState.getBoolean(SAVESTATE_CREATING_RESTRICTED_PROFILE);
+
+        mUiThreadHandler = new Handler();
+        mBackgroundHandlerThread = new HandlerThread("SecurityFragmentBackgroundThread");
+        mBackgroundHandlerThread.start();
+        mBackgroundHandler = new Handler(mBackgroundHandlerThread.getLooper());
+    }
+
+    @Override
+    public void onDestroy() {
+        mBackgroundHandler = null;
+        mBackgroundHandlerThread.quitSafely();
+        mBackgroundHandlerThread = null;
+        mUiThreadHandler = null;
+
+        super.onDestroy();
+
+        mRestrictedProfile = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refresh();
+        LocalBroadcastManager.getInstance(getActivity())
+                .registerReceiver(mRestrictedProfileReceiver,
+                        new IntentFilter(ACTION_RESTRICTED_PROFILE_CREATED));
+        if (mCreatingRestrictedProfile) {
+            UserInfo userInfo = mRestrictedProfile.getUser();
+            if (userInfo != null) {
+                onRestrictedUserCreated(userInfo);
+            }
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        LocalBroadcastManager.getInstance(getActivity())
+                .unregisterReceiver(mRestrictedProfileReceiver);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mRestrictedProfilePinStorage = RestrictedProfilePinStorage.newInstance(getContext());
+        mRestrictedProfilePinStorage.bind();
+    }
+
+    @Override
+    public void onDetach() {
+        mRestrictedProfilePinStorage.unbind();
+        mRestrictedProfilePinStorage = null;
+        super.onDetach();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(SAVESTATE_CREATING_RESTRICTED_PROFILE, mCreatingRestrictedProfile);
+    }
+
+
+    abstract protected void refresh();
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        final String key = preference.getKey();
+        if (TextUtils.isEmpty(key)) {
+            return super.onPreferenceTreeClick(preference);
+        }
+        switch (key) {
+            case KEY_RESTRICTED_PROFILE_ENTER:
+                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_ENTER_PROFILE);
+                if (mRestrictedProfile.enterUser()) {
+                    getActivity().finish();
+                }
+                return true;
+            case KEY_RESTRICTED_PROFILE_EXIT:
+                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_EXIT_PROFILE);
+                launchPinDialog(PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT);
+                return true;
+            case KEY_RESTRICTED_PROFILE_PIN:
+                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_PROFILE_CHANGE_PIN);
+                launchPinDialog(PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD);
+                return true;
+            case KEY_RESTRICTED_PROFILE_CREATE:
+                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_CREATE_PROFILE);
+                createRestrictedProfile();
+                return true;
+            case KEY_RESTRICTED_PROFILE_DELETE:
+                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_DELETE_PROFILE);
+                launchPinDialog(PIN_MODE_RESTRICTED_PROFILE_DELETE);
+                return true;
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    private void createRestrictedProfile() {
+        mBackgroundHandler.post(() -> {
+            boolean pinIsSet = mRestrictedProfilePinStorage.isPinSet();
+
+            mUiThreadHandler.post(() -> {
+                if (pinIsSet) {
+                    addRestrictedUser();
+                } else {
+                    launchPinDialog(PIN_MODE_CHOOSE_LOCKSCREEN);
+                }
+            });
+        });
+    }
+
+    private void launchPinDialog(@PinMode int pinMode) {
+        @PinDialogFragment.PinDialogType
+        int pinDialogMode;
+
+        switch (pinMode) {
+            case PIN_MODE_CHOOSE_LOCKSCREEN:
+                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_NEW_PIN;
+                break;
+            case PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT:
+                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_ENTER_PIN;
+                break;
+            case PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD:
+                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_NEW_PIN;
+                break;
+            case PIN_MODE_RESTRICTED_PROFILE_DELETE:
+                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_DELETE_PIN;
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown pin mode: " + pinMode);
+        }
+
+        RestrictedProfilePinDialogFragment restrictedProfilePinDialogFragment =
+                RestrictedProfilePinDialogFragment.newInstance(pinDialogMode);
+        restrictedProfilePinDialogFragment.setTargetFragment(this, pinMode);
+        restrictedProfilePinDialogFragment.show(getFragmentManager(),
+                PinDialogFragment.DIALOG_TAG);
+    }
+
+    @Override
+    public void pinFragmentDone(int requestCode, boolean success) {
+        if (!success) {
+            Log.d(TAG, "Request " + requestCode + " unsuccessful.");
+            return;
+        }
+
+        switch (requestCode) {
+            case PIN_MODE_CHOOSE_LOCKSCREEN:
+                addRestrictedUser();
+                break;
+            case PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT:
+                mRestrictedProfile.exitUser();
+                mUiThreadHandler.post(() -> getActivity().finish());
+                break;
+            case PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD:
+                // do nothing
+                break;
+            case PIN_MODE_RESTRICTED_PROFILE_DELETE:
+                mUiThreadHandler.post(() -> {
+                    mRestrictedProfile.removeUser();
+                    UserSwitchListenerService.onUserCreatedOrDeleted(getActivity());
+                    refresh();
+                });
+                break;
+            default:
+                Log.d(TAG, "Pin request code not recognised: " + requestCode);
+        }
+    }
+
+    private void addRestrictedUser() {
+        if (sCreateRestrictedProfileTask == null) {
+            sCreateRestrictedProfileTask = new CreateRestrictedProfileTask(getContext());
+            sCreateRestrictedProfileTask.execute();
+            mCreatingRestrictedProfile = true;
+        }
+        refresh();
+    }
+
+    private void onRestrictedUserCreated(UserInfo result) {
+        int userId = result.id;
+        if (result.isRestricted()
+                && result.restrictedProfileParentId == UserHandle.myUserId()) {
+            final AppRestrictionsFragment restrictionsFragment =
+                    AppRestrictionsFragment.newInstance(userId, true,
+                            shouldExitAfterUpdatingApps());
+            final Fragment settingsFragment = getCallbackFragment();
+            if (settingsFragment instanceof LeanbackSettingsFragmentCompat) {
+                ((LeanbackSettingsFragmentCompat) settingsFragment)
+                        .startPreferenceFragment(restrictionsFragment);
+            } else if (settingsFragment instanceof TwoPanelSettingsFragment) {
+                ((TwoPanelSettingsFragment) settingsFragment)
+                        .startPreferenceFragment(restrictionsFragment);
+            } else {
+                throw new IllegalStateException("Didn't find fragment of expected type: "
+                        + settingsFragment);
+            }
+        }
+        mCreatingRestrictedProfile = false;
+        refresh();
+    }
+
+    protected boolean shouldExitAfterUpdatingApps() {
+        return false;
+    }
+
+    private static class CreateRestrictedProfileTask extends AsyncTask<Void, Void, UserInfo> {
+        private final Context mContext;
+        private final UserManager mUserManager;
+
+        CreateRestrictedProfileTask(Context context) {
+            mContext = context.getApplicationContext();
+            mUserManager = mContext.getSystemService(UserManager.class);
+        }
+
+        @Override
+        protected UserInfo doInBackground(Void... params) {
+            UserInfo restrictedUserInfo = mUserManager.createProfileForUser(
+                    mContext.getString(R.string.user_new_profile_name),
+                    UserManager.USER_TYPE_FULL_RESTRICTED, /* flags */ 0, UserHandle.myUserId());
+            if (restrictedUserInfo == null) {
+                final UserInfo existingUserInfo = new RestrictedProfileModel(mContext).getUser();
+                if (existingUserInfo == null) {
+                    Log.wtf(TAG, "Got back a null user handle!");
+                }
+                return existingUserInfo;
+            }
+            int userId = restrictedUserInfo.id;
+            UserHandle user = new UserHandle(userId);
+            mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user);
+            Bitmap bitmap = createBitmapFromDrawable(R.drawable.ic_avatar_default);
+            mUserManager.setUserIcon(userId, bitmap);
+            // Add shared accounts
+            AccountManager.get(mContext).addSharedAccountsFromParentUser(
+                    UserHandle.of(UserHandle.myUserId()), user);
+            return restrictedUserInfo;
+        }
+
+        @Override
+        protected void onPostExecute(UserInfo result) {
+            sCreateRestrictedProfileTask = null;
+            if (result == null) {
+                return;
+            }
+            UserSwitchListenerService.onUserCreatedOrDeleted(mContext);
+            LocalBroadcastManager.getInstance(mContext).sendBroadcast(
+                    new Intent(ACTION_RESTRICTED_PROFILE_CREATED)
+                            .putExtra(EXTRA_RESTRICTED_PROFILE_INFO, result));
+        }
+
+        private Bitmap createBitmapFromDrawable(@DrawableRes int resId) {
+            Drawable icon = mContext.getDrawable(resId);
+            if (icon == null) {
+                throw new IllegalArgumentException("Drawable is missing!");
+            }
+            icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
+            Bitmap bitmap = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(),
+                    Bitmap.Config.ARGB_8888);
+            icon.draw(new Canvas(bitmap));
+            return bitmap;
+        }
+    }
+
+    protected boolean isRestrictedProfileCreationInProgress() {
+        return sCreateRestrictedProfileTask != null;
+    }
+
+    @Override
+    protected int getPageId() {
+        return TvSettingsEnums.APPS_SECURITY_RESTRICTIONS;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/system/CaptionSetupActivity.java b/Settings/src/com/android/tv/settings/system/CaptionSetupActivity.java
index c50094f8a..e51c554c5 100644
--- a/Settings/src/com/android/tv/settings/system/CaptionSetupActivity.java
+++ b/Settings/src/com/android/tv/settings/system/CaptionSetupActivity.java
@@ -27,7 +27,7 @@ public class CaptionSetupActivity extends FragmentActivity {
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction()
                     .add(android.R.id.content, CaptionSettingsFragment.newInstance())
-                    .commit();
+                    .commitAllowingStateLoss();
         }
     }
 }
diff --git a/Settings/src/com/android/tv/settings/system/CreateRestrictedProfileActivity.java b/Settings/src/com/android/tv/settings/system/CreateRestrictedProfileActivity.java
new file mode 100644
index 000000000..7f88cb0da
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/system/CreateRestrictedProfileActivity.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.settings.system;
+
+import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_CLASSIC;
+
+import android.os.Bundle;
+
+import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.tv.settings.TvSettingsActivity;
+
+/**
+ * A subset of security settings to create a restricted profile.
+ */
+@Keep
+public class CreateRestrictedProfileActivity extends TvSettingsActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().setDimAmount(0f);
+    }
+
+    @Override
+    protected Fragment createSettingsFragment() {
+        return com.android.tv.settings.overlay.FlavorUtils.getFeatureFactory(
+                this).getSettingsFragmentProvider()
+                .newSettingsFragment(CreateRestrictedProfileFragment.class.getName(), null);
+    }
+
+    @Override
+    protected int getAvailableFlavors() {
+        return FLAVOR_CLASSIC;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/system/CreateRestrictedProfileFragment.java b/Settings/src/com/android/tv/settings/system/CreateRestrictedProfileFragment.java
new file mode 100644
index 000000000..595366727
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/system/CreateRestrictedProfileFragment.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.tv.settings.system;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserManager;
+
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+
+import com.android.tv.settings.R;
+import com.android.tv.settings.users.RestrictedProfileModel;
+
+/**
+ * A subset of security settings to create a restricted profile.
+ */
+@Keep
+public class CreateRestrictedProfileFragment extends BaseSecurityFragment {
+    private static final String KEY_RESTRICTED_PROFILE_ALREADY_CREATED =
+            "restricted_profile_already_created";
+
+    private Preference mRestrictedProfileCreatePref;
+    private Preference mRestrictedProfileAlreadyCreatedPref;
+
+    public static CreateRestrictedProfileFragment newInstance() {
+        return new CreateRestrictedProfileFragment();
+    }
+
+    /**
+     * Called by other Fragments to decide whether to show or hide profile-related views.
+     */
+    public static boolean isRestrictedProfileInEffect(Context context) {
+        return new RestrictedProfileModel(context).isCurrentUser();
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.create_restricted_profile, null);
+        mRestrictedProfileCreatePref = findPreference(KEY_RESTRICTED_PROFILE_CREATE);
+        mRestrictedProfileAlreadyCreatedPref = findPreference(
+                KEY_RESTRICTED_PROFILE_ALREADY_CREATED);
+        refresh();
+    }
+
+    @Override
+    protected void refresh() {
+        mRestrictedProfileCreatePref.setEnabled(
+                UserManager.supportsMultipleUsers() && !isRestrictedProfileCreationInProgress());
+        if (mRestrictedProfile.getUser() != null) {
+            mRestrictedProfileAlreadyCreatedPref.setVisible(true);
+            mRestrictedProfileCreatePref.setVisible(false);
+        } else {
+            mRestrictedProfileAlreadyCreatedPref.setVisible(false);
+            mRestrictedProfileCreatePref.setVisible(true);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        final String key = preference.getKey();
+        if (KEY_RESTRICTED_PROFILE_SKIP.equals(key)) {
+            requireActivity().setResult(Activity.RESULT_CANCELED);
+            requireActivity().finish();
+            return true;
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    @Override
+    protected boolean shouldExitAfterUpdatingApps() {
+        return true;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/system/EnterRestrictedProfileActivity.java b/Settings/src/com/android/tv/settings/system/EnterRestrictedProfileActivity.java
new file mode 100644
index 000000000..6587b6b64
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/system/EnterRestrictedProfileActivity.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.settings.system;
+
+import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_CLASSIC;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.android.tv.settings.TvSettingsActivity;
+
+/**
+ * A subset of security settings to enter a restricted profile.
+ */
+public class EnterRestrictedProfileActivity extends TvSettingsActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().setDimAmount(0f);
+    }
+
+    @Override
+    protected Fragment createSettingsFragment() {
+        return com.android.tv.settings.overlay.FlavorUtils.getFeatureFactory(this)
+                .getSettingsFragmentProvider()
+                .newSettingsFragment(EnterRestrictedProfileFragment.class.getName(), null);
+    }
+
+    @Override
+    protected int getAvailableFlavors() {
+        return FLAVOR_CLASSIC;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/system/EnterRestrictedProfileFragment.java b/Settings/src/com/android/tv/settings/system/EnterRestrictedProfileFragment.java
new file mode 100644
index 000000000..11e0a0f45
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/system/EnterRestrictedProfileFragment.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.tv.settings.system;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.Keep;
+import androidx.preference.Preference;
+
+import com.android.tv.settings.R;
+import com.android.tv.settings.users.RestrictedProfileModel;
+
+/**
+ * A subset of security settings to enter a restricted profile.
+ */
+@Keep
+public class EnterRestrictedProfileFragment extends BaseSecurityFragment {
+    private static final String KEY_RESTRICTED_PROFILE_NOT_FOUND =
+            "restricted_profile_not_found";
+    private static final String KEY_RESTRICTED_PROFILE_ALREADY_ENTERED =
+            "restricted_profile_already_entered";
+
+    private Preference mRestrictedProfileEnterPref;
+    private Preference mRestrictedProfileNotFoundPerf;
+    private Preference mRestrictedProfileAlreadyEnteredPerf;
+
+    public static EnterRestrictedProfileFragment newInstance() {
+        return new EnterRestrictedProfileFragment();
+    }
+
+    /**
+     * Called by other Fragments to decide whether to show or hide profile-related views.
+     */
+    public static boolean isRestrictedProfileInEffect(Context context) {
+        return new RestrictedProfileModel(context).isCurrentUser();
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.enter_restricted_profile, null);
+        mRestrictedProfileEnterPref = findPreference(KEY_RESTRICTED_PROFILE_ENTER);
+        mRestrictedProfileNotFoundPerf = findPreference(KEY_RESTRICTED_PROFILE_NOT_FOUND);
+        mRestrictedProfileAlreadyEnteredPerf = findPreference(
+                KEY_RESTRICTED_PROFILE_ALREADY_ENTERED);
+        refresh();
+    }
+
+    @Override
+    protected void refresh() {
+        if (mRestrictedProfile.isCurrentUser()) {
+            mRestrictedProfileAlreadyEnteredPerf.setVisible(true);
+            mRestrictedProfileNotFoundPerf.setVisible(false);
+            mRestrictedProfileEnterPref.setVisible(false);
+        } else if (mRestrictedProfile.getUser() == null) {
+            mRestrictedProfileAlreadyEnteredPerf.setVisible(false);
+            mRestrictedProfileNotFoundPerf.setVisible(true);
+            mRestrictedProfileEnterPref.setVisible(false);
+        } else {
+            mRestrictedProfileAlreadyEnteredPerf.setVisible(false);
+            mRestrictedProfileNotFoundPerf.setVisible(false);
+            mRestrictedProfileEnterPref.setVisible(true);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        final String key = preference.getKey();
+        if (KEY_RESTRICTED_PROFILE_SKIP.equals(key)) {
+            requireActivity().setResult(Activity.RESULT_CANCELED);
+            requireActivity().finish();
+            return true;
+        }
+        requireActivity().setResult(Activity.RESULT_OK); // For enter.
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    @Override
+    protected boolean shouldExitAfterUpdatingApps() {
+        return true;
+    }
+}
diff --git a/Settings/src/com/android/tv/settings/system/SecurityFragment.java b/Settings/src/com/android/tv/settings/system/SecurityFragment.java
index 56f296934..667b44855 100644
--- a/Settings/src/com/android/tv/settings/system/SecurityFragment.java
+++ b/Settings/src/com/android/tv/settings/system/SecurityFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2023 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,91 +16,27 @@
 
 package com.android.tv.settings.system;
 
-import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected;
-
-import android.accounts.AccountManager;
-import android.annotation.SuppressLint;
 import android.app.admin.DevicePolicyManager;
-import android.app.tvsettings.TvSettingsEnums;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.UserInfo;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.UserHandle;
 import android.os.UserManager;
-import android.text.TextUtils;
-import android.util.Log;
 
-import androidx.annotation.DrawableRes;
-import androidx.annotation.IntDef;
 import androidx.annotation.Keep;
-import androidx.fragment.app.Fragment;
-import androidx.leanback.preference.LeanbackSettingsFragmentCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 
 import com.android.tv.settings.R;
-import com.android.tv.settings.SettingsPreferenceFragment;
-import com.android.tv.settings.dialog.PinDialogFragment;
 import com.android.tv.settings.users.AppRestrictionsFragment;
 import com.android.tv.settings.users.RestrictedProfileModel;
-import com.android.tv.settings.users.RestrictedProfilePinDialogFragment;
-import com.android.tv.settings.users.RestrictedProfilePinStorage;
-import com.android.tv.settings.users.UserSwitchListenerService;
-import com.android.tv.twopanelsettings.TwoPanelSettingsFragment;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.List;
 
 /**
  * The security settings screen in Tv settings.
  */
 @Keep
-public class SecurityFragment extends SettingsPreferenceFragment
-        implements PinDialogFragment.ResultListener {
-
-    private static final String TAG = "SecurityFragment";
-
-    private static final String KEY_UNKNOWN_SOURCES = "unknown_sources";
-    private static final String KEY_RESTRICTED_PROFILE_GROUP = "restricted_profile_group";
-    private static final String KEY_RESTRICTED_PROFILE_ENTER = "restricted_profile_enter";
-    private static final String KEY_RESTRICTED_PROFILE_EXIT = "restricted_profile_exit";
-    private static final String KEY_RESTRICTED_PROFILE_APPS = "restricted_profile_apps";
-    private static final String KEY_RESTRICTED_PROFILE_PIN = "restricted_profile_pin";
-    private static final String KEY_RESTRICTED_PROFILE_CREATE = "restricted_profile_create";
-    private static final String KEY_RESTRICTED_PROFILE_DELETE = "restricted_profile_delete";
-    private static final String KEY_MANAGE_DEVICE_ADMIN = "manage_device_admin";
-    private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
-
-    private static final String ACTION_RESTRICTED_PROFILE_CREATED =
-            "SecurityFragment.RESTRICTED_PROFILE_CREATED";
-    private static final String EXTRA_RESTRICTED_PROFILE_INFO =
-            "SecurityFragment.RESTRICTED_PROFILE_INFO";
-    private static final String SAVESTATE_CREATING_RESTRICTED_PROFILE =
-            "SecurityFragment.CREATING_RESTRICTED_PROFILE";
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({PIN_MODE_CHOOSE_LOCKSCREEN,
-            PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT,
-            PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD,
-            PIN_MODE_RESTRICTED_PROFILE_DELETE})
-    private @interface PinMode {}
-    private static final int PIN_MODE_CHOOSE_LOCKSCREEN = 1;
-    private static final int PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT = 2;
-    private static final int PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD = 3;
-    private static final int PIN_MODE_RESTRICTED_PROFILE_DELETE = 4;
-
+public class SecurityFragment extends BaseSecurityFragment {
     private Preference mUnknownSourcesPref;
     private PreferenceGroup mRestrictedProfileGroup;
     private Preference mRestrictedProfileEnterPref;
@@ -113,97 +49,15 @@ public class SecurityFragment extends SettingsPreferenceFragment
     private Preference mManageDeviceAdminPref;
     private Preference mEnterprisePrivacyPref;
 
-    private RestrictedProfileModel mRestrictedProfile;
-
-    private boolean mCreatingRestrictedProfile;
-    private RestrictedProfilePinStorage mRestrictedProfilePinStorage;
-
-    @SuppressLint("StaticFieldLeak")
-    private static CreateRestrictedProfileTask sCreateRestrictedProfileTask;
-    private final BroadcastReceiver mRestrictedProfileReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            UserInfo result = intent.getParcelableExtra(EXTRA_RESTRICTED_PROFILE_INFO);
-            if (isResumed()) {
-                onRestrictedUserCreated(result);
-            }
-        }
-    };
-
-    private Handler mUiThreadHandler;
-    private HandlerThread mBackgroundHandlerThread;
-    private Handler mBackgroundHandler;
-
     public static SecurityFragment newInstance() {
         return new SecurityFragment();
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mRestrictedProfile = new RestrictedProfileModel(getContext());
-
-        super.onCreate(savedInstanceState);
-        mCreatingRestrictedProfile = savedInstanceState != null
-                && savedInstanceState.getBoolean(SAVESTATE_CREATING_RESTRICTED_PROFILE);
-
-        mUiThreadHandler = new Handler();
-        mBackgroundHandlerThread = new HandlerThread("SecurityFragmentBackgroundThread");
-        mBackgroundHandlerThread.start();
-        mBackgroundHandler = new Handler(mBackgroundHandlerThread.getLooper());
-    }
-
-    @Override
-    public void onDestroy() {
-        mBackgroundHandler = null;
-        mBackgroundHandlerThread.quitSafely();
-        mBackgroundHandlerThread = null;
-        mUiThreadHandler = null;
-
-        super.onDestroy();
-
-        mRestrictedProfile = null;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        refresh();
-        LocalBroadcastManager.getInstance(getActivity())
-                .registerReceiver(mRestrictedProfileReceiver,
-                        new IntentFilter(ACTION_RESTRICTED_PROFILE_CREATED));
-        if (mCreatingRestrictedProfile) {
-            UserInfo userInfo = mRestrictedProfile.getUser();
-            if (userInfo != null) {
-                onRestrictedUserCreated(userInfo);
-            }
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        LocalBroadcastManager.getInstance(getActivity())
-                .unregisterReceiver(mRestrictedProfileReceiver);
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mRestrictedProfilePinStorage = RestrictedProfilePinStorage.newInstance(getContext());
-        mRestrictedProfilePinStorage.bind();
-    }
-
-    @Override
-    public void onDetach() {
-        mRestrictedProfilePinStorage.unbind();
-        mRestrictedProfilePinStorage = null;
-        super.onDetach();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(SAVESTATE_CREATING_RESTRICTED_PROFILE, mCreatingRestrictedProfile);
+    /**
+     * Called by other Fragments to decide whether to show or hide profile-related views.
+     */
+    public static boolean isRestrictedProfileInEffect(Context context) {
+        return new RestrictedProfileModel(context).isCurrentUser();
     }
 
     @Override
@@ -221,9 +75,11 @@ public class SecurityFragment extends SettingsPreferenceFragment
 
         mManageDeviceAdminPref = findPreference(KEY_MANAGE_DEVICE_ADMIN);
         mEnterprisePrivacyPref = findPreference(KEY_ENTERPRISE_PRIVACY);
+        refresh();
     }
 
-    private void refresh() {
+    @Override
+    protected void refresh() {
         if (mRestrictedProfile.isCurrentUser()) {
             // We are in restricted profile
             mUnknownSourcesPref.setVisible(false);
@@ -248,7 +104,7 @@ public class SecurityFragment extends SettingsPreferenceFragment
             mRestrictedProfileDeletePref.setVisible(true);
 
             AppRestrictionsFragment.prepareArgs(mRestrictedProfileAppsPref.getExtras(),
-                    mRestrictedProfile.getUser().id, false);
+                    mRestrictedProfile.getUser().id, false, false);
         } else if (UserManager.supportsMultipleUsers()) {
             // Not in restricted profile, and it doesn't exist
             mUnknownSourcesPref.setVisible(true);
@@ -273,7 +129,8 @@ public class SecurityFragment extends SettingsPreferenceFragment
             mRestrictedProfileDeletePref.setVisible(false);
         }
 
-        mRestrictedProfileCreatePref.setEnabled(sCreateRestrictedProfileTask == null);
+        mRestrictedProfileCreatePref.setEnabled(
+                !isRestrictedProfileCreationInProgress());
 
         mUnknownSourcesPref.setEnabled(!isUnknownSourcesBlocked());
 
@@ -281,53 +138,6 @@ public class SecurityFragment extends SettingsPreferenceFragment
         mEnterprisePrivacyPref.setVisible(isDeviceManaged());
     }
 
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        final String key = preference.getKey();
-        if (TextUtils.isEmpty(key)) {
-            return super.onPreferenceTreeClick(preference);
-        }
-        switch (key) {
-            case KEY_RESTRICTED_PROFILE_ENTER:
-                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_ENTER_PROFILE);
-                if (mRestrictedProfile.enterUser()) {
-                    getActivity().finish();
-                }
-                return true;
-            case KEY_RESTRICTED_PROFILE_EXIT:
-                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_EXIT_PROFILE);
-                launchPinDialog(PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT);
-                return true;
-            case KEY_RESTRICTED_PROFILE_PIN:
-                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_PROFILE_CHANGE_PIN);
-                launchPinDialog(PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD);
-                return true;
-            case KEY_RESTRICTED_PROFILE_CREATE:
-                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_CREATE_PROFILE);
-                createRestrictedProfile();
-                return true;
-            case KEY_RESTRICTED_PROFILE_DELETE:
-                logEntrySelected(TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_DELETE_PROFILE);
-                launchPinDialog(PIN_MODE_RESTRICTED_PROFILE_DELETE);
-                return true;
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    private void createRestrictedProfile() {
-        mBackgroundHandler.post(() -> {
-            boolean pinIsSet = mRestrictedProfilePinStorage.isPinSet();
-
-            mUiThreadHandler.post(() -> {
-                if (pinIsSet) {
-                    addRestrictedUser();
-                } else {
-                    launchPinDialog(PIN_MODE_CHOOSE_LOCKSCREEN);
-                }
-            });
-        });
-    }
-
     private boolean isUnknownSourcesBlocked() {
         final UserManager um = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
         return um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
@@ -345,162 +155,4 @@ public class SecurityFragment extends SettingsPreferenceFragment
         final List<ComponentName> admins = devicePolicyManager.getActiveAdmins();
         return (admins != null && !admins.isEmpty());
     }
-
-    private void launchPinDialog(@PinMode int pinMode) {
-        @PinDialogFragment.PinDialogType
-        int pinDialogMode;
-
-        switch (pinMode) {
-            case PIN_MODE_CHOOSE_LOCKSCREEN:
-                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_NEW_PIN;
-                break;
-            case PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT:
-                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_ENTER_PIN;
-                break;
-            case PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD:
-                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_NEW_PIN;
-                break;
-            case PIN_MODE_RESTRICTED_PROFILE_DELETE:
-                pinDialogMode = PinDialogFragment.PIN_DIALOG_TYPE_DELETE_PIN;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown pin mode: " + pinMode);
-        }
-
-        RestrictedProfilePinDialogFragment restrictedProfilePinDialogFragment =
-                RestrictedProfilePinDialogFragment.newInstance(pinDialogMode);
-        restrictedProfilePinDialogFragment.setTargetFragment(this, pinMode);
-        restrictedProfilePinDialogFragment.show(getFragmentManager(),
-                PinDialogFragment.DIALOG_TAG);
-    }
-
-    @Override
-    public void pinFragmentDone(int requestCode, boolean success) {
-        if (!success) {
-            Log.d(TAG, "Request " + requestCode + " unsuccessful.");
-            return;
-        }
-
-        switch (requestCode) {
-            case PIN_MODE_CHOOSE_LOCKSCREEN:
-                addRestrictedUser();
-                break;
-            case PIN_MODE_RESTRICTED_PROFILE_SWITCH_OUT:
-                mRestrictedProfile.exitUser();
-                mUiThreadHandler.post(() -> getActivity().finish());
-                break;
-            case PIN_MODE_RESTRICTED_PROFILE_CHANGE_PASSWORD:
-                // do nothing
-                break;
-            case PIN_MODE_RESTRICTED_PROFILE_DELETE:
-                mUiThreadHandler.post(() -> {
-                    mRestrictedProfile.removeUser();
-                    UserSwitchListenerService.onUserCreatedOrDeleted(getActivity());
-                    refresh();
-                });
-                break;
-            default:
-                Log.d(TAG, "Pin request code not recognised: " + requestCode);
-        }
-    }
-
-    private void addRestrictedUser() {
-        if (sCreateRestrictedProfileTask == null) {
-            sCreateRestrictedProfileTask = new CreateRestrictedProfileTask(getContext());
-            sCreateRestrictedProfileTask.execute();
-            mCreatingRestrictedProfile = true;
-        }
-        refresh();
-    }
-
-    /**
-      * Called by other Fragments to decide whether to show or hide profile-related views.
-      */
-    public static boolean isRestrictedProfileInEffect(Context context) {
-        return new RestrictedProfileModel(context).isCurrentUser();
-    }
-
-    private void onRestrictedUserCreated(UserInfo result) {
-        int userId = result.id;
-        if (result.isRestricted()
-                && result.restrictedProfileParentId == UserHandle.myUserId()) {
-            final AppRestrictionsFragment restrictionsFragment =
-                    AppRestrictionsFragment.newInstance(userId, true);
-            final Fragment settingsFragment = getCallbackFragment();
-            if (settingsFragment instanceof LeanbackSettingsFragmentCompat) {
-                ((LeanbackSettingsFragmentCompat) settingsFragment)
-                        .startPreferenceFragment(restrictionsFragment);
-            } else if (settingsFragment instanceof TwoPanelSettingsFragment) {
-                ((TwoPanelSettingsFragment) settingsFragment)
-                        .startPreferenceFragment(restrictionsFragment);
-            } else {
-                throw new IllegalStateException("Didn't find fragment of expected type: "
-                        + settingsFragment);
-            }
-        }
-        mCreatingRestrictedProfile = false;
-        refresh();
-    }
-
-    private static class CreateRestrictedProfileTask extends AsyncTask<Void, Void, UserInfo> {
-        private final Context mContext;
-        private final UserManager mUserManager;
-
-        CreateRestrictedProfileTask(Context context) {
-            mContext = context.getApplicationContext();
-            mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
-        }
-
-        @Override
-        protected UserInfo doInBackground(Void... params) {
-            UserInfo restrictedUserInfo = mUserManager.createProfileForUser(
-                    mContext.getString(R.string.user_new_profile_name),
-                    UserManager.USER_TYPE_FULL_RESTRICTED, /* flags */ 0, UserHandle.myUserId());
-            if (restrictedUserInfo == null) {
-                final UserInfo existingUserInfo = new RestrictedProfileModel(mContext).getUser();
-                if (existingUserInfo == null) {
-                    Log.wtf(TAG, "Got back a null user handle!");
-                }
-                return existingUserInfo;
-            }
-            int userId = restrictedUserInfo.id;
-            UserHandle user = new UserHandle(userId);
-            mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user);
-            Bitmap bitmap = createBitmapFromDrawable(R.drawable.ic_avatar_default);
-            mUserManager.setUserIcon(userId, bitmap);
-            // Add shared accounts
-            AccountManager.get(mContext).addSharedAccountsFromParentUser(
-                    UserHandle.of(UserHandle.myUserId()), user);
-            return restrictedUserInfo;
-        }
-
-        @Override
-        protected void onPostExecute(UserInfo result) {
-            sCreateRestrictedProfileTask = null;
-            if (result == null) {
-                return;
-            }
-            UserSwitchListenerService.onUserCreatedOrDeleted(mContext);
-            LocalBroadcastManager.getInstance(mContext).sendBroadcast(
-                    new Intent(ACTION_RESTRICTED_PROFILE_CREATED)
-                            .putExtra(EXTRA_RESTRICTED_PROFILE_INFO, result));
-        }
-
-        private Bitmap createBitmapFromDrawable(@DrawableRes int resId) {
-            Drawable icon = mContext.getDrawable(resId);
-            if (icon == null) {
-                throw new IllegalArgumentException("Drawable is missing!");
-            }
-            icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
-            Bitmap bitmap = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(),
-                    Bitmap.Config.ARGB_8888);
-            icon.draw(new Canvas(bitmap));
-            return bitmap;
-        }
-    }
-
-    @Override
-    protected int getPageId() {
-        return TvSettingsEnums.APPS_SECURITY_RESTRICTIONS;
-    }
 }
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
index f92975e2f..a07b2a826 100644
--- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -75,7 +75,7 @@ import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
 
 import com.android.internal.app.LocalePicker;
 import com.android.settingslib.core.ConfirmationDialogController;
@@ -198,16 +198,16 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
     private boolean mLastEnabledState;
     private boolean mHaveDebugSettings;
 
-    private SwitchPreference mEnableDeveloper;
-    private SwitchPreference mEnableAdb;
+    private TwoStatePreference mEnableDeveloper;
+    private TwoStatePreference mEnableAdb;
     private Preference mClearAdbKeys;
-    private SwitchPreference mEnableTerminal;
+    private TwoStatePreference mEnableTerminal;
     private Preference mBugreport;
-    private SwitchPreference mKeepScreenOn;
+    private TwoStatePreference mKeepScreenOn;
     private ListPreference mBtHciSnoopLog;
     private OemUnlockPreferenceController mEnableOemUnlock;
-    private SwitchPreference mDebugViewAttributes;
-    private SwitchPreference mForceAllowOnExternal;
+    private TwoStatePreference mDebugViewAttributes;
+    private TwoStatePreference mForceAllowOnExternal;
 
     private PreferenceScreen mPassword;
     private String mDebugApp;
@@ -216,23 +216,23 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
     private String mMockLocationApp;
     private Preference mMockLocationAppPref;
 
-    private SwitchPreference mWaitForDebugger;
-    private SwitchPreference mVerifyAppsOverUsb;
-    private SwitchPreference mWifiDisplayCertification;
-    private SwitchPreference mWifiVerboseLogging;
-    private SwitchPreference mMobileDataAlwaysOn;
-
-    private SwitchPreference mStrictMode;
-    private SwitchPreference mPointerLocation;
-    private SwitchPreference mShowTouches;
-    private SwitchPreference mShowScreenUpdates;
-    private SwitchPreference mDisableOverlays;
-    private SwitchPreference mForceMsaa;
-    private SwitchPreference mShowHwScreenUpdates;
-    private SwitchPreference mShowHwLayersUpdates;
-    private SwitchPreference mDebugLayout;
-    private SwitchPreference mForceRtlLayout;
-    private SwitchPreference mWindowBlurs;
+    private TwoStatePreference mWaitForDebugger;
+    private TwoStatePreference mVerifyAppsOverUsb;
+    private TwoStatePreference mWifiDisplayCertification;
+    private TwoStatePreference mWifiVerboseLogging;
+    private TwoStatePreference mMobileDataAlwaysOn;
+
+    private TwoStatePreference mStrictMode;
+    private TwoStatePreference mPointerLocation;
+    private TwoStatePreference mShowTouches;
+    private TwoStatePreference mShowScreenUpdates;
+    private TwoStatePreference mDisableOverlays;
+    private TwoStatePreference mForceMsaa;
+    private TwoStatePreference mShowHwScreenUpdates;
+    private TwoStatePreference mShowHwLayersUpdates;
+    private TwoStatePreference mDebugLayout;
+    private TwoStatePreference mForceRtlLayout;
+    private TwoStatePreference mWindowBlurs;
     private ListPreference mDebugHwOverdraw;
     private LogdSizePreferenceController mLogdSizeController;
     private LogpersistPreferenceController mLogpersistController;
@@ -247,9 +247,9 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
 
     private ListPreference mSimulateColorSpace;
 
-    private SwitchPreference mUSBAudio;
+    private TwoStatePreference mUSBAudio;
 
-    private SwitchPreference mRecordAudio;
+    private TwoStatePreference mRecordAudio;
     private Preference mPlayRecordedAudio;
     private Preference mSaveAudio;
     private Preference mTimeToStartRead;
@@ -257,22 +257,21 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
     private Preference mEmptyAudioDuration;
     private ListPreference mRecordAudioSource;
 
-    private SwitchPreference mImmediatelyDestroyActivities;
+    private TwoStatePreference mImmediatelyDestroyActivities;
 
     private ListPreference mAppProcessLimit;
 
-    private SwitchPreference mShowAllANRs;
+    private TwoStatePreference mShowAllANRs;
 
     private ColorModePreference mColorModePreference;
 
-    private SwitchPreference mForceResizable;
+    private TwoStatePreference mForceResizable;
 
     private Preference mWirelessDebugging;
 
     private final ArrayList<Preference> mAllPrefs = new ArrayList<>();
 
-    private final ArrayList<SwitchPreference> mResetSwitchPrefs
-            = new ArrayList<>();
+    private final ArrayList<TwoStatePreference> mResetSwitchPrefs = new ArrayList<>();
 
     private final HashSet<Preference> mDisabledPrefs = new HashSet<>();
 
@@ -349,7 +348,7 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
 
         // Don't add to prefs lists or it'll disable itself when switched off
-        mEnableDeveloper = (SwitchPreference) findPreference(ENABLE_DEVELOPER);
+        mEnableDeveloper = findPreference(ENABLE_DEVELOPER);
 
         final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
                 findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
@@ -458,15 +457,13 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
         mRecordAudioSource.setVisible(false);
         mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);
 
-        mImmediatelyDestroyActivities = (SwitchPreference) findPreference(
-                IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
+        mImmediatelyDestroyActivities = findPreference(IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
         mAllPrefs.add(mImmediatelyDestroyActivities);
         mResetSwitchPrefs.add(mImmediatelyDestroyActivities);
 
         mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY);
 
-        mShowAllANRs = (SwitchPreference) findPreference(
-                SHOW_ALL_ANRS_KEY);
+        mShowAllANRs = findPreference(SHOW_ALL_ANRS_KEY);
         mAllPrefs.add(mShowAllANRs);
         mResetSwitchPrefs.add(mShowAllANRs);
 
@@ -522,8 +519,8 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
         }
     }
 
-    private SwitchPreference findAndInitSwitchPref(String key) {
-        SwitchPreference pref = (SwitchPreference) findPreference(key);
+    private TwoStatePreference findAndInitSwitchPref(String key) {
+        TwoStatePreference pref = findPreference(key);
         if (pref == null) {
             throw new IllegalArgumentException("Cannot find preference with key = " + key);
         }
@@ -659,7 +656,7 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
         mContentResolver.unregisterContentObserver(mToggleContentObserver);
     }
 
-    void updateSwitchPreference(SwitchPreference switchPreference, boolean value) {
+    void updateSwitchPreference(TwoStatePreference switchPreference, boolean value) {
         switchPreference.setChecked(value);
         mHaveDebugSettings |= value;
     }
@@ -721,7 +718,7 @@ public class DevelopmentFragment extends SettingsPreferenceFragment
 
     private void resetDangerousOptions() {
         SystemPropPoker.getInstance().blockPokes();
-        for (final SwitchPreference cb : mResetSwitchPrefs) {
+        for (final TwoStatePreference cb : mResetSwitchPrefs) {
             if (cb.isChecked()) {
                 cb.setChecked(false);
                 onPreferenceTreeClick(cb);
diff --git a/Settings/src/com/android/tv/settings/system/development/OemUnlockPreferenceController.java b/Settings/src/com/android/tv/settings/system/development/OemUnlockPreferenceController.java
index 3e46ab9a7..e07bcf98c 100644
--- a/Settings/src/com/android/tv/settings/system/development/OemUnlockPreferenceController.java
+++ b/Settings/src/com/android/tv/settings/system/development/OemUnlockPreferenceController.java
@@ -24,7 +24,7 @@ import android.service.oemlock.OemLockManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
 
 import com.android.tv.settings.R;
 
@@ -34,9 +34,9 @@ public class OemUnlockPreferenceController implements OemUnlockDialog.Callback {
 
     private final OemLockManager mOemLockManager;
     private final UserManager mUserManager;
-    private final SwitchPreference mPreference;
+    private final TwoStatePreference mPreference;
 
-    public OemUnlockPreferenceController(Context context, SwitchPreference preference) {
+    public OemUnlockPreferenceController(Context context, TwoStatePreference preference) {
         if (!TextUtils.equals(SystemProperties.get("ro.oem_unlock_supported", "0"), "1")) {
             mOemLockManager = null;
             Log.w(TAG, "oem_unlock not supported.");
@@ -48,7 +48,7 @@ public class OemUnlockPreferenceController implements OemUnlockDialog.Callback {
         updateState();
     }
 
-    public SwitchPreference getPreference() {
+    public TwoStatePreference getPreference() {
         return mPreference;
     }
 
diff --git a/Settings/src/com/android/tv/settings/system/locale/CountryPickerFragment.java b/Settings/src/com/android/tv/settings/system/locale/CountryPickerFragment.java
index 156b92b7b..04cd39e09 100644
--- a/Settings/src/com/android/tv/settings/system/locale/CountryPickerFragment.java
+++ b/Settings/src/com/android/tv/settings/system/locale/CountryPickerFragment.java
@@ -33,12 +33,15 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.internal.app.LocaleHelper;
 import com.android.internal.app.LocaleStore;
 import com.android.tv.settings.RadioPreference;
 import com.android.tv.settings.SettingsPreferenceFragment;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 /** Country picker settings screen for locale selection. */
 @Keep
@@ -68,11 +71,16 @@ public class CountryPickerFragment extends SettingsPreferenceFragment {
             screen.setTitle(parentLocale.getFullNameNative());
         }
         Locale currentLocale = LocaleDataViewModel.getCurrentLocale();
-        ArrayList<LocaleStore.LocaleInfo> localeInfoCountryList = mLocaleDataViewModel
+        List<LocaleStore.LocaleInfo> localeInfoCountryList = mLocaleDataViewModel
                 .getLocaleInfoList(parentLocale);
         Preference activePref = null;
         if (localeInfoCountryList != null) {
-            for (LocaleStore.LocaleInfo localeInfo : localeInfoCountryList) {
+            Locale sortingLocale = Locale.getDefault();
+            LocaleHelper.LocaleInfoComparator comp =
+                    new LocaleHelper.LocaleInfoComparator(sortingLocale, true);
+
+            for (LocaleStore.LocaleInfo localeInfo : localeInfoCountryList.stream()
+                    .sorted(comp).toList()) {
                 RadioPreference preference = new RadioPreference(getContext());
                 preference.setTitle(localeInfo.getFullCountryNameNative());
                 if (localeInfo.getLocale().equals(currentLocale)) {
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 c18ff8928..274811ad0 100644
--- a/Settings/src/com/android/tv/settings/system/locale/LanguagePickerFragment.java
+++ b/Settings/src/com/android/tv/settings/system/locale/LanguagePickerFragment.java
@@ -16,8 +16,6 @@
 
 package com.android.tv.settings.system.locale;
 
-import static com.android.tv.settings.system.locale.LocaleDataViewModel.TRANSLATED_ONLY;
-
 import android.app.ActivityManager;
 import android.app.tvsettings.TvSettingsEnums;
 import android.content.Context;
@@ -27,6 +25,9 @@ import android.os.Handler;
 import android.os.LocaleList;
 import android.os.Looper;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.Keep;
 import androidx.lifecycle.ViewModelProvider;
@@ -38,11 +39,13 @@ import com.android.internal.app.LocaleStore;
 import com.android.tv.settings.R;
 import com.android.tv.settings.RadioPreference;
 import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.settings.library.util.ThreadUtils;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 /** Language picker settings screen for locale selection. */
@@ -54,7 +57,8 @@ public class LanguagePickerFragment extends SettingsPreferenceFragment {
     private LocaleDataViewModel mLocaleDataViewModel;
     private static final boolean DEBUG = Build.isDebuggable();
     static final String KEY_LOCALE_INFO = "locale_info";
-    private Handler mHandler = new Handler(Looper.getMainLooper());
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private boolean mProgressBarHidden;
 
     public static LanguagePickerFragment newInstance() {
         return new LanguagePickerFragment();
@@ -67,34 +71,85 @@ public class LanguagePickerFragment extends SettingsPreferenceFragment {
         final PreferenceScreen screen =
                 getPreferenceManager().createPreferenceScreen(themedContext);
         screen.setTitle(R.string.system_language);
+        Context applicationContext = getContext().getApplicationContext();
+        Runnable mainThreadRunnable = () -> createPreferences(screen);
+        Future localeLoadedFuture = ThreadUtils.postOnBackgroundThread(() -> {
+            loadLocales(applicationContext, mainThreadRunnable);
+        });
+        setPreferenceScreen(screen);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final ViewGroup view =
+                (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);
+        LayoutInflater themedInflater = LayoutInflater.from(view.getContext());
+        final View progressContainer =
+                themedInflater.inflate(R.layout.settings_progress_bar, container, false);
+        ((ViewGroup) progressContainer).addView(view);
+        progressContainer.setVisibility(View.VISIBLE);
+        return progressContainer;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        showProgressBar();
+    }
+
+    private void showProgressBar() {
+        if (mProgressBarHidden) {
+            return;
+        }
+        View progressBar = requireView().requireViewById(R.id.progress_bar);
+        progressBar.bringToFront();
+        progressBar.setAlpha(0f);
+        progressBar.setVisibility(View.VISIBLE);
+        progressBar.animate().alpha(1f).setStartDelay(1000).setDuration(250).start();
+    }
+
+    private void hideProgressBar() {
+        mProgressBarHidden = true;
+        if (getView() != null) {
+            View progressBar = requireView().requireViewById(R.id.progress_bar);
+            progressBar.setVisibility(View.GONE);
+        }
+    }
+
+    private void loadLocales(Context applicationContext, Runnable mainThreadRunnable) {
+        mLocaleInfos = new ArrayList<>(mLocaleDataViewModel.getLocaleInfos(applicationContext));
 
-        Locale currentLocale = LocaleDataViewModel.getCurrentLocale();
-        final Set<String> langTagsToIgnore = new HashSet<>();
-        mLocaleInfos = new ArrayList<>(LocaleStore.getLevelLocales(
-                getContext(), langTagsToIgnore, null, TRANSLATED_ONLY));
         final Locale sortingLocale = Locale.getDefault();
         final LocaleHelper.LocaleInfoComparator comp =
                 new LocaleHelper.LocaleInfoComparator(sortingLocale, false);
         mLocaleInfos.sort(comp);
+        for (LocaleStore.LocaleInfo localeInfo : mLocaleInfos) {
+            mLocaleDataViewModel.addLocaleInfoList(localeInfo, applicationContext);
+        }
+        mHandler.post(mainThreadRunnable);
+    }
+
+    private void createPreferences(PreferenceScreen screen) {
+        hideProgressBar();
         final Set<LocaleStore.LocaleInfo> notSuggestedLocales =
                 mLocaleInfos.stream().filter(
                         localeInfo -> !localeInfo.isSuggested()).collect(Collectors.toSet());
         for (LocaleStore.LocaleInfo localeInfo : mLocaleInfos) {
-            mLocaleDataViewModel.addLocaleInfoList(localeInfo, getActivity(), langTagsToIgnore);
             if (localeInfo.isSuggested()
                     && containsSuggestedLocale(notSuggestedLocales, localeInfo)) {
                 continue;
             }
-            ArrayList<LocaleStore.LocaleInfo> localeInfoWithCountryList = mLocaleDataViewModel
+            Locale currentLocale = LocaleDataViewModel.getCurrentLocale();
+            List<LocaleStore.LocaleInfo> localeInfoWithCountryList = mLocaleDataViewModel
                     .getLocaleInfoList(localeInfo);
             if (localeInfoWithCountryList != null && localeInfoWithCountryList.size() <= 1) {
                 RadioPreference preference = new RadioPreference(getContext());
                 preference.setTitle(localeInfo.getFullNameNative());
-                if (localeInfo.getLocale().equals(currentLocale)) {
-                    preference.setChecked(true);
-                } else {
-                    preference.setChecked(false);
+                if (localeInfoWithCountryList.size() == 1) {
+                    localeInfo = localeInfoWithCountryList.get(0);
                 }
+                preference.setChecked(localeInfo.getLocale().equals(currentLocale));
                 preference.setRadioGroup(LANGUAGE_PICKER_RADIO_GROUP);
                 preference.getExtras().putSerializable(KEY_LOCALE_INFO, localeInfo);
                 screen.addPreference(preference);
@@ -108,8 +163,6 @@ public class LanguagePickerFragment extends SettingsPreferenceFragment {
                 preference.getExtras().putSerializable(KEY_LOCALE_INFO, localeInfo);
             }
         }
-
-        setPreferenceScreen(screen);
     }
 
     private static boolean containsSuggestedLocale(Set<LocaleStore.LocaleInfo> localeInfos,
@@ -119,6 +172,7 @@ public class LanguagePickerFragment extends SettingsPreferenceFragment {
                 && localeInfo.getLocale().getScript().equals(
                         suggestedLocaleInfo.getLocale().getScript()));
     }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -143,8 +197,7 @@ public class LanguagePickerFragment extends SettingsPreferenceFragment {
         if (DEBUG) {
             Log.d(TAG, "Preference clicked: " + preference.getTitle());
         }
-        if (preference instanceof RadioPreference) {
-            RadioPreference localePref = (RadioPreference) preference;
+        if (preference instanceof RadioPreference localePref) {
             if (!localePref.isChecked()) {
                 localePref.setChecked(true);
                 return true;
diff --git a/Settings/src/com/android/tv/settings/system/locale/LocaleDataViewModel.java b/Settings/src/com/android/tv/settings/system/locale/LocaleDataViewModel.java
index 5bb4762f4..f8a7af944 100644
--- a/Settings/src/com/android/tv/settings/system/locale/LocaleDataViewModel.java
+++ b/Settings/src/com/android/tv/settings/system/locale/LocaleDataViewModel.java
@@ -21,42 +21,63 @@ import android.content.Context;
 import android.os.RemoteException;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.ViewModel;
 
 import com.android.internal.app.LocaleStore;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-/** ViewModel to provide data for locale selection. */
+/**
+ * ViewModel to provide data for locale selection.
+ */
 public class LocaleDataViewModel extends ViewModel {
+    static final boolean TRANSLATED_ONLY = false;
     private static final String TAG = "LocaleDataViewModel";
-    private final Map<LocaleStore.LocaleInfo, ArrayList<LocaleStore.LocaleInfo>> mLocaleMap =
+    @VisibleForTesting
+    final Map<LocaleStore.LocaleInfo, List<LocaleStore.LocaleInfo>> mLocaleMap =
             new HashMap<>();
-    static final boolean TRANSLATED_ONLY = false;
+    Set<LocaleStore.LocaleInfo> mLocaleInfos;
 
     public static Locale getCurrentLocale() {
         try {
             return ActivityManager.getService().getConfiguration()
-                                .getLocales().get(0);
+                    .getLocales().get(0);
         } catch (RemoteException e) {
             Log.e(TAG, "Could not retrieve locale", e);
             return null;
         }
     }
 
-    public void addLocaleInfoList(LocaleStore.LocaleInfo localeInfo, Context context,
-            Set<String> langTagsToIgnore) {
+    public synchronized Set<LocaleStore.LocaleInfo> getLocaleInfos(
+            Context context) {
+        if (mLocaleInfos == null) {
+            mLocaleInfos = LocaleStore.getLevelLocales(context,
+                    /* ignorables= */ Collections.emptySet(),
+                    /* parent= */ null,
+                    TRANSLATED_ONLY);
+        }
+        return mLocaleInfos;
+    }
+
+    public synchronized void addLocaleInfoList(LocaleStore.LocaleInfo localeInfo, Context context) {
+        if (mLocaleMap.containsKey(localeInfo)) {
+            return;
+        }
         ArrayList<LocaleStore.LocaleInfo> localeInfoWithCountryList = new ArrayList<>(
                 LocaleStore.getLevelLocales(
-                        context, langTagsToIgnore, localeInfo, TRANSLATED_ONLY));
+                        context, Collections.emptySet(), localeInfo, TRANSLATED_ONLY));
         mLocaleMap.put(localeInfo, localeInfoWithCountryList);
     }
 
-    public ArrayList<LocaleStore.LocaleInfo> getLocaleInfoList(LocaleStore.LocaleInfo localeInfo) {
+    public synchronized List<LocaleStore.LocaleInfo>
+    getLocaleInfoList(LocaleStore.LocaleInfo localeInfo) {
         return mLocaleMap.get(localeInfo);
     }
-}
+}
\ No newline at end of file
diff --git a/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java b/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
index 46629126b..fd4f3545f 100644
--- a/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
+++ b/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
@@ -11,7 +11,7 @@
  * 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
+ * limitations under the License.
  */
 
 package com.android.tv.settings.users;
@@ -41,8 +41,8 @@ import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.util.EventLog;
 import android.text.TextUtils;
+import android.util.EventLog;
 import android.util.Log;
 import android.view.View;
 import android.widget.Checkable;
@@ -62,6 +62,7 @@ import androidx.preference.SwitchPreference;
 import com.android.settingslib.users.AppRestrictionsHelper;
 import com.android.tv.settings.R;
 import com.android.tv.settings.SettingsPreferenceFragment;
+import com.android.tv.settings.util.SafeIntents;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -110,8 +111,15 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
     /** Key for extra passed in from calling fragment to indicate if this is a newly created user */
     private static final String EXTRA_NEW_USER = "new_user";
 
+    /**
+     * Key for extra passed in from calling fragment to indicate we should exit after updating
+     * apps.
+     */
+    private static final String EXTRA_EXIT_AFTER_UPDATE = "exit_after_update";
+
     private boolean mFirstTime = true;
     private boolean mNewUser;
+    private boolean mExitAfterUpdate;
     private boolean mAppListChanged;
     private boolean mRestrictedProfile;
 
@@ -236,14 +244,17 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         }
     }
 
-    public static void prepareArgs(@NonNull Bundle bundle, int userId, boolean newUser) {
+    public static void prepareArgs(@NonNull Bundle bundle, int userId, boolean newUser,
+                                   boolean exitAfterUpdate) {
         bundle.putInt(EXTRA_USER_ID, userId);
         bundle.putBoolean(EXTRA_NEW_USER, newUser);
+        bundle.putBoolean(EXTRA_EXIT_AFTER_UPDATE, exitAfterUpdate);
     }
 
-    public static AppRestrictionsFragment newInstance(int userId, boolean newUser) {
-        final Bundle args = new Bundle(2);
-        prepareArgs(args, userId, newUser);
+    public static AppRestrictionsFragment newInstance(int userId, boolean newUser,
+                                   boolean exitAfterUpdate) {
+        final Bundle args = new Bundle(3);
+        prepareArgs(args, userId, newUser, exitAfterUpdate);
         AppRestrictionsFragment fragment = new AppRestrictionsFragment();
         fragment.setArguments(args);
         return fragment;
@@ -267,6 +278,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                     mUser = new UserHandle(args.getInt(EXTRA_USER_ID));
                 }
                 mNewUser = args.getBoolean(EXTRA_NEW_USER, false);
+                mExitAfterUpdate = args.getBoolean(EXTRA_EXIT_AFTER_UPDATE, false);
             }
         }
 
@@ -345,6 +357,15 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         }
     }
 
+    @Override
+    public void onDestroyView() {
+        if (mExitAfterUpdate) {
+            requireActivity().setResult(Activity.RESULT_OK);
+            requireActivity().finish();
+        }
+        super.onDestroyView();
+    }
+
     private void onPackageChanged(Intent intent) {
         String action = intent.getAction();
         String packageName = intent.getData().getSchemeSpecificPart();
@@ -711,7 +732,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                 p.setKey(getKeyForPackageActivity(mPackageName));
                 p.setIcon(BLANK_DRAWABLE);
                 p.setTitle(R.string.restricted_profile_customize_restrictions);
-                p.setIntent(restrictionsIntent);
+                p.setIntent(SafeIntents.forCallback(restrictionsIntent));
                 mPreference.addPreference(p);
             } else {
                 Log.e(TAG, "No restrictions returned from " + mPackageName);
diff --git a/Settings/src/com/android/tv/settings/util/SafeIntents.java b/Settings/src/com/android/tv/settings/util/SafeIntents.java
new file mode 100644
index 000000000..a919c516c
--- /dev/null
+++ b/Settings/src/com/android/tv/settings/util/SafeIntents.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.settings.util;
+
+import android.content.Intent;
+
+/**
+ * Utilities to sanitize external intents
+ */
+public final class SafeIntents {
+    private static final int UNSAFE_GRANT_FLAGS =
+            Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
+            | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION
+            | Intent.FLAG_GRANT_READ_URI_PERMISSION
+            | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
+
+    /**
+     * Returns an intent safe to callback to the app that supplied it.
+     */
+    public static Intent forCallback(Intent intent) {
+        Intent safeIntent = new Intent(intent);
+        safeIntent.removeFlags(UNSAFE_GRANT_FLAGS);
+        return safeIntent;
+    }
+
+    private SafeIntents() {}
+}
diff --git a/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java b/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java
index 79dc27fdd..07b07e986 100644
--- a/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java
+++ b/Settings/src/com/android/tv/settings/widget/AccessPointPreference.java
@@ -21,8 +21,8 @@ import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPoint.Speed;
+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 {
@@ -226,9 +226,6 @@ public class AccessPointPreference extends Preference {
     }
 
     updateBadge(context);
-
-    setSummary(mAccessPoint.getSettingsSummary());
-
     mContentDescription = buildContentDescription(getContext(), this /* pref */, mAccessPoint);
   }
 
diff --git a/Settings/src/com/android/tv/settings/widget/TvAccessPointPreference.java b/Settings/src/com/android/tv/settings/widget/TvAccessPointPreference.java
index b231c43c2..de220e548 100644
--- a/Settings/src/com/android/tv/settings/widget/TvAccessPointPreference.java
+++ b/Settings/src/com/android/tv/settings/widget/TvAccessPointPreference.java
@@ -22,7 +22,7 @@ import android.widget.ImageView;
 
 import androidx.preference.PreferenceViewHolder;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.R;
 import com.android.tv.settings.overlay.FlavorUtils;
 
diff --git a/Settings/tests/robotests/Android.bp b/Settings/tests/robotests/Android.bp
index 9fc8f9612..72ce36b90 100644
--- a/Settings/tests/robotests/Android.bp
+++ b/Settings/tests/robotests/Android.bp
@@ -14,9 +14,19 @@ package {
 android_robolectric_test {
     name: "TvSettingsRoboTests",
 
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
 
     libs: ["services.core"],
+    
+    static_libs: [
+        "Robolectric_shadows_androidx_fragment_upstream",
+        "Settings_robolectric_meta_service_file",
+        "SettingsLib-robo-testutils",
+        "Settings-robo-testutils",
+    ],
 
     java_resource_dirs: ["config"],
 
@@ -25,4 +35,6 @@ android_robolectric_test {
     test_options: {
         timeout: 36000,
     },
+    
+    upstream: true,
 }
diff --git a/Settings/tests/robotests/config/robolectric.properties b/Settings/tests/robotests/config/robolectric.properties
index 9a6053d0a..034345989 100644
--- a/Settings/tests/robotests/config/robolectric.properties
+++ b/Settings/tests/robotests/config/robolectric.properties
@@ -14,3 +14,5 @@
 # limitations under the License.
 #
 sdk=NEWEST_SDK
+instrumentedPackages=androidx
+
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java
index 14d217fab..ed182bc2c 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java
@@ -29,6 +29,7 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.tv.settings.RadioPreference;
 import com.android.tv.settings.testutils.ShadowInputMethodManager;
 import com.android.tv.settings.testutils.Utils;
@@ -43,10 +44,9 @@ import org.mockito.Spy;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowUserManager;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowInputMethodManager.class})
+@Config(shadows = {ShadowInputMethodManager.class, ShadowUserManager.class})
 public class AutofillPickerFragmentTest {
     @Spy
     private AutofillPickerFragment mFragment;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java
deleted file mode 100644
index 1d11a61e3..000000000
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddPageBasedOnNetworkStateTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 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 static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.shadow.api.Shadow.extract;
-
-import android.content.Intent;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-import android.os.Bundle;
-
-import androidx.lifecycle.ViewModelProviders;
-
-import com.android.tv.settings.R;
-import com.android.tv.settings.connectivity.WifiConfigHelper;
-import com.android.tv.settings.connectivity.util.State;
-import com.android.tv.settings.connectivity.util.StateMachine;
-import com.android.tv.settings.testutils.ShadowStateMachine;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowStateMachine.class)
-public class AddPageBasedOnNetworkStateTest {
-    private WifiSetupActivity mActivity;
-    private AddPageBasedOnNetworkState mAddPageBasedOnNetworkState;
-    private UserChoiceInfo mUserChoiceInfo;
-    @Mock
-    private State.StateCompleteListener mStateCompleteListener;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = Mockito.spy(Robolectric.buildActivity(
-                        WifiSetupActivity.class, new Intent().putExtras(new Bundle())).get());
-        StateMachine stateMachine = ViewModelProviders.of(mActivity).get(StateMachine.class);
-        mUserChoiceInfo = ViewModelProviders.of(mActivity).get(UserChoiceInfo.class);
-        ShadowStateMachine shadowStateMachine = extract(stateMachine);
-        shadowStateMachine.setListener(mStateCompleteListener);
-        mAddPageBasedOnNetworkState = new AddPageBasedOnNetworkState(mActivity);
-    }
-
-    @Test
-    public void testForward_otherNetwork() {
-        mUserChoiceInfo.init();
-        mUserChoiceInfo.put(UserChoiceInfo.SELECT_WIFI, getString(R.string.other_network));
-        mAddPageBasedOnNetworkState.processForward();
-        verify(mStateCompleteListener).onComplete(StateMachine.OTHER_NETWORK);
-    }
-
-    @Test
-    public void testForward_clearPassword_ssidNotMatch() {
-        mUserChoiceInfo.init();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "atv01";
-        scanResult.capabilities = "";
-        mUserChoiceInfo.setChosenNetwork(scanResult);
-        mUserChoiceInfo.put(UserChoiceInfo.PASSWORD, "123");
-        WifiConfiguration wifiConfiguration = new WifiConfiguration();
-        wifiConfiguration.SSID = "atv02";
-        mUserChoiceInfo.setWifiConfiguration(wifiConfiguration);
-        WifiConfigHelper.saveConfiguration(mActivity, wifiConfiguration);
-        assertNotNull(mUserChoiceInfo.getChosenNetwork());
-        mAddPageBasedOnNetworkState.processForward();
-        assertNull(mUserChoiceInfo.getPageSummary(UserChoiceInfo.PASSWORD));
-    }
-
-    @Test
-    public void testForward_clearPassword_ssidIsNull() {
-        mUserChoiceInfo.init();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "atv";
-        scanResult.capabilities = "";
-        mUserChoiceInfo.setChosenNetwork(scanResult);
-        mUserChoiceInfo.put(UserChoiceInfo.PASSWORD, "123");
-        mUserChoiceInfo.setWifiConfiguration(null);
-        mAddPageBasedOnNetworkState.processForward();
-        assertNull(mUserChoiceInfo.getPageSummary(UserChoiceInfo.PASSWORD));
-    }
-
-    @Test
-    public void testForward_networkSaved() {
-        mUserChoiceInfo.init();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "atv";
-        scanResult.capabilities = "";
-        mUserChoiceInfo.setChosenNetwork(scanResult);
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "\"atv\"";
-        WifiConfigHelper.saveConfiguration(mActivity, config);
-        mAddPageBasedOnNetworkState.processForward();
-        verify(mStateCompleteListener).onComplete(StateMachine.KNOWN_NETWORK);
-    }
-
-    @Test
-    public void testForward_networkNotSaved() {
-        mUserChoiceInfo.init();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = "atv";
-        scanResult.capabilities = "";
-        mUserChoiceInfo.setChosenNetwork(scanResult);
-        mUserChoiceInfo.put(UserChoiceInfo.PASSWORD, "123");
-        WifiConfiguration config = new WifiConfiguration();
-        config.networkId = -1;
-        WifiConfigHelper.saveConfiguration(mActivity, config);
-        mAddPageBasedOnNetworkState.processForward();
-        verify(mStateCompleteListener).onComplete(StateMachine.ADD_START);
-    }
-
-    private String getString(int id) {
-        return RuntimeEnvironment.application.getString(id);
-    }
-}
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java
index e31cfaf56..59aca204a 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/AddStartStateTest.java
@@ -19,14 +19,20 @@ package com.android.tv.settings.connectivity.setup;
 import static org.mockito.Mockito.verify;
 import static org.robolectric.shadow.api.Shadow.extract;
 
+import android.content.Context;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.tv.settings.library.network.AccessPoint;
 import com.android.tv.settings.connectivity.util.State;
 import com.android.tv.settings.connectivity.util.StateMachine;
+import com.android.tv.settings.library.util.ThreadUtils;
 import com.android.tv.settings.testutils.ShadowStateMachine;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiTrackerInjector;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,16 +46,18 @@ import org.robolectric.annotation.Config;
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowStateMachine.class)
 public class AddStartStateTest {
-    private WifiSetupActivity mActivity;
+    private FragmentActivity mActivity;
     private AddStartState mAddStartState;
     private UserChoiceInfo mUserChoiceInfo;
     @Mock
     private State.StateCompleteListener mStateCompleteListener;
+    @Mock private WifiManager mMockWifiManager;
+    @Mock private WifiTrackerInjector mWifiTrackerInjector;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mActivity = Robolectric.buildActivity(WifiSetupActivity.class).get();
+        mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
         StateMachine stateMachine = ViewModelProviders.of(mActivity).get(StateMachine.class);
         mUserChoiceInfo = ViewModelProviders.of(mActivity).get(UserChoiceInfo.class);
         ShadowStateMachine shadowStateMachine = extract(stateMachine);
@@ -58,48 +66,47 @@ public class AddStartStateTest {
     }
 
     @Test
-    public void testForward_WEP_NeedPassword() {
+    public void testForward_needsWifiConfiguration_NeedPassword() {
         mUserChoiceInfo.init();
-        mUserChoiceInfo.setWifiSecurity(AccessPoint.SECURITY_WEP);
-        mUserChoiceInfo.setWifiConfiguration(new WifiConfiguration());
+        mUserChoiceInfo.setWifiEntry(makeWifiEntry(
+                /* needsWifiConfiguration= */ true,
+                /* shouldEditBeforeConnect= */ false));
         mAddStartState.processForward();
         verify(mStateCompleteListener).onComplete(StateMachine.PASSWORD);
     }
 
     @Test
-    public void testForward_WPA_NeedPassword() {
+    public void testForward_shouldEditBeforeConnect_NeedPassword() {
         mUserChoiceInfo.init();
-        mUserChoiceInfo.setWifiSecurity(AccessPoint.SECURITY_PSK);
-        mUserChoiceInfo.setWifiConfiguration(new WifiConfiguration());
+        mUserChoiceInfo.setWifiEntry(makeWifiEntry(
+                /* needsWifiConfiguration= */ false,
+                /* shouldEditBeforeConnect= */ true));
         mAddStartState.processForward();
         verify(mStateCompleteListener).onComplete(StateMachine.PASSWORD);
     }
 
     @Test
-    public void testForward_EAP_NeedPassword() {
-        mUserChoiceInfo.init();
-        mUserChoiceInfo.setWifiSecurity(AccessPoint.SECURITY_EAP);
-        mUserChoiceInfo.setWifiConfiguration(new WifiConfiguration());
-        mAddStartState.processForward();
-        verify(mStateCompleteListener).onComplete(StateMachine.PASSWORD);
-    }
-
-    @Test
-    public void testForward_AlreadyHasPassword() {
-        mUserChoiceInfo.init();
-        mUserChoiceInfo.setWifiSecurity(AccessPoint.SECURITY_PSK);
-        WifiConfiguration config = new WifiConfiguration();
-        config.preSharedKey = "PasswordTest";
-        mUserChoiceInfo.setWifiConfiguration(config);
+    public void testForward_DoNotNeedPassword_Connect() {
+        mUserChoiceInfo.setWifiEntry(makeWifiEntry(
+                /* needsWifiConfiguration= */ false,
+                /* shouldEditBeforeConnect= */ false));
         mAddStartState.processForward();
         verify(mStateCompleteListener).onComplete(StateMachine.CONNECT);
     }
 
-    @Test
-    public void testForward_DoNotNeedPassword() {
-        mUserChoiceInfo.init();
-        mUserChoiceInfo.setWifiSecurity(AccessPoint.SECURITY_NONE);
-        mAddStartState.processForward();
-        verify(mStateCompleteListener).onComplete(StateMachine.CONNECT);
+    private WifiEntry makeWifiEntry(boolean needsWifiConfiguration,
+                                    boolean shouldEditBeforeConnect) {
+        return new WifiEntry(mWifiTrackerInjector,
+                ThreadUtils.getUiThreadHandler(), mMockWifiManager, false) {
+            @Override
+            public boolean needsWifiConfiguration() {
+                return needsWifiConfiguration;
+            }
+
+            @Override
+            public boolean shouldEditBeforeConnect() {
+                return shouldEditBeforeConnect;
+            }
+        };
     }
 }
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectFailedFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectFailedFragmentTest.java
index c41f8c505..990cae28e 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectFailedFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/connectivity/setup/ConnectFailedFragmentTest.java
@@ -21,9 +21,11 @@ import static org.mockito.Mockito.doReturn;
 
 import android.net.wifi.WifiConfiguration;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProviders;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -32,18 +34,19 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
+@Ignore // TODO(b/293309151) Find out how to mock WifiManager
 public class ConnectFailedFragmentTest {
 
     WifiConfiguration mWifiConfig;
     @Spy
     private ConnectFailedState.ConnectFailedFragment mConnectFailedFragment;
-    private WifiSetupActivity mActivity;
+    private FragmentActivity mActivity;
     private UserChoiceInfo mUserChoiceInfo;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mActivity = Robolectric.buildActivity(WifiSetupActivity.class).create().get();
+        mActivity = Robolectric.buildActivity(FragmentActivity.class).create().get();
         doReturn(mActivity).when(mConnectFailedFragment).getContext();
         mUserChoiceInfo = ViewModelProviders.of(mActivity).get(UserChoiceInfo.class);
         mUserChoiceInfo.init();
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java
index b70d1762d..87e608582 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java
@@ -36,6 +36,7 @@ import android.provider.Settings;
 
 import androidx.preference.Preference;
 
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.tv.settings.R;
 import com.android.tv.settings.testutils.Utils;
@@ -47,10 +48,11 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowPackageManager;
-import org.robolectric.shadows.ShadowUserManager;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class})
 public class DevicePrefFragmentTest {
     @Spy
     private DevicePrefFragment mDevicePrefFragment;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/HdrFormatSelectionFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/HdrFormatSelectionFragmentTest.java
index 9b8c9af3c..495797c00 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/HdrFormatSelectionFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/HdrFormatSelectionFragmentTest.java
@@ -43,6 +43,7 @@ import com.android.tv.settings.R;
 import com.android.tv.settings.RadioPreference;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -85,6 +86,7 @@ public class HdrFormatSelectionFragmentTest {
         verify(mDisplayManager).setAreUserDisabledHdrTypesAllowed(false);
     }
 
+    @Ignore // TODO(b/293314245) Find how to mock missing method in tests
     @Test
     public void testOnPreferenceTreeClick_withFormatDisabled_disablesHdrTypeInDisplayManager() {
         int[] deviceHdrTypes = { HDR_TYPE_DOLBY_VISION,
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java
index 769a643a4..0c45aa760 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java
@@ -35,6 +35,7 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
 @RunWith(RobolectricTestRunner.class)
@@ -152,6 +153,7 @@ public class MatchContentFrameRateFragmentTest {
     }
 
     @Test
+    @LooperMode(LooperMode.Mode.LEGACY)
     public void testDefaultPreference() {
         FragmentController.of(mMatchContentFrameRateFragment)
             .create();
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragmentTest.java
index 40969edb1..5b2042b6d 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/ResolutionSelectionFragmentTest.java
@@ -139,11 +139,11 @@ public class ResolutionSelectionFragmentTest {
                         ResolutionSelectionUtils.getRefreshRateString(59.944f)));
 
         assertThat(getChildrenSummaries(modePreference)).containsExactly(
-                "2160 x 2160",
-                "2160 x 2160",
+                "2,160 x 2,160",
+                "2,160 x 2,160",
                 "576 x 576",
-                "800 x 1200",
-                "800 x 1200",
+                "800 x 1,200",
+                "800 x 1,200",
                 "600 x 800",
                 "600 x 800");
     }
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java
index 4f968399b..a3d33bbd5 100644
--- a/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java
+++ b/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java
@@ -30,6 +30,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.tv.settings.R;
 import com.android.tv.settings.testutils.ShadowInputMethodManager;
 import com.android.tv.settings.testutils.Utils;
@@ -43,10 +44,9 @@ import org.mockito.Spy;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowUserManager;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowInputMethodManager.class})
+@Config(shadows = {ShadowInputMethodManager.class, ShadowUserManager.class})
 public class KeyboardFragmentTest {
     @Spy
     private KeyboardFragment mKeyboardFragment;
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/system/locale/CountryPickerFragmentTest.kt b/Settings/tests/robotests/src/com/android/tv/settings/system/locale/CountryPickerFragmentTest.kt
new file mode 100644
index 000000000..177c02539
--- /dev/null
+++ b/Settings/tests/robotests/src/com/android/tv/settings/system/locale/CountryPickerFragmentTest.kt
@@ -0,0 +1,53 @@
+package com.android.tv.settings.system.locale
+
+import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
+import com.android.internal.app.LocaleStore
+import com.android.tv.settings.testutils.SettingsShadowActivityManager
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.androidx.fragment.FragmentController
+import java.util.Locale
+
+@RunWith(RobolectricTestRunner::class)
+@Config(shadows = [SettingsShadowActivityManager::class])
+class CountryPickerFragmentTest {
+    companion object {
+        val EXTRA_PARENT_LOCALE = "PARENT_LOCALE"
+        val parentLocale = LocaleStore.fromLocale(Locale.ENGLISH)
+    }
+
+    @Test
+    fun testCountrySorting() {
+        val fragment = createCountryPickerFragment()
+        val preferenceScreen = fragment.preferenceScreen
+        assertThat(preferenceScreen.preferenceCount).isEqualTo(3)
+        assertThat(preferenceScreen.getPreference(0).title)
+                .isEqualTo(LocaleStore.fromLocale(Locale.CANADA).fullCountryNameNative)
+        assertThat(preferenceScreen.getPreference(1).title)
+                .isEqualTo(LocaleStore.fromLocale(Locale.UK).fullCountryNameNative)
+        assertThat(preferenceScreen.getPreference(2).title)
+                .isEqualTo(LocaleStore.fromLocale(Locale.US).fullCountryNameNative)
+    }
+
+    private fun createCountryPickerFragment(): CountryPickerFragment {
+        val fragment = TestCountryPickerFragment()
+        fragment.arguments = Bundle().apply {
+            putSerializable(EXTRA_PARENT_LOCALE, parentLocale)
+        }
+
+        return FragmentController.of(fragment).create().start().get()
+    }
+
+    class TestCountryPickerFragment : CountryPickerFragment() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, s: String?) {
+            val viewModel = ViewModelProvider(requireActivity())[LocaleDataViewModel::class.java]
+            viewModel.mLocaleMap[parentLocale] = listOf(LocaleStore.fromLocale(Locale.UK),
+                    LocaleStore.fromLocale(Locale.CANADA), LocaleStore.fromLocale(Locale.US))
+            super.onCreatePreferences(savedInstanceState, s)
+        }
+    }
+}
\ No newline at end of file
diff --git a/Settings/tests/robotests/src/com/android/tv/settings/testutils/SettingsShadowActivityManager.kt b/Settings/tests/robotests/src/com/android/tv/settings/testutils/SettingsShadowActivityManager.kt
new file mode 100644
index 000000000..96a9dcece
--- /dev/null
+++ b/Settings/tests/robotests/src/com/android/tv/settings/testutils/SettingsShadowActivityManager.kt
@@ -0,0 +1,30 @@
+package com.android.tv.settings.testutils
+
+import android.app.ActivityManager
+import android.app.IActivityManager
+import android.content.res.Configuration
+import android.os.LocaleList
+import org.robolectric.annotation.Implements
+import org.robolectric.shadows.ShadowActivityManager
+import java.lang.reflect.Proxy
+import java.util.Locale
+
+
+@Implements(ActivityManager::class)
+@Suppress("ACCIDENTAL_OVERRIDE") // override doesn't work with JvmStatic
+open class SettingsShadowActivityManager : ShadowActivityManager() {
+    companion object {
+        val configuration: Configuration = Configuration().apply {
+            setLocales(LocaleList(Locale.US))
+        }
+
+        @JvmStatic
+        protected fun getService(): IActivityManager {
+            val clazz = IActivityManager::class.java
+            return Proxy.newProxyInstance(clazz.classLoader, arrayOf<Class<*>>(clazz)) {
+                _, method, _ ->
+                    if (method.name == "getConfiguration") configuration else null
+            } as IActivityManager
+        }
+    }
+}
diff --git a/SettingsAPI/Android.bp b/SettingsAPI/Android.bp
index 024367c52..109807b0d 100644
--- a/SettingsAPI/Android.bp
+++ b/SettingsAPI/Android.bp
@@ -36,6 +36,7 @@ android_library {
         "androidx.lifecycle_lifecycle-common-java8",
         "androidx.annotation_annotation",
         "zxing-core-1.7",
+        "WifiTrackerLib",
     ],
 
     errorprone: {
diff --git a/SettingsAPI/java/com/android/tv/settings/library/SettingsManager.java b/SettingsAPI/java/com/android/tv/settings/library/SettingsManager.java
deleted file mode 100644
index 97216dae3..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/SettingsManager.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2021 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.library;
-
-import android.annotation.SystemApi;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.android.tv.settings.library.data.StateManager;
-
-import java.util.List;
-
-/**
- * @hide Provides access to TvSettings data.
- */
-@SystemApi
-public final class SettingsManager {
-    private static final String TAG = "TvSettingsManager";
-    private com.android.tv.settings.library.UIUpdateCallback mUIUpdateCallback;
-    private final Context mContext;
-
-    /** @hide */
-    @SystemApi
-    public SettingsManager(Context context) {
-        this.mContext = context;
-    }
-
-    /** @hide */
-    @SystemApi
-    public List<PreferenceCompat> getPreferences(int state) {
-        return null;
-    }
-
-    /** @hide */
-    @SystemApi
-    public PreferenceCompat getPreference(int state, String key) {
-        return null;
-    }
-
-    /** @hide */
-    @SystemApi
-    public void registerListener(com.android.tv.settings.library.UIUpdateCallback callback) {
-        mUIUpdateCallback = callback;
-    }
-
-    /** @hide */
-    @SystemApi
-    public void unRegisterListener() {
-        mUIUpdateCallback = null;
-    }
-
-
-    /** @hide */
-    @SystemApi
-    public State createState(int stateIdentifier) {
-        return StateManager.createState(mContext, stateIdentifier, mUIUpdateCallback);
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onAttach(State state) {
-        state.onAttach();
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onCreate(State state, Bundle extras) {
-        state.onCreate(extras);
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onStart(State state) {
-        state.onStart();
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onResume(State state) {
-        state.onResume();
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onPause(State state) {
-        state.onPause();
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onStop(State state) {
-        state.onStop();
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onDestroy(State state) {
-        state.onDestroy();
-    }
-
-    /** @hide */
-    @SystemApi
-    public boolean onPreferenceClick(State state, String[] key, boolean status) {
-        if (state == null || key == null || key.length == 0) {
-            return false;
-        }
-        return state.onPreferenceTreeClick(key, status);
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onDisplayPreferenceDialog(State state, String[] key) {
-        if (state != null && key != null && key.length > 0) {
-            state.onDisplayDialogPreference(key);
-        }
-    }
-
-    /** @hide */
-    @SystemApi
-    public void onActivityResult(State state, int code, int resultCode, Intent data) {
-        state.onActivityResult(ManagerUtil.getRequestCode(code), resultCode, data);
-    }
-
-    /** @hide */
-    @SystemApi
-    public boolean onPreferenceChange(State state, String[] key, Object newValue) {
-        return state.onPreferenceChange(key, newValue);
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java b/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java
deleted file mode 100644
index f6a133f3a..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/data/StateManager.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.data;
-
-import static com.android.tv.settings.library.ManagerUtil.STATE_ACCESSIBILITY;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ACCESSIBILITY_SERVICE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ACCESSIBILITY_SHORTCUT;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ACCESSIBILITY_SHORTCUT_SERVICE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ADVANCED_DISPLAY;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ADVANCED_VOLUME;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ALARMS_AND_REMINDERS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ALL_APPS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_APPS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_APP_MANAGEMENT;
-import static com.android.tv.settings.library.ManagerUtil.STATE_APP_USAGE_ACCESS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_AVAILABLE_KEYBOARD;
-import static com.android.tv.settings.library.ManagerUtil.STATE_DAYDREAM;
-import static com.android.tv.settings.library.ManagerUtil.STATE_DISPLAY_SOUND;
-import static com.android.tv.settings.library.ManagerUtil.STATE_ENERGY_SAVER;
-import static com.android.tv.settings.library.ManagerUtil.STATE_FONT_SCALE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_HDR_FORMAT_SELECTION;
-import static com.android.tv.settings.library.ManagerUtil.STATE_HIGH_POWER;
-import static com.android.tv.settings.library.ManagerUtil.STATE_KEYBOARD;
-import static com.android.tv.settings.library.ManagerUtil.STATE_LANGUAGE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_LEGAL;
-import static com.android.tv.settings.library.ManagerUtil.STATE_LOCATION;
-import static com.android.tv.settings.library.ManagerUtil.STATE_MATCH_CONTENT_FRAME;
-import static com.android.tv.settings.library.ManagerUtil.STATE_NETWORK;
-import static com.android.tv.settings.library.ManagerUtil.STATE_NOTIFICATION_ACCESS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_PICTURE_IN_PICTURE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_PRIVACY;
-import static com.android.tv.settings.library.ManagerUtil.STATE_RESOLUTION_SELECTION;
-import static com.android.tv.settings.library.ManagerUtil.STATE_SENSOR;
-import static com.android.tv.settings.library.ManagerUtil.STATE_SPECIAL_ACCESS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_STORAGE;
-import static com.android.tv.settings.library.ManagerUtil.STATE_STORAGE_SUMMARY;
-import static com.android.tv.settings.library.ManagerUtil.STATE_SYSTEM_ALERT_WINDOW;
-import static com.android.tv.settings.library.ManagerUtil.STATE_SYSTEM_DATE_TIME;
-import static com.android.tv.settings.library.ManagerUtil.STATE_WIFI_DETAILS;
-import static com.android.tv.settings.library.ManagerUtil.STATE_WRITE_SETTINGS;
-
-import android.content.Context;
-
-import com.android.tv.settings.library.State;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.about.LegalState;
-import com.android.tv.settings.library.accessibility.AccessibilityServiceState;
-import com.android.tv.settings.library.accessibility.AccessibilityShortcutServiceState;
-import com.android.tv.settings.library.accessibility.AccessibilityShortcutState;
-import com.android.tv.settings.library.accessibility.AccessibilityState;
-import com.android.tv.settings.library.device.apps.AllAppsState;
-import com.android.tv.settings.library.device.apps.AppManagementState;
-import com.android.tv.settings.library.device.apps.AppsState;
-import com.android.tv.settings.library.device.apps.specialaccess.AlarmsAndRemindersState;
-import com.android.tv.settings.library.device.apps.specialaccess.AppUsageAccessState;
-import com.android.tv.settings.library.device.apps.specialaccess.HighPowerState;
-import com.android.tv.settings.library.device.apps.specialaccess.NotificationAccessState;
-import com.android.tv.settings.library.device.apps.specialaccess.PictureInPictureState;
-import com.android.tv.settings.library.device.apps.specialaccess.SpecialAppAccessState;
-import com.android.tv.settings.library.device.apps.specialaccess.SystemAlertWindowState;
-import com.android.tv.settings.library.device.apps.specialaccess.WriteSettingsState;
-import com.android.tv.settings.library.device.display.daydream.DaydreamState;
-import com.android.tv.settings.library.device.display.daydream.EnergySaverState;
-import com.android.tv.settings.library.device.display.displaysound.AdvancedDisplayState;
-import com.android.tv.settings.library.device.display.displaysound.AdvancedVolumeState;
-import com.android.tv.settings.library.device.display.displaysound.DisplaySoundState;
-import com.android.tv.settings.library.device.display.displaysound.FontScaleState;
-import com.android.tv.settings.library.device.display.displaysound.HdrFormatSelectionState;
-import com.android.tv.settings.library.device.display.displaysound.MatchContentFrameRateState;
-import com.android.tv.settings.library.device.display.displaysound.ResolutionSelectionState;
-import com.android.tv.settings.library.device.storage.StorageState;
-import com.android.tv.settings.library.device.storage.StorageSummaryState;
-import com.android.tv.settings.library.inputmethod.AvailableVirtualKeyboadState;
-import com.android.tv.settings.library.inputmethod.KeyboardState;
-import com.android.tv.settings.library.network.NetworkState;
-import com.android.tv.settings.library.network.WifiDetailsState;
-import com.android.tv.settings.library.privacy.LocationState;
-import com.android.tv.settings.library.privacy.PrivacyState;
-import com.android.tv.settings.library.privacy.SensorState;
-import com.android.tv.settings.library.system.DateTimeState;
-import com.android.tv.settings.library.system.LanguageState;
-
-/** Manager to handle creation and removal of the {@link State}. */
-public class StateManager {
-    private StateManager() {
-    }
-
-    public static State createState(
-            Context context, int stateIdentifier, UIUpdateCallback uiUpdateCallback) {
-        State state = null;
-        switch (stateIdentifier) {
-            case STATE_NETWORK:
-                state = new NetworkState(context, uiUpdateCallback);
-                break;
-            case STATE_WIFI_DETAILS:
-                state = new WifiDetailsState(context, uiUpdateCallback);
-                break;
-            case STATE_ALL_APPS:
-                state = new AllAppsState(context, uiUpdateCallback);
-                break;
-            case STATE_APPS:
-                state = new AppsState(context, uiUpdateCallback);
-                break;
-            case STATE_APP_MANAGEMENT:
-                state = new AppManagementState(context, uiUpdateCallback);
-                break;
-            case STATE_SPECIAL_ACCESS:
-                state = new SpecialAppAccessState(context, uiUpdateCallback);
-                break;
-            case STATE_HIGH_POWER:
-                state = new HighPowerState(context, uiUpdateCallback);
-                break;
-            case STATE_NOTIFICATION_ACCESS:
-                state = new NotificationAccessState(context, uiUpdateCallback);
-                break;
-            case STATE_APP_USAGE_ACCESS:
-                state = new AppUsageAccessState(context, uiUpdateCallback);
-                break;
-            case STATE_PICTURE_IN_PICTURE:
-                state = new PictureInPictureState(context, uiUpdateCallback);
-                break;
-            case STATE_ALARMS_AND_REMINDERS:
-                state = new AlarmsAndRemindersState(context, uiUpdateCallback);
-                break;
-            case STATE_SYSTEM_ALERT_WINDOW:
-                state = new SystemAlertWindowState(context, uiUpdateCallback);
-                break;
-            case STATE_WRITE_SETTINGS:
-                state = new WriteSettingsState(context, uiUpdateCallback);
-                break;
-            case STATE_SYSTEM_DATE_TIME:
-                state = new DateTimeState(context, uiUpdateCallback);
-                break;
-            case STATE_KEYBOARD:
-                state = new KeyboardState(context, uiUpdateCallback);
-                break;
-            case STATE_AVAILABLE_KEYBOARD:
-                state = new AvailableVirtualKeyboadState(context, uiUpdateCallback);
-                break;
-            case STATE_LANGUAGE:
-                state = new LanguageState(context, uiUpdateCallback);
-                break;
-            case STATE_ACCESSIBILITY:
-                state = new AccessibilityState(context, uiUpdateCallback);
-                break;
-            case STATE_ACCESSIBILITY_SERVICE:
-                state = new AccessibilityServiceState(context, uiUpdateCallback);
-                break;
-            case STATE_ACCESSIBILITY_SHORTCUT:
-                state = new AccessibilityShortcutState(context, uiUpdateCallback);
-                break;
-            case STATE_ACCESSIBILITY_SHORTCUT_SERVICE:
-                state = new AccessibilityShortcutServiceState(context, uiUpdateCallback);
-            case STATE_STORAGE:
-                state = new StorageState(context, uiUpdateCallback);
-                break;
-            case STATE_STORAGE_SUMMARY:
-                state = new StorageSummaryState(context, uiUpdateCallback);
-                break;
-            case STATE_ENERGY_SAVER:
-                state = new EnergySaverState(context, uiUpdateCallback);
-                break;
-            case STATE_DAYDREAM:
-                state = new DaydreamState(context, uiUpdateCallback);
-                break;
-            case STATE_DISPLAY_SOUND:
-                state = new DisplaySoundState(context, uiUpdateCallback);
-                break;
-            case STATE_FONT_SCALE:
-                state = new FontScaleState(context, uiUpdateCallback);
-                break;
-            case STATE_MATCH_CONTENT_FRAME:
-                state = new MatchContentFrameRateState(context, uiUpdateCallback);
-                break;
-            case STATE_ADVANCED_DISPLAY:
-                state = new AdvancedDisplayState(context, uiUpdateCallback);
-                break;
-            case STATE_ADVANCED_VOLUME:
-                state = new AdvancedVolumeState(context, uiUpdateCallback);
-                break;
-            case STATE_HDR_FORMAT_SELECTION:
-                state = new HdrFormatSelectionState(context, uiUpdateCallback);
-                break;
-            case STATE_LOCATION:
-                state = new LocationState(context, uiUpdateCallback);
-                break;
-            case STATE_SENSOR:
-                state = new SensorState(context, uiUpdateCallback);
-                break;
-            case STATE_PRIVACY:
-                state = new PrivacyState(context, uiUpdateCallback);
-                break;
-            case STATE_RESOLUTION_SELECTION:
-                state = new ResolutionSelectionState(context, uiUpdateCallback);
-                break;
-            case STATE_LEGAL:
-                state = new LegalState(context, uiUpdateCallback);
-                break;
-            default:
-                // no-op
-        }
-        return state;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/AllAppsState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/AllAppsState.java
deleted file mode 100644
index 8aac3b02d..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/AllAppsState.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps;
-
-import static com.android.tv.settings.library.device.apps.AppsState.EXTRA_VOLUME_NAME;
-import static com.android.tv.settings.library.device.apps.AppsState.EXTRA_VOLUME_UUID;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class AllAppsState extends PreferenceControllerState {
-    static final String ARG_PACKAGE_NAME = "packageName";
-    private static final String TAG = "AllAppsState";
-    private static final String KEY_SHOW_OTHER_APPS = "ShowOtherApps";
-    private ApplicationsState mApplicationsState;
-    private ApplicationsState.Session mSessionInstalled;
-    private ApplicationsState.AppFilter mFilterInstalled;
-    private ApplicationsState.Session mSessionDisabled;
-    private ApplicationsState.AppFilter mFilterDisabled;
-    private ApplicationsState.Session mSessionOther;
-    private ApplicationsState.AppFilter mFilterOther;
-    private PreferenceCompat mInstalledPreferenceGroup;
-    private PreferenceCompat mDisabledPreferenceGroup;
-    private PreferenceCompat mOtherPreferenceGroup;
-    private PreferenceCompat mShowOtherApps;
-    private static final @ApplicationsState.SessionFlags
-    int SESSION_FLAGS =
-            ApplicationsState.FLAG_SESSION_REQUEST_HOME_APP
-                    | ApplicationsState.FLAG_SESSION_REQUEST_ICONS
-                    | ApplicationsState.FLAG_SESSION_REQUEST_SIZES
-                    | ApplicationsState.FLAG_SESSION_REQUEST_LEANBACK_LAUNCHER;
-    private final Map<PreferenceCompat,
-            ArrayList<ApplicationsState.AppEntry>> mUpdateMap = new ArrayMap<>(3);
-    private long mRunAt = Long.MIN_VALUE;
-    private final Handler mHandler = new Handler();
-
-    private final Runnable mUpdateRunnable = new Runnable() {
-        @Override
-        public void run() {
-            for (final PreferenceCompat group : mUpdateMap.keySet()) {
-                final ArrayList<ApplicationsState.AppEntry> entries = mUpdateMap.get(group);
-                updateAppListInternal(group, entries);
-            }
-            mUpdateMap.clear();
-            mRunAt = 0;
-        }
-    };
-
-    private static final ApplicationsState.AppFilter
-            FILTER_INSTALLED = new ApplicationsState.AppFilter() {
-
-        @Override
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(ApplicationsState.AppEntry info) {
-            return !FILTER_DISABLED.filterApp(info)
-                    && info.info != null
-                    && info.info.enabled
-                    && info.hasLauncherEntry
-                    && info.launcherEntryEnabled;
-        }
-    };
-
-    private static final ApplicationsState.AppFilter
-            FILTER_DISABLED =
-            new ApplicationsState.AppFilter() {
-
-                @Override
-                public void init() {
-                }
-
-                @Override
-                public boolean filterApp(
-                        ApplicationsState.AppEntry info) {
-                    return info.info != null
-                            && (info.info.enabledSetting
-                            == PackageManager.COMPONENT_ENABLED_STATE_DISABLED
-                            || info.info.enabledSetting
-                            == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER
-                            || (info.info.enabledSetting
-                            == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
-                            && !info.info.enabled));
-                }
-            };
-
-    private static final ApplicationsState.AppFilter
-            FILTER_OTHER = new ApplicationsState.AppFilter() {
-
-        @Override
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(
-                ApplicationsState.AppEntry info) {
-            return !FILTER_INSTALLED.filterApp(info) && !FILTER_DISABLED.filterApp(info);
-        }
-    };
-
-    public AllAppsState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mApplicationsState = ApplicationsState.getInstance(((Activity) mContext).getApplication());
-        final String volumeUuid = extras.getString(EXTRA_VOLUME_UUID);
-        final String volumeName = extras.getString(EXTRA_VOLUME_NAME);
-
-        // The UUID of internal storage is null, so we check if there's a volume name to see if we
-        // should only be showing the apps on the internal storage or all apps.
-        if (!TextUtils.isEmpty(volumeUuid) || !TextUtils.isEmpty(volumeName)) {
-            ApplicationsState.AppFilter volumeFilter = new ApplicationsState.VolumeFilter(
-                    volumeUuid);
-
-            mFilterInstalled = new ApplicationsState.CompoundFilter(FILTER_INSTALLED, volumeFilter);
-            mFilterDisabled = new ApplicationsState.CompoundFilter(FILTER_DISABLED, volumeFilter);
-            mFilterOther = new ApplicationsState.CompoundFilter(FILTER_OTHER, volumeFilter);
-        } else {
-            mFilterInstalled = FILTER_INSTALLED;
-            mFilterDisabled = FILTER_DISABLED;
-            mFilterOther = FILTER_OTHER;
-        }
-        mSessionInstalled = mApplicationsState.newSession(new RowUpdateCallbacks() {
-            @Override
-            protected void doRebuild() {
-                rebuildInstalled();
-            }
-
-            @Override
-            public void onRebuildComplete(
-                    ArrayList<ApplicationsState.AppEntry> apps) {
-                updateAppList(mInstalledPreferenceGroup, apps);
-            }
-        }, getLifecycle());
-        mSessionInstalled.setSessionFlags(SESSION_FLAGS);
-
-        mSessionDisabled = mApplicationsState.newSession(new RowUpdateCallbacks() {
-            @Override
-            protected void doRebuild() {
-                rebuildDisabled();
-            }
-
-            @Override
-            public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> apps) {
-                updateAppList(mDisabledPreferenceGroup, apps);
-            }
-        }, getLifecycle());
-        mSessionDisabled.setSessionFlags(SESSION_FLAGS);
-
-        mSessionOther = mApplicationsState.newSession(new RowUpdateCallbacks() {
-            @Override
-            protected void doRebuild() {
-                if (!ManagerUtil.isVisible(mShowOtherApps)) {
-                    rebuildOther();
-                }
-            }
-
-            @Override
-            public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> apps) {
-                updateAppList(mOtherPreferenceGroup, apps);
-            }
-        }, getLifecycle());
-        mSessionOther.setSessionFlags(SESSION_FLAGS);
-
-        rebuildInstalled();
-        rebuildDisabled();
-        mInstalledPreferenceGroup = mPreferenceCompatManager.getOrCreatePrefCompat(
-                "InstalledPreferenceGroup");
-        mDisabledPreferenceGroup = mPreferenceCompatManager.getOrCreatePrefCompat(
-                "DisabledPreferenceGroup");
-        mOtherPreferenceGroup = mPreferenceCompatManager.getOrCreatePrefCompat(
-                "OtherPreferenceGroup");
-        mOtherPreferenceGroup.setVisible(false);
-        mShowOtherApps = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_SHOW_OTHER_APPS);
-        mShowOtherApps.setVisible(TextUtils.isEmpty(volumeUuid));
-    }
-
-    private void rebuildInstalled() {
-        ArrayList<ApplicationsState.AppEntry> apps =
-                mSessionInstalled.rebuild(mFilterInstalled, ApplicationsState.ALPHA_COMPARATOR);
-        if (apps != null) {
-            updateAppList(mInstalledPreferenceGroup, apps);
-        }
-    }
-
-    private void rebuildDisabled() {
-        ArrayList<ApplicationsState.AppEntry> apps =
-                mSessionDisabled.rebuild(mFilterDisabled, ApplicationsState.ALPHA_COMPARATOR);
-        if (apps != null) {
-            updateAppList(mDisabledPreferenceGroup, apps);
-        }
-    }
-
-    private void rebuildOther() {
-        ArrayList<ApplicationsState.AppEntry> apps =
-                mSessionOther.rebuild(mFilterOther, ApplicationsState.ALPHA_COMPARATOR);
-        if (apps != null) {
-            updateAppList(mOtherPreferenceGroup, apps);
-        }
-    }
-
-    private void updateAppList(PreferenceCompat group,
-            ArrayList<ApplicationsState.AppEntry> entries) {
-        if (group == null) {
-            Log.d(TAG, "Not updating list for null group");
-            return;
-        }
-        mUpdateMap.put(group, entries);
-
-        // We can get spammed with updates, so coalesce them to reduce jank and flicker
-        if (mRunAt == Long.MIN_VALUE) {
-            // First run, no delay
-            mHandler.removeCallbacks(mUpdateRunnable);
-            mHandler.post(mUpdateRunnable);
-        } else {
-            if (mRunAt == 0) {
-                mRunAt = SystemClock.uptimeMillis() + 1000;
-            }
-            int delay = (int) (mRunAt - SystemClock.uptimeMillis());
-            delay = delay < 0 ? 0 : delay;
-
-            mHandler.removeCallbacks(mUpdateRunnable);
-            mHandler.postDelayed(mUpdateRunnable, delay);
-        }
-    }
-
-    private void updateAppListInternal(PreferenceCompat group,
-            ArrayList<ApplicationsState.AppEntry> entries) {
-        if (entries != null) {
-            String[] key = group.getKey();
-            group.initChildPreferences();
-            for (final ApplicationsState.AppEntry entry : entries) {
-                String packageName = entry.info.packageName;
-                String[] entryKey = new String[key.length + 1];
-                System.arraycopy(key, 0, entryKey, 0, key.length);
-                entryKey[key.length] = packageName;
-                PreferenceCompat entryPref = new PreferenceCompat(entryKey);
-                group.addChildPrefCompat(entryPref);
-                updatePreferenceParcelable(entryPref, entry);
-            }
-            mUIUpdateCallback.notifyUpdate(getStateIdentifier(), group);
-        }
-        mDisabledPreferenceGroup.setVisible(mDisabledPreferenceGroup.getChildPrefsCount() > 0);
-    }
-
-    /**
-     * Update a PreferenceParcelable based upon {@link ApplicationsState.AppEntry}.
-     */
-    private PreferenceCompat updatePreferenceParcelable(
-            PreferenceCompat preference, ApplicationsState.AppEntry entry) {
-        entry.ensureLabel(mContext);
-        preference.setTitle(entry.label);
-        preference.setSummary(entry.sizeStr);
-        preference.setNextState(ManagerUtil.STATE_APP_MANAGEMENT);
-        Bundle nextStateExtras = new Bundle();
-        AppManagementState.prepareArgs(nextStateExtras, entry.info.packageName);
-        preference.setExtras(nextStateExtras);
-        preference.setIcon(entry.icon);
-        return preference;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        super.onPreferenceTreeClick(key, status);
-        if (KEY_SHOW_OTHER_APPS.equals(key[0])) {
-            showOtherApps();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // no-op
-    }
-
-    private void showOtherApps() {
-        mShowOtherApps.setVisible(false);
-        mOtherPreferenceGroup.setVisible(true);
-        rebuildOther();
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_ALL_APPS;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-
-    private abstract class RowUpdateCallbacks implements ApplicationsState.Callbacks {
-
-        protected abstract void doRebuild();
-
-        @Override
-        public void onRunningStateChanged(boolean running) {
-            doRebuild();
-        }
-
-        @Override
-        public void onPackageListChanged() {
-            doRebuild();
-        }
-
-        @Override
-        public void onPackageIconChanged() {
-            doRebuild();
-        }
-
-        @Override
-        public void onPackageSizeChanged(String packageName) {
-            doRebuild();
-        }
-
-        @Override
-        public void onAllSizesComputed() {
-            doRebuild();
-        }
-
-        @Override
-        public void onLauncherInfoChanged() {
-            doRebuild();
-        }
-
-        @Override
-        public void onLoadEntriesCompleted() {
-            doRebuild();
-        }
-    }
-
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/AlarmsAndRemindersState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/AlarmsAndRemindersState.java
deleted file mode 100644
index 99a3acaab..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/AlarmsAndRemindersState.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps.specialaccess;
-
-import android.Manifest;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.ArrayMap;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.device.apps.ApplicationsState;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-/**
- * Settings state for managing "Alarms & Reminders" permission
- */
-public class AlarmsAndRemindersState extends ManageAppOpState {
-    private AppOpsManager mAppOpsManager;
-    private final ArrayMap<String, ApplicationsState.AppEntry> mAppEntryByKey = new ArrayMap<>();
-
-    public AlarmsAndRemindersState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-    }
-
-    @Override
-    public int getAppOpsOpCode() {
-        return AppOpsManager.OP_SCHEDULE_EXACT_ALARM;
-    }
-
-    @Override
-    public String getPermission() {
-        return Manifest.permission.SCHEDULE_EXACT_ALARM;
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_ALARMS_AND_REMINDERS;
-    }
-
-    @Override
-    public PreferenceCompat createAppPreference(ApplicationsState.AppEntry entry) {
-        final PreferenceCompat appPref = mPreferenceCompatManager
-                .getOrCreatePrefCompat(entry.info.packageName);
-        appPref.setTitle(entry.label);
-        appPref.setIcon(entry.icon);
-
-        appPref.setSummary(getPreferenceSummary(entry).toString());
-        appPref.setChecked(((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed());
-        appPref.setHasOnPreferenceChangeListener(true);
-        appPref.setType(PreferenceCompat.TYPE_SWITCH);
-        mAppEntryByKey.put(appPref.getKey()[0], entry);
-        return appPref;
-    }
-
-    private void setAlarmsAndRemindersAccess(ApplicationsState.AppEntry entry, boolean grant) {
-        mAppOpsManager.setMode(getAppOpsOpCode(),
-                entry.info.uid, entry.info.packageName,
-                grant ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
-        updateAppList();
-    }
-
-    private CharSequence getPreferenceSummary(ApplicationsState.AppEntry entry) {
-        if (entry.extraInfo instanceof ManageAppOpState.PermissionState) {
-            return ((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed()
-                    ? ResourcesUtil.getString(mContext, "app_permission_summary_allowed")
-                    : ResourcesUtil.getString(mContext, "app_permission_summary_not_allowed");
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object newValue) {
-        ApplicationsState.AppEntry appEntry = mAppEntryByKey.get(key[0]);
-        if (appEntry != null) {
-            setAlarmsAndRemindersAccess(appEntry, (Boolean) newValue);
-        }
-        return true;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/AppUsageAccessState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/AppUsageAccessState.java
deleted file mode 100644
index 3933a1b52..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/AppUsageAccessState.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps.specialaccess;
-
-import android.Manifest;
-import android.annotation.NonNull;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.ArrayMap;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.device.apps.ApplicationsState;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-/**
- * State for controlling if apps can monitor app usage
- */
-public class AppUsageAccessState extends ManageAppOpState {
-    private AppOpsManager mAppOpsManager;
-    private final ArrayMap<String, ApplicationsState.AppEntry> mAppEntryByKey = new ArrayMap<>();
-
-    public AppUsageAccessState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-    }
-
-    @Override
-    public int getAppOpsOpCode() {
-        return AppOpsManager.OP_GET_USAGE_STATS;
-    }
-
-    @Override
-    public String getPermission() {
-        return Manifest.permission.PACKAGE_USAGE_STATS;
-    }
-
-    @NonNull
-    @Override
-    public PreferenceCompat createAppPreference(
-            com.android.tv.settings.library.device.apps.ApplicationsState.AppEntry entry) {
-        final PreferenceCompat appPref = mPreferenceCompatManager
-                .getOrCreatePrefCompat(entry.info.packageName);
-        appPref.setTitle(entry.label);
-        appPref.setIcon(entry.icon);
-
-        appPref.setSummary(getPreferenceSummary(entry).toString());
-        appPref.setChecked(((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed());
-        appPref.setHasOnPreferenceChangeListener(true);
-        appPref.setType(PreferenceCompat.TYPE_SWITCH);
-        mAppEntryByKey.put(appPref.getKey()[0], entry);
-        return appPref;
-    }
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object newValue) {
-        ApplicationsState.AppEntry appEntry = mAppEntryByKey.get(key[0]);
-        if (appEntry != null) {
-            setAppUsageAccess(appEntry, (Boolean) newValue);
-        }
-        return true;
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_APP_USAGE_ACCESS;
-    }
-
-    private void setAppUsageAccess(ApplicationsState.AppEntry entry, boolean grant) {
-        mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS,
-                entry.info.uid, entry.info.packageName,
-                grant ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
-        updateAppList();
-    }
-
-    private CharSequence getPreferenceSummary(ApplicationsState.AppEntry entry) {
-        if (entry.extraInfo instanceof ManageAppOpState.PermissionState) {
-            return ((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed()
-                    ? ResourcesUtil.getString(mContext, "app_permission_summary_allowed")
-                    : ResourcesUtil.getString(mContext, "app_permission_summary_not_allowed");
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/PictureInPictureState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/PictureInPictureState.java
deleted file mode 100644
index fe260235e..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/PictureInPictureState.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps.specialaccess;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.device.apps.ApplicationsState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-
-import java.util.List;
-
-/**
- * State for managing which apps are granted PIP access
- */
-public class PictureInPictureState extends PreferenceControllerState implements
-        ManageApplicationsController.Callback {
-    private static final String TAG = "PictureInPicture";
-
-    private ManageApplicationsController mManageApplicationsController;
-    private AppOpsManager mAppOpsManager;
-    private final ArrayMap<String, ApplicationsState.AppEntry> mAppEntryByKey = new ArrayMap<>();
-
-    private final ApplicationsState.AppFilter mFilter =
-            new ApplicationsState.CompoundFilter(
-                    new ApplicationsState.CompoundFilter(
-                            ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
-                            ApplicationsState.FILTER_ALL_ENABLED),
-
-                    new ApplicationsState.AppFilter() {
-                        @Override
-                        public void init() {
-                        }
-
-                        @Override
-                        public boolean filterApp(ApplicationsState.AppEntry info) {
-                            info.extraInfo = mAppOpsManager.checkOpNoThrow(
-                                    AppOpsManager.OP_PICTURE_IN_PICTURE,
-                                    info.info.uid,
-                                    info.info.packageName) == AppOpsManager.MODE_ALLOWED;
-                            return !ManageAppOpState.shouldIgnorePackage(
-                                    mContext, info.info.packageName, 0)
-                                    && checkPackageHasPipActivities(info.info.packageName);
-                        }
-                    });
-
-    public PictureInPictureState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    private boolean checkPackageHasPipActivities(String packageName) {
-        try {
-            final PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(
-                    packageName, PackageManager.GET_ACTIVITIES);
-            if (packageInfo.activities == null) {
-                return false;
-            }
-            for (ActivityInfo info : packageInfo.activities) {
-                if (info.supportsPictureInPicture()) {
-                    return true;
-                }
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "Exception while fetching package info for " + packageName, e);
-            return false;
-        }
-        return false;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-        mManageApplicationsController = new ManageApplicationsController(mContext,
-                getStateIdentifier(),
-                getLifecycle(), mFilter, ApplicationsState.ALPHA_COMPARATOR, this,
-                mUIUpdateCallback);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mManageApplicationsController.updateAppList();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_PICTURE_IN_PICTURE;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-
-    @Override
-    public PreferenceCompat createAppPreference(ApplicationsState.AppEntry entry) {
-        final PreferenceCompat appPref = mPreferenceCompatManager
-                .getOrCreatePrefCompat(entry.info.packageName);
-        appPref.setTitle(entry.label);
-        appPref.setIcon(entry.icon);
-        appPref.setChecked((Boolean) entry.extraInfo);
-        mAppEntryByKey.put(appPref.getKey()[0], entry);
-        appPref.setType(PreferenceCompat.TYPE_SWITCH);
-        appPref.setHasOnPreferenceChangeListener(true);
-        return appPref;
-    }
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object newValue) {
-        ApplicationsState.AppEntry appEntry = mAppEntryByKey.get(key);
-        if (appEntry != null) {
-            mAppOpsManager.setMode(AppOpsManager.OP_PICTURE_IN_PICTURE,
-                    appEntry.info.uid,
-                    appEntry.info.packageName,
-                    (Boolean) newValue ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
-        }
-        return true;
-    }
-
-
-    @Override
-    public PreferenceCompat getEmptyPreference() {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/SpecialAppAccessState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/SpecialAppAccessState.java
deleted file mode 100644
index 2558a7744..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/SpecialAppAccessState.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps.specialaccess;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-
-import java.util.List;
-
-/** {@link State} to handle special access screen. */
-public class SpecialAppAccessState extends PreferenceControllerState {
-    private static final String KEY_FEATURE_PIP = "picture_in_picture";
-    static final String KEY_FEATURE_NOTIFICATION_ACCESS = "notification_access";
-    private static final String[] DISABLED_FEATURES_LOW_RAM_TV =
-            new String[]{KEY_FEATURE_PIP, KEY_FEATURE_NOTIFICATION_ACCESS};
-
-    public SpecialAppAccessState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onResume() {
-        updatePreferenceStates();
-    }
-
-    protected void updatePreferenceStates() {
-        ActivityManager activityManager = (ActivityManager) mContext
-                .getSystemService(Context.ACTIVITY_SERVICE);
-        if (activityManager.isLowRamDevice()) {
-            for (String disabledFeature : DISABLED_FEATURES_LOW_RAM_TV) {
-                PreferenceCompat preferenceCompat =
-                        mPreferenceCompatManager.getOrCreatePrefCompat(disabledFeature);
-                preferenceCompat.setShouldRemove(true);
-                mUIUpdateCallback.notifyUpdate(getStateIdentifier(), preferenceCompat);
-            }
-        }
-        PackageManager packageManager = mContext.getPackageManager();
-        if (!packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
-            PreferenceCompat preferenceCompat =
-                    mPreferenceCompatManager.getOrCreatePrefCompat(KEY_FEATURE_PIP);
-            preferenceCompat.setShouldRemove(true);
-            mUIUpdateCallback.notifyUpdate(getStateIdentifier(), preferenceCompat);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_SPECIAL_ACCESS;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/SystemAlertWindowState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/SystemAlertWindowState.java
deleted file mode 100644
index eb9e51179..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/SystemAlertWindowState.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps.specialaccess;
-
-import android.Manifest;
-import android.annotation.NonNull;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.ArrayMap;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.device.apps.ApplicationsState;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-/**
- * Settings state for managing "Display over other apps" permission
- */
-public class SystemAlertWindowState extends ManageAppOpState {
-    private AppOpsManager mAppOpsManager;
-    private final ArrayMap<String, ApplicationsState.AppEntry> mAppEntryByKey = new ArrayMap<>();
-
-    public SystemAlertWindowState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-    }
-
-    @Override
-    public int getAppOpsOpCode() {
-        return AppOpsManager.OP_SYSTEM_ALERT_WINDOW;
-    }
-
-    @Override
-    public String getPermission() {
-        return Manifest.permission.SYSTEM_ALERT_WINDOW;
-    }
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object value) {
-        ApplicationsState.AppEntry appEntry = mAppEntryByKey.get(key);
-        if (appEntry != null) {
-            setSystemAlertWindowAccess(appEntry, (Boolean) value);
-        }
-        return true;
-    }
-
-    @NonNull
-    @Override
-    public PreferenceCompat createAppPreference(ApplicationsState.AppEntry entry) {
-        final PreferenceCompat appPref = mPreferenceCompatManager
-                .getOrCreatePrefCompat(entry.info.packageName);
-        appPref.setTitle(entry.label);
-        appPref.setIcon(entry.icon);
-        appPref.setSummary(getPreferenceSummary(entry));
-        appPref.setChecked(((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed());
-        appPref.setType(PreferenceCompat.TYPE_SWITCH);
-        appPref.setHasOnPreferenceChangeListener(true);
-        mAppEntryByKey.put(appPref.getKey()[0], entry);
-        return appPref;
-    }
-
-    private void setSystemAlertWindowAccess(ApplicationsState.AppEntry entry, boolean grant) {
-        mAppOpsManager.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                entry.info.uid, entry.info.packageName,
-                grant ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
-        updateAppList();
-    }
-
-    private String getPreferenceSummary(ApplicationsState.AppEntry entry) {
-        if (entry.extraInfo instanceof ManageAppOpState.PermissionState) {
-            return ((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed()
-                    ? ResourcesUtil.getString(mContext, "app_permission_summary_allowed")
-                    : ResourcesUtil.getString(mContext, "app_permission_summary_not_allowed");
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_SYSTEM_ALERT_WINDOW;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/WriteSettingsState.java b/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/WriteSettingsState.java
deleted file mode 100644
index 811849736..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/apps/specialaccess/WriteSettingsState.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.apps.specialaccess;
-
-import android.Manifest;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.ArrayMap;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.device.apps.ApplicationsState;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-/**
- * Settings state for managing apps which can write system settings
- */
-public class WriteSettingsState extends ManageAppOpState {
-    private AppOpsManager mAppOpsManager;
-    private final ArrayMap<String, ApplicationsState.AppEntry> mAppEntryByKey = new ArrayMap<>();
-
-    public WriteSettingsState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public int getAppOpsOpCode() {
-        return AppOpsManager.OP_WRITE_SETTINGS;
-    }
-
-    @Override
-    public String getPermission() {
-        return Manifest.permission.WRITE_SETTINGS;
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_WRITE_SETTINGS;
-    }
-
-    @Override
-    public PreferenceCompat createAppPreference(ApplicationsState.AppEntry entry) {
-        final PreferenceCompat appPref = mPreferenceCompatManager
-                .getOrCreatePrefCompat(entry.info.packageName);
-        appPref.setTitle(entry.label);
-        appPref.setIcon(entry.icon);
-
-        appPref.setSummary(getPreferenceSummary(entry).toString());
-        appPref.setChecked(((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed());
-        appPref.setType(PreferenceCompat.TYPE_SWITCH);
-        appPref.setHasOnPreferenceChangeListener(true);
-        mAppEntryByKey.put(appPref.getKey()[0], entry);
-        return appPref;
-    }
-
-    private CharSequence getPreferenceSummary(ApplicationsState.AppEntry entry) {
-        if (entry.extraInfo instanceof ManageAppOpState.PermissionState) {
-            return ((ManageAppOpState.PermissionState) entry.extraInfo).isAllowed()
-                    ? ResourcesUtil.getString(mContext, "write_settings_on")
-                    : ResourcesUtil.getString(mContext, "write_settings_off");
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object newValue) {
-        ApplicationsState.AppEntry appEntry = mAppEntryByKey.get(key);
-        if (appEntry != null) {
-            setWriteSettingsAccess(appEntry, (Boolean) newValue);
-        }
-        return true;
-    }
-
-
-    private void setWriteSettingsAccess(ApplicationsState.AppEntry entry, Boolean grant) {
-        mAppOpsManager.setMode(AppOpsManager.OP_WRITE_SETTINGS,
-                entry.info.uid, entry.info.packageName,
-                grant ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
-        updateAppList();
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/ActiveDreamPC.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/ActiveDreamPC.java
deleted file mode 100644
index 8ff5c4a74..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/ActiveDreamPC.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.daydream;
-
-import static com.android.tv.settings.library.device.display.daydream.DaydreamState.KEY_ACTIVE_DREAM;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceCompatManager;
-import com.android.tv.settings.library.util.RestrictedPreferenceController;
-
-public class ActiveDreamPC extends RestrictedPreferenceController {
-    public ActiveDreamPC(Context context,
-            UIUpdateCallback callback, int stateIdentifier,
-            PreferenceCompatManager preferenceCompatManager) {
-        super(context, callback, stateIdentifier, preferenceCompatManager);
-    }
-
-    @Override
-    public String[] getPreferenceKey() {
-        return new String[]{KEY_ACTIVE_DREAM};
-    }
-
-    @Override
-    public void update() {
-        mPreferenceCompat.setHasOnPreferenceChangeListener(true);
-        mPreferenceCompat.setType(PreferenceCompat.TYPE_LIST);
-        UserManager userManager = UserManager.get(mContext);
-        if (userManager.hasUserRestriction(getAttrUserRestriction())) {
-            mPreferenceCompat.setEnabled(false);
-        }
-        super.update();
-    }
-
-    @Override
-    public boolean useAdminDisabledSummary() {
-        return false;
-    }
-
-    void setEntries(CharSequence[] dreamEntries) {
-        mPreferenceCompat.setEntries(dreamEntries);
-    }
-
-    void setEntryValues(CharSequence[] dreamEntryValues) {
-        mPreferenceCompat.setEntryValues(dreamEntryValues);
-    }
-
-    void setValue(String value) {
-        mPreferenceCompat.setValue(value);
-    }
-
-    @Override
-    public String getAttrUserRestriction() {
-        return UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/DaydreamState.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/DaydreamState.java
deleted file mode 100644
index 999cb3485..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/DaydreamState.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.daydream;
-
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.format.DateUtils;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.settingslib.DreamBackend;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * State to provide data for rendering daydream settings screen.
- */
-public class DaydreamState extends PreferenceControllerState {
-    private static final String TAG = "DaydreamState";
-
-    static final String KEY_ACTIVE_DREAM = "activeDream";
-    static final String KEY_DREAM_TIME = "dreamTime";
-    static final String KEY_DREAM_NOW = "dreamNow";
-
-    private static final String DREAM_COMPONENT_NONE = "NONE";
-    private static final String PACKAGE_SCHEME = "package";
-
-    private static final int DEFAULT_DREAM_TIME_MS = (int) (30 * DateUtils.MINUTE_IN_MILLIS);
-
-    private final PackageReceiver mPackageReceiver = new PackageReceiver();
-    private DreamTimePC mDreamTimePC;
-    private ActiveDreamPC mActiveDreamPC;
-    private PreferenceCompat mDreamNowPref;
-
-    private DreamBackend mBackend;
-    private final Map<String, DreamBackend.DreamInfo> mDreamInfos = new ArrayMap<>();
-
-    public DaydreamState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mBackend = new DreamBackend(mContext);
-        refreshActiveDreamPref();
-        if (mDreamTimePC != null) {
-            mDreamTimePC.setValue(Integer.toString(getDreamTime()));
-        }
-
-        mDreamNowPref = mPreferenceCompatManager.getOrCreatePrefCompat(new String[]{KEY_DREAM_NOW});
-        mDreamNowPref.setEnabled(mBackend.isEnabled());
-    }
-
-
-    private int getDreamTime() {
-        return Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT,
-                DEFAULT_DREAM_TIME_MS);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        refreshFromBackend();
-
-        // listen for package changes
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addDataScheme(PACKAGE_SCHEME);
-        mContext.registerReceiver(mPackageReceiver, filter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mContext.unregisterReceiver(mPackageReceiver);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_DAYDREAM;
-    }
-
-    private void refreshActiveDreamPref() {
-        if (mActiveDreamPC == null) {
-            return;
-        }
-
-        final List<DreamBackend.DreamInfo> infos = mBackend.getDreamInfos();
-        final CharSequence[] dreamEntries = new CharSequence[infos.size() + 1];
-        final CharSequence[] dreamEntryValues = new CharSequence[infos.size() + 1];
-        refreshDreamInfoMap(infos, dreamEntries, dreamEntryValues);
-        final ComponentName currentDreamComponent = mBackend.getActiveDream();
-
-        mActiveDreamPC.setEntries(dreamEntries);
-        mActiveDreamPC.setEntryValues(dreamEntryValues);
-        mActiveDreamPC.setValue(mBackend.isEnabled() && currentDreamComponent != null
-                ? currentDreamComponent.toShortString() : DREAM_COMPONENT_NONE);
-        mActiveDreamPC.updateAndNotify();
-    }
-
-    private void refreshDreamInfoMap(List<DreamBackend.DreamInfo> infos,
-            CharSequence[] listEntries, CharSequence[] listEntryValues) {
-        mDreamInfos.clear();
-        listEntries[0] = ResourcesUtil.getString(mContext, "device_daydreams_none");
-        listEntryValues[0] = DREAM_COMPONENT_NONE;
-        int index = 1;
-        for (final DreamBackend.DreamInfo info : infos) {
-            final String componentNameString = info.componentName.toShortString();
-            mDreamInfos.put(componentNameString, info);
-            listEntries[index] = info.caption;
-            listEntryValues[index] = componentNameString;
-            index++;
-        }
-    }
-
-    private void refreshFromBackend() {
-        if (mContext == null) {
-            Log.d(TAG, "No activity, not refreshing");
-            return;
-        }
-
-        refreshActiveDreamPref();
-        if (mDreamTimePC != null) {
-            mDreamTimePC.setValue(Integer.toString(getDreamTime()));
-        }
-
-        if (mDreamNowPref != null) {
-            mDreamNowPref.setEnabled(mBackend.isEnabled());
-        }
-    }
-
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object newValue) {
-        switch (key[0]) {
-            case KEY_ACTIVE_DREAM:
-                setActiveDream((String) newValue);
-                return true;
-            case KEY_DREAM_TIME:
-                final int sleepTimeout = Integer.parseInt((String) newValue);
-                setDreamTime(sleepTimeout);
-                return true;
-        }
-        return super.onPreferenceChange(key, newValue);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        switch (key[0]) {
-            case KEY_DREAM_NOW:
-                mBackend.startDreaming();
-                return true;
-            default:
-                return super.onPreferenceTreeClick(key, status);
-        }
-    }
-
-    private void setActiveDream(String componentNameString) {
-        final DreamBackend.DreamInfo dreamInfo = mDreamInfos.get(componentNameString);
-        if (dreamInfo != null) {
-            if (dreamInfo.settingsComponentName != null) {
-                mContext.startActivity(new Intent().setComponent(dreamInfo.settingsComponentName));
-            }
-            if (!mBackend.isEnabled()) {
-                mBackend.setEnabled(true);
-            }
-            if (!Objects.equals(mBackend.getActiveDream(), dreamInfo.componentName)) {
-                mBackend.setActiveDream(dreamInfo.componentName);
-            }
-        } else {
-            if (mBackend.isEnabled()) {
-                mBackend.setActiveDream(null);
-                mBackend.setEnabled(false);
-            }
-        }
-    }
-
-    private void setDreamTime(int ms) {
-        Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, ms);
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        List<AbstractPreferenceController> preferenceControllers = new ArrayList<>();
-        mDreamTimePC = new DreamTimePC(mContext, mUIUpdateCallback, getStateIdentifier(),
-                mPreferenceCompatManager);
-        mActiveDreamPC = new ActiveDreamPC(mContext, mUIUpdateCallback, getStateIdentifier(),
-                mPreferenceCompatManager);
-        preferenceControllers.add(mActiveDreamPC);
-        preferenceControllers.add(mDreamTimePC);
-        return preferenceControllers;
-    }
-
-    private class PackageReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            refreshFromBackend();
-        }
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/DreamTimePC.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/DreamTimePC.java
deleted file mode 100644
index c0cf093d2..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/daydream/DreamTimePC.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.daydream;
-
-import static com.android.tv.settings.library.device.display.daydream.DaydreamState.KEY_DREAM_TIME;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceCompatManager;
-import com.android.tv.settings.library.util.RestrictedPreferenceController;
-
-public class DreamTimePC extends RestrictedPreferenceController {
-    public DreamTimePC(Context context,
-            UIUpdateCallback callback, int stateIdentifier,
-            PreferenceCompatManager preferenceCompatManager) {
-        super(context, callback, stateIdentifier, preferenceCompatManager);
-    }
-
-    @Override
-    public String[] getPreferenceKey() {
-        return new String[]{KEY_DREAM_TIME};
-    }
-
-    @Override
-    public boolean useAdminDisabledSummary() {
-        return false;
-    }
-
-    @Override
-    public String getAttrUserRestriction() {
-        return UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT;
-    }
-
-    public void setValue(String value) {
-        mPreferenceCompat.setValue(value);
-        notifyChange();
-    }
-
-    public String getValue() {
-        return mPreferenceCompat.getValue();
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/AdvancedDisplayState.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/AdvancedDisplayState.java
deleted file mode 100644
index ce1745080..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/AdvancedDisplayState.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.displaysound;
-
-import static android.provider.Settings.Secure.MINIMAL_POST_PROCESSING_ALLOWED;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-
-import java.util.List;
-
-/**
- * State to provide data for rendering advanced display screen.
- */
-public class AdvancedDisplayState extends PreferenceControllerState {
-    private static final String KEY_GAME_MODE = "game_mode";
-    private PreferenceCompat mAllowGameMode;
-
-    public AdvancedDisplayState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mAllowGameMode = mPreferenceCompatManager
-                .getOrCreatePrefCompat(new String[]{KEY_GAME_MODE});
-        mAllowGameMode.setType(PreferenceCompat.TYPE_SWITCH);
-        mAllowGameMode.setChecked(getGameModeStatus() == 1);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mAllowGameMode);
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_ADVANCED_DISPLAY;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (TextUtils.equals(key[0], KEY_GAME_MODE)) {
-            setGameModeStatus(status ? 1 : 0);
-        }
-        return super.onPreferenceTreeClick(key, status);
-    }
-
-    private void setGameModeStatus(int state) {
-        Settings.Secure.putInt(mContext.getContentResolver(), MINIMAL_POST_PROCESSING_ALLOWED,
-                state);
-    }
-
-    private int getGameModeStatus() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                MINIMAL_POST_PROCESSING_ALLOWED,
-                1);
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/DisplaySoundState.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/DisplaySoundState.java
deleted file mode 100644
index 2d8625411..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/DisplaySoundState.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.displaysound;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.hardware.hdmi.HdmiControlManager;
-import android.media.AudioManager;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.List;
-
-/**
- * State to provide data for rendering display sound settings screen.
- */
-public class DisplaySoundState extends PreferenceControllerState {
-    static final String KEY_SOUND_EFFECTS = "sound_effects";
-    private static final String KEY_CEC = "cec";
-
-    private AudioManager mAudioManager;
-    private HdmiControlManager mHdmiControlManager;
-    private PreferenceCompat mSoundPref;
-    private PreferenceCompat mCecPref;
-
-    public DisplaySoundState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    private static boolean getSoundEffectsEnabled(ContentResolver contentResolver) {
-        return Settings.System.getInt(contentResolver, Settings.System.SOUND_EFFECTS_ENABLED, 1)
-                != 0;
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mSoundPref = mPreferenceCompatManager.getOrCreatePrefCompat(
-                new String[]{KEY_SOUND_EFFECTS});
-        mCecPref = mPreferenceCompatManager.getOrCreatePrefCompat(new String[]{KEY_CEC});
-        mSoundPref.setChecked(getSoundEffectsEnabled());
-        updateCecPreference();
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mSoundPref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCecPref);
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateCecPreference();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (KEY_SOUND_EFFECTS.equals(key[0])) {
-            setSoundEffectsEnabled(status);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onAttach() {
-        mAudioManager = mContext.getSystemService(AudioManager.class);
-        mHdmiControlManager = mContext.getSystemService(HdmiControlManager.class);
-        super.onAttach();
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_DISPLAY_SOUND;
-    }
-
-    private boolean getSoundEffectsEnabled() {
-        return getSoundEffectsEnabled(mContext.getContentResolver());
-    }
-
-    private void setSoundEffectsEnabled(boolean enabled) {
-        if (enabled) {
-            mAudioManager.loadSoundEffects();
-        } else {
-            mAudioManager.unloadSoundEffects();
-        }
-        Settings.System.putInt(mContext.getContentResolver(),
-                Settings.System.SOUND_EFFECTS_ENABLED, enabled ? 1 : 0);
-    }
-
-    private void updateCecPreference() {
-        // Rendering layer should determine whether to show cec toggle as this is a slice
-        // preference.
-        boolean cecEnabled = mHdmiControlManager.getHdmiCecEnabled()
-                == HdmiControlManager.HDMI_CEC_CONTROL_ENABLED;
-        mCecPref.setSummary(cecEnabled
-                ? ResourcesUtil.getString(mContext, "enabled")
-                : ResourcesUtil.getString(mContext, "disabled"));
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCecPref);
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/FontScaleState.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/FontScaleState.java
deleted file mode 100644
index 91e23030c..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/FontScaleState.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.displaysound;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.List;
-
-/**
- * State to provide data for rendering font scale settings screen.
- */
-public class FontScaleState extends PreferenceControllerState {
-    private static final String FONT_SCALE_GROUP = "font_scale_radio_group";
-    private PreferenceCompat mFontScaleGroup;
-
-    /** Value of FONT_SCALE. */
-    private float mCurrentFontScaleValue;
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mFontScaleGroup = mPreferenceCompatManager.getOrCreatePrefCompat(FONT_SCALE_GROUP);
-        mFontScaleGroup.setType(PreferenceCompat.TYPE_PREFERENCE_CATEGORY);
-        mFontScaleGroup.setTitle(FONT_SCALE_GROUP);
-        final String[] entryValues = ResourcesUtil.getStringArray(mContext,
-                "font_scale_entry_values");
-        final String[] entries = ResourcesUtil.getStringArray(mContext, "font_scale_entries");
-        initFontScaleValue();
-
-        for (int i = 0; i < entryValues.length; i++) {
-            final PreferenceCompat preference = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{FONT_SCALE_GROUP, entryValues[i]});
-            preference.setPersistent(false);
-            preference.setType(PreferenceCompat.TYPE_RADIO);
-            preference.setRadioGroup(FONT_SCALE_GROUP);
-            int scaleValue = (int) (Float.valueOf(entryValues[i]) * 100);
-            String summary = ResourcesUtil.getString(
-                    mContext, "font_scale_item_detail", scaleValue);
-            preference.setSummary(summary);
-            preference.setTitle(entries[i]);
-            Bundle b = new Bundle();
-            b.putString(ManagerUtil.INFO_PREVIEW_FONT_SCALE_VALUE, entryValues[i]);
-            extras.putFloat(
-                    ManagerUtil.INFO_CURRENT_FONT_SCALE_VALUE, mCurrentFontScaleValue);
-
-            if (Float.compare(mCurrentFontScaleValue, Float.parseFloat(entryValues[i])) == 0) {
-                preference.setChecked(true);
-            }
-            mFontScaleGroup.addChildPrefCompat(preference);
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mFontScaleGroup);
-    }
-
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (key.length != 2) {
-            return false;
-        }
-        mCurrentFontScaleValue = Float.parseFloat(key[1]);
-        commit();
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mFontScaleGroup);
-        return true;
-    }
-
-    protected void commit() {
-        if (mContext == null) return;
-        final ContentResolver resolver = mContext.getContentResolver();
-        Settings.System.putFloat(resolver, Settings.System.FONT_SCALE, mCurrentFontScaleValue);
-    }
-
-    private void initFontScaleValue() {
-        final ContentResolver resolver = mContext.getContentResolver();
-        mCurrentFontScaleValue =
-                Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, 1.0f);
-    }
-
-    public FontScaleState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_FONT_SCALE;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/MatchContentFrameRateState.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/MatchContentFrameRateState.java
deleted file mode 100644
index 6fe3b7ada..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/MatchContentFrameRateState.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.displaysound;
-
-
-import android.content.Context;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.List;
-
-/**
- * State to provide data for rendering match content frame rate screen.
- */
-public class MatchContentFrameRateState extends PreferenceControllerState {
-    private static final String KEY_MATCH_CONTENT_FRAME_RATE = "match_content_frame_rate_option";
-
-    private static final String KEY_MATCH_CONTENT_FRAME_RATE_SEAMLESS =
-            "match_content_frame_rate_seamless";
-    private static final String KEY_MATCH_CONTENT_FRAME_RATE_NON_SEAMLESS =
-            "match_content_frame_rate_non_seamless";
-    private static final String KEY_MATCH_CONTENT_FRAME_RATE_NEVER =
-            "match_content_frame_rate_never";
-    private PreferenceCompat mPrefGroup;
-    private PreferenceCompat mCurrentPreference;
-    private PreferenceCompat mNeverPref;
-    private PreferenceCompat mSeamlessPref;
-    private PreferenceCompat mNonSeamlessPref;
-
-    public MatchContentFrameRateState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_MATCH_CONTENT_FRAME;
-    }
-
-    private PreferenceCompat getCurrentPreference() {
-        int matchContentSetting = getCurrentSettingValue();
-        switch (matchContentSetting) {
-            case (Settings.Secure.MATCH_CONTENT_FRAMERATE_NEVER): {
-                return mNeverPref;
-            }
-            case (Settings.Secure.MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY): {
-                return mSeamlessPref;
-            }
-            case (Settings.Secure.MATCH_CONTENT_FRAMERATE_ALWAYS): {
-                return mNonSeamlessPref;
-            }
-            default:
-                throw new IllegalArgumentException("Unknown match content frame rate pref "
-                        + "value in stored settings");
-        }
-    }
-
-    private int getCurrentSettingValue() {
-        return Settings.Secure.getInt(
-                mContext.getContentResolver(),
-                Settings.Secure.MATCH_CONTENT_FRAME_RATE,
-                Settings.Secure.MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        int newValue;
-        switch (key[1]) {
-            case KEY_MATCH_CONTENT_FRAME_RATE_SEAMLESS: {
-                newValue = Settings.Secure.MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY;
-                break;
-            }
-            case KEY_MATCH_CONTENT_FRAME_RATE_NON_SEAMLESS: {
-                newValue = Settings.Secure.MATCH_CONTENT_FRAMERATE_ALWAYS;
-                break;
-            }
-            case KEY_MATCH_CONTENT_FRAME_RATE_NEVER: {
-                newValue = Settings.Secure.MATCH_CONTENT_FRAMERATE_NEVER;
-                break;
-            }
-            default:
-                return false;
-        }
-        int oldValue = getCurrentSettingValue();
-        if (newValue != oldValue) {
-            Settings.Secure.putInt(
-                    mContext.getContentResolver(),
-                    Settings.Secure.MATCH_CONTENT_FRAME_RATE,
-                    newValue);
-        }
-        return true;
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mPrefGroup = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_MATCH_CONTENT_FRAME_RATE);
-        mPrefGroup.setType(PreferenceCompat.TYPE_PREFERENCE_CATEGORY);
-        mSeamlessPref = mPreferenceCompatManager.getOrCreatePrefCompat(
-                new String[]{KEY_MATCH_CONTENT_FRAME_RATE, KEY_MATCH_CONTENT_FRAME_RATE_SEAMLESS});
-        mSeamlessPref.setType(PreferenceCompat.TYPE_RADIO);
-        mSeamlessPref.setTitle(
-                ResourcesUtil.getString(mContext, "match_content_frame_rate_seamless"));
-        mSeamlessPref.setRadioGroup(KEY_MATCH_CONTENT_FRAME_RATE);
-
-        mNonSeamlessPref = mPreferenceCompatManager.getOrCreatePrefCompat(
-                new String[]{KEY_MATCH_CONTENT_FRAME_RATE,
-                        KEY_MATCH_CONTENT_FRAME_RATE_NON_SEAMLESS});
-        mNonSeamlessPref.setType(PreferenceCompat.TYPE_RADIO);
-        mNonSeamlessPref.setTitle(ResourcesUtil.getString(mContext,
-                "match_content_frame_rate_non_seamless"));
-        mNonSeamlessPref.setRadioGroup(KEY_MATCH_CONTENT_FRAME_RATE);
-
-        mNeverPref = mPreferenceCompatManager.getOrCreatePrefCompat(
-                new String[]{KEY_MATCH_CONTENT_FRAME_RATE, KEY_MATCH_CONTENT_FRAME_RATE_NEVER});
-        mNeverPref.setType(PreferenceCompat.TYPE_RADIO);
-        mNeverPref.setTitle(ResourcesUtil.getString(mContext, "match_content_frame_rate_never"));
-        mNeverPref.setRadioGroup(KEY_MATCH_CONTENT_FRAME_RATE);
-
-        mPrefGroup.addChildPrefCompat(mSeamlessPref);
-        mPrefGroup.addChildPrefCompat(mNonSeamlessPref);
-        mPrefGroup.addChildPrefCompat(mNeverPref);
-
-        mCurrentPreference = getCurrentPreference();
-        mCurrentPreference.setChecked(true);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mPrefGroup);
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/ResolutionSelectionState.java b/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/ResolutionSelectionState.java
deleted file mode 100644
index 546c65e45..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/display/displaysound/ResolutionSelectionState.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.display.displaysound;
-
-import static com.android.tv.settings.library.ManagerUtil.STATE_RESOLUTION_SELECTION;
-
-import android.content.Context;
-import android.hardware.display.DisplayManager;
-import android.os.Bundle;
-import android.view.Display;
-
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Provide data for resolution selection settings screen.
- */
-public class ResolutionSelectionState extends PreferenceControllerState {
-    private static final String KEY_MODE_SELECTION = "resolution_selection_option";
-    private static final String KEY_RESOLUTION_PREFIX = "resolution_selection_";
-    private static final String KEY_RESOLUTION_SELECTION_AUTO = "resolution_selection_auto";
-
-    private DisplayManager mDisplayManager;
-    private Display.Mode[] mModes;
-    private int mUserPreferredModeIndex;
-    private PreferenceCompat mResolutionCategory;
-
-    static final Set<Integer> STANDARD_RESOLUTIONS_IN_ORDER = Set.of(2160, 1080, 720, 576, 480);
-
-    public ResolutionSelectionState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onAttach() {
-        super.onAttach();
-        mDisplayManager = getDisplayManager();
-    }
-
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mResolutionCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_MODE_SELECTION);
-
-        Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
-        mModes = display.getSupportedModes();
-        Arrays.sort(mModes, new Comparator<Display.Mode>() {
-            // Sort in descending order of refresh rate.
-            @Override
-            public int compare(Display.Mode o1, Display.Mode o2) {
-                int resolution1 = Math.min(o1.getPhysicalHeight(), o1.getPhysicalWidth());
-                int resolution2 = Math.min(o2.getPhysicalHeight(), o2.getPhysicalWidth());
-
-                // The resolution which is in list of standard resolutions appears before the one
-                // which is not.
-                if (STANDARD_RESOLUTIONS_IN_ORDER.contains(resolution2)
-                        && !STANDARD_RESOLUTIONS_IN_ORDER.contains(resolution1)) {
-                    return 1;
-                }
-                if (STANDARD_RESOLUTIONS_IN_ORDER.contains(resolution1)
-                        && !STANDARD_RESOLUTIONS_IN_ORDER.contains(resolution2)) {
-                    return -1;
-                }
-                if (resolution2 == resolution1) {
-                    return (int) o2.getRefreshRate() - (int) o1.getRefreshRate();
-                }
-                return resolution2 - resolution1;
-            }
-        });
-
-        createPreferences();
-
-        mUserPreferredModeIndex = lookupModeIndex(
-                mDisplayManager.getGlobalUserPreferredDisplayMode());
-        if (mUserPreferredModeIndex != -1) {
-            selectRadioPreference(new String[]{KEY_MODE_SELECTION,
-                    KEY_RESOLUTION_PREFIX + mUserPreferredModeIndex});
-        } else {
-            selectRadioPreference(new String[]{KEY_MODE_SELECTION, KEY_RESOLUTION_SELECTION_AUTO});
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mResolutionCategory);
-    }
-
-    DisplayManager getDisplayManager() {
-        return mContext.getSystemService(DisplayManager.class);
-    }
-
-    private void selectRadioPreference(String[] key) {
-        final PreferenceCompat radioPreference = mPreferenceCompatManager.getPrefCompat(key);
-        if (radioPreference != null) {
-            radioPreference.setChecked(true);
-        }
-    }
-
-    /** Returns the index of Display mode that matches UserPreferredMode */
-    public int lookupModeIndex(Display.Mode userPreferredMode) {
-        if (userPreferredMode != null) {
-            for (int i = 0; i < mModes.length; i++) {
-                if (mModes[i].matches(userPreferredMode.getPhysicalWidth(),
-                        userPreferredMode.getPhysicalHeight(),
-                        userPreferredMode.getRefreshRate())) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-
-    private void createPreferences() {
-        PreferenceCompat pref = mPreferenceCompatManager.getOrCreatePrefCompat(
-                new String[]{KEY_MODE_SELECTION, KEY_RESOLUTION_SELECTION_AUTO});
-        pref.setTitle(ResourcesUtil.getString(mContext, "resolution_selection_auto_title"));
-        pref.setRadioGroup(KEY_MODE_SELECTION);
-        pref.setType(PreferenceCompat.TYPE_RADIO);
-        mResolutionCategory.addChildPrefCompat(pref);
-
-        for (int i = 0; i < mModes.length; i++) {
-            int resolution = Math.min(mModes[i].getPhysicalHeight(), mModes[i].getPhysicalWidth());
-            String title = resolution + "p";
-            if (resolution == 2160) {
-                title = "4k";
-            }
-            mResolutionCategory.addChildPrefCompat(createResolutionPreferenceCompat(
-                    title,
-                    getRefreshRateString(mModes[i].getRefreshRate()) + " Hz",
-                    i));
-        }
-    }
-
-    private String getRefreshRateString(float refreshRate) {
-        float roundedRefreshRate = Math.round(refreshRate * 100.0f) / 100.0f;
-        if (roundedRefreshRate % 1 == 0) {
-            return Integer.toString((int) roundedRefreshRate);
-        } else {
-            return Float.toString(roundedRefreshRate);
-        }
-    }
-
-    /** Returns a radio preference for each display mode. */
-    private PreferenceCompat createResolutionPreferenceCompat(
-            String title, String summary, int resolution) {
-        PreferenceCompat pref = mPreferenceCompatManager.getOrCreatePrefCompat(new String[]{
-                KEY_MODE_SELECTION,
-                KEY_RESOLUTION_PREFIX + resolution});
-        pref.setTitle(title);
-        pref.setSummary(summary);
-        pref.setType(PreferenceCompat.TYPE_RADIO);
-        pref.setRadioGroup(KEY_MODE_SELECTION);
-        return pref;
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return STATE_RESOLUTION_SELECTION;
-    }
-
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (key.length != 2) {
-            return false;
-        }
-
-        if (key[1].equals(KEY_RESOLUTION_SELECTION_AUTO)) {
-            mDisplayManager.clearGlobalUserPreferredDisplayMode();
-            return true;
-        } else if (key[1].contains(KEY_RESOLUTION_PREFIX)) {
-            int modeIndex = Integer.valueOf(key[1].substring(KEY_RESOLUTION_PREFIX.length()));
-            Display.Mode mode = mModes[modeIndex];
-            mDisplayManager.setGlobalUserPreferredDisplayMode(mode);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/storage/MissingStorageState.java b/SettingsAPI/java/com/android/tv/settings/library/device/storage/MissingStorageState.java
deleted file mode 100644
index b33bef375..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/storage/MissingStorageState.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.storage;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.storage.StorageManager;
-import android.os.storage.VolumeRecord;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.List;
-
-/** State to handle missing storage screen. */
-public class MissingStorageState extends PreferenceControllerState {
-    private static final String TAG = "MissingStorageState";
-
-    private static final String KEY_FORGET = "forget";
-    private static final String INTENT_CONFIRMATION = "android.settings.ui.CONFIRM";
-    private static final String EXTRA_GUIDANCE_TITLE = "guidancetitle";
-    private static final String EXTRA_GUIDANCE_SUBTITLE = "guidanceSubtitle";
-
-    private static final int REQUEST_FORGET_PRIVATE = 1;
-
-    private String mFsUuid;
-    private StorageManager mStorageManager;
-    PreferenceCompat mForgetPreferenceCompat;
-
-    public static void prepareArgs(Bundle b, String fsUuid) {
-        b.putString(VolumeRecord.EXTRA_FS_UUID, fsUuid);
-    }
-
-    public MissingStorageState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mFsUuid = extras.getString(VolumeRecord.EXTRA_FS_UUID);
-        mStorageManager = mContext.getSystemService(StorageManager.class);
-        mStorageManager.registerListener(new StorageEventListener());
-        mForgetPreferenceCompat = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_FORGET);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (KEY_FORGET.equals(key[0])) {
-            Intent i = new Intent(INTENT_CONFIRMATION);
-            i.putExtra(EXTRA_GUIDANCE_TITLE, ResourcesUtil.getString(
-                    mContext, "storage_wizard_forget_confirm_title"));
-            i.putExtra(EXTRA_GUIDANCE_SUBTITLE, ResourcesUtil.getString(
-                    mContext, "storage_wizard_forget_confirm_description"));
-            ((Activity) mContext).startActivityForResult(i,
-                    ManagerUtil.calculateCompoundCode(
-                            getStateIdentifier(), REQUEST_FORGET_PRIVATE
-                    ));
-            return true;
-        }
-        return super.onPreferenceTreeClick(key, status);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_FORGET_PRIVATE:
-                if (resultCode == Activity.RESULT_OK) {
-                    mContext.getSystemService(StorageManager.class).forgetVolume(mFsUuid);
-                }
-                break;
-            default:
-                // no-op
-        }
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_MISSING_STORAGE;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-
-    private class StorageEventListener extends android.os.storage.StorageEventListener {
-
-        @Override
-        public void onVolumeForgotten(String fsUuid) {
-            if (!TextUtils.equals(fsUuid, mFsUuid)) {
-                return;
-            }
-            if (mStorageManager.findRecordByUuid(fsUuid) == null) {
-                mUIUpdateCallback.notifyNavigateBackward(getStateIdentifier());
-                Log.i(TAG, "FsUuid " + mFsUuid + " vanished while resumed");
-            }
-        }
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/storage/StorageState.java b/SettingsAPI/java/com/android/tv/settings/library/device/storage/StorageState.java
deleted file mode 100644
index 7eda65531..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/storage/StorageState.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.storage;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.storage.DiskInfo;
-import android.os.storage.StorageManager;
-import android.os.storage.VolumeInfo;
-import android.text.TextUtils;
-import android.text.format.Formatter;
-import android.util.Log;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.device.apps.AppsState;
-import com.android.tv.settings.library.settingslib.StorageMeasurement;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-
-/** State to handle storage screen. */
-public class StorageState extends PreferenceControllerState {
-    private static final String TAG = "StorageFragment";
-    private static final String EXTRA_MIGRATE_HERE =
-            "com.android.tv.settings.device.storage.MigrateStorageActivity.MIGRATE_HERE";
-    private static final String INTENT_ACTION_FORMAT_AS_PRIVATE =
-            "com.android.tv.settings.device.storage.FormatActivity.formatAsPrivate";
-    private static final String INTENT_ACTION_FORMAT_AS_PUBLIC =
-            "com.android.tv.settings.device.storage.FormatActivity.formatAsPublic";
-    private static final String EXTRA_VOLUME_DESC = "UnmountActivity.volumeDesc";
-    private static final String INTENT_NEW_STORAGE = "com.android.tv.settings.action.NEW_STORAGE";
-    private static final String INTENT_UNMOUNT = "com.android.tv.settings.action.UNMOUNT_STORAGE";
-    private static final String INTENT_CONFIRMATION = "android.settings.ui.CONFIRM";
-    private static final String EXTRA_GUIDANCE_TITLE = "guidancetitle";
-    private static final String EXTRA_GUIDANCE_SUBTITLE = "guidanceSubtitle";
-    private static final String KEY_MIGRATE = "migrate";
-    private static final String KEY_EJECT = "eject";
-    private static final String KEY_ERASE = "erase";
-    private static final String KEY_APPS_USAGE = "apps_usage";
-    private static final String KEY_DCIM_USAGE = "dcim_usage";
-    private static final String KEY_MUSIC_USAGE = "music_usage";
-    private static final String KEY_DOWNLOADS_USAGE = "downloads_usage";
-    private static final String KEY_CACHE_USAGE = "cache_usage";
-    private static final String KEY_MISC_USAGE = "misc_usage";
-    private static final String KEY_AVAILABLE = "available";
-
-    private static final int REQUEST_CLEAR_CACHE = 1;
-    private static final long SIZE_CALCULATING = -1;
-
-    private StorageManager mStorageManager;
-    private PackageManager mPackageManager;
-
-    private VolumeInfo mVolumeInfo;
-
-    private StorageMeasurement mMeasure;
-    private final StorageMeasurement.MeasurementReceiver mMeasurementReceiver =
-            new MeasurementReceiver();
-    private final StorageEventListener mStorageEventListener = new StorageEventListener();
-
-    private PreferenceCompat mMigratePref;
-    private PreferenceCompat mEjectPref;
-    private PreferenceCompat mErasePref;
-    private PreferenceCompat mAppsUsagePref;
-    private PreferenceCompat mDcimUsagePref;
-    private PreferenceCompat mMusicUsagePref;
-    private PreferenceCompat mDownloadsUsagePref;
-    private PreferenceCompat mCacheUsagePref;
-    private PreferenceCompat mMiscUsagePref;
-    private PreferenceCompat mAvailablePref;
-    private Bundle mExtras;
-
-    public StorageState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    public static void prepareArgs(Bundle bundle, VolumeInfo volumeInfo) {
-        bundle.putString(VolumeInfo.EXTRA_VOLUME_ID, volumeInfo.getId());
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        mStorageManager = mContext.getSystemService(StorageManager.class);
-        mPackageManager = mContext.getPackageManager();
-
-        mVolumeInfo = mStorageManager.findVolumeById(
-                extras.getString(VolumeInfo.EXTRA_VOLUME_ID));
-        mExtras = extras;
-        super.onCreate(extras);
-        mUIUpdateCallback.notifyUpdateScreenTitle(
-                getStateIdentifier(), mStorageManager.getBestVolumeDescription(mVolumeInfo));
-        mMigratePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_MIGRATE);
-        mEjectPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_EJECT);
-        mErasePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_ERASE);
-        mAppsUsagePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_APPS_USAGE);
-        mDcimUsagePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DCIM_USAGE);
-        mMusicUsagePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_MUSIC_USAGE);
-        mDownloadsUsagePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DOWNLOADS_USAGE);
-        mCacheUsagePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_CACHE_USAGE);
-        mMiscUsagePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_MISC_USAGE);
-        mAvailablePref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_AVAILABLE);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        mStorageManager.registerListener(mStorageEventListener);
-        startMeasurement();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mVolumeInfo = mStorageManager.findVolumeById(mExtras.getString(VolumeInfo.EXTRA_VOLUME_ID));
-        if (mVolumeInfo == null || !mVolumeInfo.isMountedReadable()) {
-            mUIUpdateCallback.notifyNavigateBackward(getStateIdentifier());
-        } else {
-            refresh();
-        }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        mStorageManager.unregisterListener(mStorageEventListener);
-        stopMeasurement();
-    }
-
-    private static Intent getFormatAsPublicIntent(Context context, String diskId) {
-        final Intent i = new Intent(INTENT_ACTION_FORMAT_AS_PUBLIC);
-        i.putExtra(DiskInfo.EXTRA_DISK_ID, diskId);
-        return i;
-    }
-
-    private static Intent getFormatAsPrivateIntent(Context context, String diskId) {
-        final Intent i = new Intent(INTENT_ACTION_FORMAT_AS_PRIVATE);
-        i.putExtra(DiskInfo.EXTRA_DISK_ID, diskId);
-        return i;
-    }
-
-    private static Intent getUnmountIntent(Context context, String volumeId, String volumeDesc) {
-        final Intent i = new Intent(INTENT_UNMOUNT);
-        i.putExtra(VolumeInfo.EXTRA_VOLUME_ID, volumeId);
-        i.putExtra(EXTRA_VOLUME_DESC, volumeDesc);
-        return i;
-    }
-
-    private void refresh() {
-        boolean showMigrate = false;
-        final VolumeInfo currentExternal = mPackageManager.getPrimaryStorageCurrentVolume();
-        // currentExternal will be null if the drive is not mounted. Don't offer the option to
-        // migrate if so.
-        if (currentExternal != null
-                && !TextUtils.equals(currentExternal.getId(), mVolumeInfo.getId())) {
-            final List<VolumeInfo> candidates =
-                    mPackageManager.getPrimaryStorageCandidateVolumes();
-            for (final VolumeInfo candidate : candidates) {
-                if (TextUtils.equals(candidate.getId(), mVolumeInfo.getId())) {
-                    showMigrate = true;
-                    break;
-                }
-            }
-        }
-
-        mMigratePref.setVisible(showMigrate);
-        Intent intent = new Intent(INTENT_NEW_STORAGE)
-                .putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolumeInfo.getId())
-                .putExtra(EXTRA_MIGRATE_HERE, true);
-        mMigratePref.setIntent(intent);
-
-        final String description = mStorageManager.getBestVolumeDescription(mVolumeInfo);
-
-        final boolean privateInternal = VolumeInfo.ID_PRIVATE_INTERNAL.equals(mVolumeInfo.getId());
-        final boolean isPrivate = mVolumeInfo.getType() == VolumeInfo.TYPE_PRIVATE;
-
-        mEjectPref.setVisible(!privateInternal);
-        mEjectPref.setIntent(getUnmountIntent(mContext, mVolumeInfo.getId(), description));
-        mErasePref.setVisible(!privateInternal);
-        if (isPrivate) {
-            mErasePref.setIntent(getFormatAsPublicIntent(mContext, mVolumeInfo.getDiskId()));
-            mErasePref.setTitle(ResourcesUtil.getString(mContext, "storage_format_as_public"));
-        } else {
-            mErasePref.setIntent(getFormatAsPrivateIntent(mContext, mVolumeInfo.getDiskId()));
-            mErasePref.setTitle(ResourcesUtil.getString(mContext, "storage_format_as_private"));
-        }
-
-        mAppsUsagePref.setVisible(isPrivate);
-        mAppsUsagePref.setNextState(ManagerUtil.STATE_APPS);
-        Bundle appUsageExtras = new Bundle();
-        AppsState.prepareArgs(appUsageExtras, mVolumeInfo.fsUuid, description);
-        mAppsUsagePref.setExtras(appUsageExtras);
-        mDcimUsagePref.setVisible(isPrivate);
-        mMusicUsagePref.setVisible(isPrivate);
-        mDownloadsUsagePref.setVisible(isPrivate);
-        mCacheUsagePref.setVisible(isPrivate);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mMigratePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mEjectPref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mErasePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mAppsUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mDcimUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mMusicUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mDownloadsUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCacheUsagePref);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (KEY_CACHE_USAGE.equals(key[0])) {
-            Intent i = new Intent(INTENT_CONFIRMATION);
-            i.putExtra(EXTRA_GUIDANCE_TITLE, ResourcesUtil.getString(
-                    mContext, "device_storage_clear_cache_title"));
-            i.putExtra(EXTRA_GUIDANCE_SUBTITLE, ResourcesUtil.getString(
-                    mContext, "device_storage_clear_cache_message"));
-            ((Activity) mContext).startActivityForResult(i,
-                    ManagerUtil.calculateCompoundCode(
-                            getStateIdentifier(), REQUEST_CLEAR_CACHE
-                    ));
-            return true;
-        }
-        return super.onPreferenceTreeClick(key, status);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_CLEAR_CACHE:
-                if (resultCode == Activity.RESULT_OK) {
-                    final PackageManager pm = mContext.getPackageManager();
-                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
-                    for (PackageInfo info : infos) {
-                        pm.deleteApplicationCacheFiles(info.packageName, null);
-                    }
-                }
-                break;
-            default:
-                // no-op
-        }
-    }
-
-    private void startMeasurement() {
-        if (mVolumeInfo != null && mVolumeInfo.isMountedReadable()) {
-            final VolumeInfo sharedVolume = mStorageManager.findEmulatedForPrivate(mVolumeInfo);
-            mMeasure = new StorageMeasurement(mContext, mVolumeInfo, sharedVolume);
-            mMeasure.setReceiver(mMeasurementReceiver);
-            mMeasure.forceMeasure();
-        }
-    }
-
-    private void updateDetails(StorageMeasurement.MeasurementDetails details) {
-        final int currentUser = ActivityManager.getCurrentUser();
-        final long dcimSize = totalValues(details.mediaSize.get(currentUser),
-                Environment.DIRECTORY_DCIM,
-                Environment.DIRECTORY_MOVIES, Environment.DIRECTORY_PICTURES);
-
-        final long musicSize = totalValues(details.mediaSize.get(currentUser),
-                Environment.DIRECTORY_MUSIC,
-                Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
-                Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
-
-        final long downloadsSize = totalValues(details.mediaSize.get(currentUser),
-                Environment.DIRECTORY_DOWNLOADS);
-
-        mAvailablePref.setSummary(formatSize(mContext,
-                Math.max(0L, details.availSize - cachePartitionSize())));
-        mAppsUsagePref.setSummary(formatSize(mContext,
-                details.appsSize.get(currentUser)));
-        mDcimUsagePref.setSummary(formatSize(mContext, dcimSize));
-        mMusicUsagePref.setSummary(formatSize(mContext, musicSize));
-        mDownloadsUsagePref.setSummary(formatSize(mContext, downloadsSize));
-        mCacheUsagePref.setSummary(formatSize(mContext, details.cacheSize));
-        mMiscUsagePref.setSummary(formatSize(mContext, details.miscSize.get(currentUser)));
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mAvailablePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mAppsUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mDcimUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mMusicUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mDownloadsUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCacheUsagePref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mMiscUsagePref);
-    }
-
-    public static String formatSize(Context context, long size) {
-        return (size == SIZE_CALCULATING)
-                ? ResourcesUtil.getString(context, "storage_calculating_size")
-                : Formatter.formatShortFileSize(context, size);
-    }
-
-    private static long cachePartitionSize() {
-        File cache = new File("/cache");
-        try {
-            return cache.getUsableSpace();
-        } catch (SecurityException e) {
-            Log.w(TAG, "Cannot determine cache partition size.", e);
-            return 0;
-        }
-    }
-
-    private static long totalValues(HashMap<String, Long> map, String... keys) {
-        long total = 0;
-        if (map != null) {
-            for (String key : keys) {
-                if (map.containsKey(key)) {
-                    total += map.get(key);
-                }
-            }
-        } else {
-            Log.w(TAG,
-                    "MeasurementDetails mediaSize array does not have key for current user " +
-                            ActivityManager.getCurrentUser());
-        }
-        return total;
-    }
-
-    private void stopMeasurement() {
-        if (mMeasure != null) {
-            mMeasure.onDestroy();
-        }
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_STORAGE;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-
-    private class MeasurementReceiver implements StorageMeasurement.MeasurementReceiver {
-
-        @Override
-        public void onDetailsChanged(StorageMeasurement.MeasurementDetails details) {
-            updateDetails(details);
-        }
-    }
-
-    private class StorageEventListener extends android.os.storage.StorageEventListener {
-        @Override
-        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
-            mVolumeInfo = vol;
-            if (mVolumeInfo.isMountedReadable()) {
-                refresh();
-            } else {
-                mUIUpdateCallback.notifyNavigateBackward(getStateIdentifier());
-            }
-        }
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/device/storage/StorageSummaryState.java b/SettingsAPI/java/com/android/tv/settings/library/device/storage/StorageSummaryState.java
deleted file mode 100644
index 1c1a014e9..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/device/storage/StorageSummaryState.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.device.storage;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.storage.DiskInfo;
-import android.os.storage.StorageManager;
-import android.os.storage.VolumeInfo;
-import android.os.storage.VolumeRecord;
-import android.util.ArraySet;
-import android.util.Log;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/** State to handle storage summary screen. */
-public class StorageSummaryState extends PreferenceControllerState {
-    private static final String TAG = "StorageSummaryState";
-    private static final String KEY_DEVICE_CATEGORY = "device_storage";
-    private static final String KEY_REMOVABLE_CATEGORY = "removable_storage";
-
-    private static final int REFRESH_DELAY_MILLIS = 500;
-
-    private StorageManager mStorageManager;
-    private PreferenceCompat mRemovableCategory;
-    private PreferenceCompat mDeviceCategory;
-    private final StorageSummaryState.StorageEventListener
-            mStorageEventListener = new StorageSummaryState.StorageEventListener();
-
-    private final Handler mHandler = new Handler();
-    private final Runnable mRefreshRunnable = new Runnable() {
-        @Override
-        public void run() {
-            refresh();
-        }
-    };
-
-    public StorageSummaryState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mStorageManager = mContext.getSystemService(StorageManager.class);
-        mRemovableCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_REMOVABLE_CATEGORY);
-        mDeviceCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_DEVICE_CATEGORY);
-        mRemovableCategory.setVisible(false);
-    }
-
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        mStorageManager.registerListener(mStorageEventListener);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mHandler.removeCallbacks(mRefreshRunnable);
-        // Delay to allow entrance animations to complete
-        mHandler.postDelayed(mRefreshRunnable, REFRESH_DELAY_MILLIS);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mHandler.removeCallbacks(mRefreshRunnable);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        mStorageManager.unregisterListener(mStorageEventListener);
-    }
-
-    private void refresh() {
-        final List<VolumeInfo> volumes = mStorageManager.getVolumes();
-        volumes.sort(VolumeInfo.getDescriptionComparator());
-
-        final List<VolumeInfo> privateVolumes = new ArrayList<>(volumes.size());
-        final List<VolumeInfo> publicVolumes = new ArrayList<>(volumes.size());
-
-        // Find mounted volumes
-        for (final VolumeInfo vol : volumes) {
-            if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
-                privateVolumes.add(vol);
-            } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
-                publicVolumes.add(vol);
-            } else {
-                Log.d(TAG, "Skipping volume " + vol.toString());
-            }
-        }
-
-        // Find missing private filesystems
-        final List<VolumeRecord> volumeRecords = mStorageManager.getVolumeRecords();
-        final List<VolumeRecord> privateMissingVolumes = new ArrayList<>(volumeRecords.size());
-
-        for (final VolumeRecord record : volumeRecords) {
-            if (record.getType() == VolumeInfo.TYPE_PRIVATE
-                    && mStorageManager.findVolumeByUuid(record.getFsUuid()) == null) {
-                privateMissingVolumes.add(record);
-            }
-        }
-
-        // Find unreadable disks
-        final List<DiskInfo> disks = mStorageManager.getDisks();
-        final List<DiskInfo> unsupportedDisks = new ArrayList<>(disks.size());
-        for (final DiskInfo disk : disks) {
-            if (disk.volumeCount == 0 && disk.size > 0) {
-                unsupportedDisks.add(disk);
-            }
-        }
-
-        final Set<String> touchedDeviceKeys =
-                new ArraySet<>(privateVolumes.size() + privateMissingVolumes.size());
-
-        mDeviceCategory.clearChildPrefCompats();
-        mRemovableCategory.clearChildPrefCompats();
-        for (final VolumeInfo volumeInfo : privateVolumes) {
-            final String key = makeKeyForVolPref(volumeInfo);
-            touchedDeviceKeys.add(key);
-            PreferenceCompat preferenceCompat = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{KEY_DEVICE_CATEGORY, key});
-            refreshForVolPref(mContext, mStorageManager, volumeInfo, preferenceCompat);
-            mDeviceCategory.addChildPrefCompat(preferenceCompat);
-        }
-
-        for (final VolumeRecord volumeRecord : privateMissingVolumes) {
-            final String key = makeKeyForMissingPref(volumeRecord);
-            touchedDeviceKeys.add(key);
-            PreferenceCompat preferenceCompat = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{KEY_DEVICE_CATEGORY, key});
-            refreshForMissingPref(mContext, volumeRecord, preferenceCompat);
-            mDeviceCategory.addChildPrefCompat(preferenceCompat);
-        }
-
-
-        final int publicCount = publicVolumes.size() + unsupportedDisks.size();
-        final Set<String> touchedRemovableKeys = new ArraySet<>(publicCount);
-        // Only show section if there are public/unknown volumes present
-        mRemovableCategory.setVisible(publicCount > 0);
-
-        for (final VolumeInfo volumeInfo : publicVolumes) {
-            final String key = makeKeyForVolPref(volumeInfo);
-            touchedRemovableKeys.add(key);
-            PreferenceCompat preferenceCompat = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{KEY_REMOVABLE_CATEGORY, key});
-            refreshForVolPref(mContext, mStorageManager, volumeInfo, preferenceCompat);
-            mRemovableCategory.addChildPrefCompat(preferenceCompat);
-        }
-        for (final DiskInfo diskInfo : unsupportedDisks) {
-            final String key = makeKeyForUnsupportedDiskPref(diskInfo);
-            touchedRemovableKeys.add(key);
-            PreferenceCompat preferenceCompat = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{KEY_REMOVABLE_CATEGORY, key});
-            refreshForUnsupportedDiskPref(mContext, diskInfo, preferenceCompat);
-            mRemovableCategory.addChildPrefCompat(preferenceCompat);
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mDeviceCategory);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mRemovableCategory);
-    }
-
-    private void refreshForVolPref(Context context, StorageManager storageManager,
-            VolumeInfo volumeInfo, PreferenceCompat preferenceCompat) {
-        final String description = storageManager
-                .getBestVolumeDescription(volumeInfo);
-        preferenceCompat.setTitle(description);
-        if (volumeInfo.isMountedReadable()) {
-            preferenceCompat.setSummary(getSizeString(context, volumeInfo));
-        } else {
-            preferenceCompat.setSummary(ResourcesUtil.getString(
-                    context, "storage_unmount_success, description"));
-        }
-        Bundle b = new Bundle();
-        StorageState.prepareArgs(b, volumeInfo);
-        preferenceCompat.setExtras(b);
-        preferenceCompat.setNextState(ManagerUtil.STATE_STORAGE);
-    }
-
-    private void refreshForUnsupportedDiskPref(Context context, DiskInfo info,
-            PreferenceCompat preferenceCompat) {
-        preferenceCompat.setTitle(info.getDescription());
-    }
-
-    private void refreshForMissingPref(Context context, VolumeRecord volumeRecord,
-            PreferenceCompat preferenceCompat) {
-        preferenceCompat.setTitle(volumeRecord.getNickname());
-        preferenceCompat.setSummary(ResourcesUtil.getString(mContext, "storage_not_connected"));
-        Bundle b = new Bundle();
-        MissingStorageState.prepareArgs(b, volumeRecord.getFsUuid());
-        preferenceCompat.setExtras(b);
-        preferenceCompat.setNextState(ManagerUtil.STATE_MISSING_STORAGE);
-    }
-
-    private static String getSizeString(Context context, VolumeInfo vol) {
-        final File path = vol.getPath();
-        if (vol.isMountedReadable() && path != null) {
-            return String.format(ResourcesUtil.getString(context, "storage_size"),
-                    StorageState.formatSize(context, path.getTotalSpace()));
-        } else {
-            return null;
-        }
-    }
-
-    private static String makeKeyForVolPref(VolumeInfo volumeInfo) {
-        return "VolPref:" + volumeInfo.getId();
-    }
-
-    private static String makeKeyForUnsupportedDiskPref(DiskInfo info) {
-        return "UnsupportedPref:" + info.getId();
-    }
-
-    private static String makeKeyForMissingPref(VolumeRecord volumeRecord) {
-        return "MissingPref:" + volumeRecord.getFsUuid();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_STORAGE_SUMMARY;
-    }
-
-    private class StorageEventListener extends android.os.storage.StorageEventListener {
-        @Override
-        public void onStorageStateChanged(String path, String oldState, String newState) {
-            refresh();
-        }
-
-        @Override
-        public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
-            refresh();
-        }
-
-        @Override
-        public void onVolumeRecordChanged(VolumeRecord rec) {
-            refresh();
-        }
-
-        @Override
-        public void onVolumeForgotten(String fsUuid) {
-            refresh();
-        }
-
-        @Override
-        public void onDiskScanned(DiskInfo disk, int volumeCount) {
-            refresh();
-        }
-
-        @Override
-        public void onDiskDestroyed(DiskInfo disk) {
-            refresh();
-        }
-
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/inputmethod/AvailableVirtualKeyboadState.java b/SettingsAPI/java/com/android/tv/settings/library/inputmethod/AvailableVirtualKeyboadState.java
deleted file mode 100644
index ec9bc6275..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/inputmethod/AvailableVirtualKeyboadState.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.inputmethod;
-
-import android.annotation.DrawableRes;
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.content.res.Configuration;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.settingslib.InputMethodAndSubtypeUtilCompat;
-import com.android.tv.settings.library.settingslib.InputMethodSettingValuesWrapper;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * State to handle the business logic for AvailableVirtualKeyboardFragment.
- */
-public class AvailableVirtualKeyboadState extends PreferenceControllerState
-        implements InputMethodPreferenceController.OnSavePreferenceListener {
-    private InputMethodSettingValuesWrapper mInputMethodSettingValues;
-    private InputMethodManager mImm;
-    private DevicePolicyManager mDpm;
-
-    public AvailableVirtualKeyboadState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
-        updateInputMethodPreferenceViews();
-    }
-
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mUIUpdateCallback.notifyUpdateScreenTitle(getStateIdentifier(),
-                ResourcesUtil.getString(mContext, "available_virtual_keyboard_category"));
-        mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(mContext);
-        mImm = mContext.getSystemService(InputMethodManager.class);
-        mDpm = mContext.getSystemService(DevicePolicyManager.class);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // no-op
-    }
-
-    private void updateInputMethodPreferenceViews() {
-        mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
-        // Clear existing "InputMethodPreference"s
-        List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();
-        final PackageManager packageManager = mContext.getPackageManager();
-        final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();
-        final int numImis = (imis == null ? 0 : imis.size());
-        List<PreferenceCompat> prefCompats = new ArrayList<>();
-        mPreferenceControllers.clear();
-        for (int i = 0; i < numImis; ++i) {
-            final InputMethodInfo imi = imis.get(i);
-            final boolean isAllowedByOrganization = permittedList == null
-                    || permittedList.contains(imi.getPackageName());
-            final InputMethodPreferenceController prefController =
-                    new InputMethodPreferenceController(
-                            mContext, mUIUpdateCallback, getStateIdentifier(),
-                            mPreferenceCompatManager, imi, true,
-                            isAllowedByOrganization, this);
-            mPreferenceControllers.add(prefController);
-            prefController.init();
-            prefController.getPrefCompat().setIcon(getInputMethodIcon(packageManager, imi));
-            prefController.notifyChange();
-            prefCompats.add(prefController.getPrefCompat());
-        }
-        mUIUpdateCallback.notifyUpdateAll(getStateIdentifier(), prefCompats);
-    }
-
-    @Nullable
-    private static Drawable loadDrawable(@NonNull final PackageManager packageManager,
-            @NonNull final String packageName, @DrawableRes final int resId,
-            @NonNull final ApplicationInfo applicationInfo) {
-        if (resId == 0) {
-            return null;
-        }
-        try {
-            return packageManager.getDrawable(packageName, resId, applicationInfo);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @NonNull
-    private static Drawable getInputMethodIcon(@NonNull final PackageManager packageManager,
-            @NonNull final InputMethodInfo imi) {
-        final ServiceInfo si = imi.getServiceInfo();
-        final ApplicationInfo ai = si != null ? si.applicationInfo : null;
-        final String packageName = imi.getPackageName();
-        if (si == null || ai == null || packageName == null) {
-            return new ColorDrawable(Color.TRANSPARENT);
-        }
-        // We do not use ServiceInfo#loadLogo() and ServiceInfo#loadIcon here since those methods
-        // internally have some fallback rules, which we want to do manually.
-        Drawable drawable = loadDrawable(packageManager, packageName, si.logo, ai);
-        if (drawable != null) {
-            return drawable;
-        }
-        drawable = loadDrawable(packageManager, packageName, si.icon, ai);
-        if (drawable != null) {
-            return drawable;
-        }
-        // We do not use ApplicationInfo#loadLogo() and ApplicationInfo#loadIcon here since those
-        // methods internally have some fallback rules, which we want to do manually.
-        drawable = loadDrawable(packageManager, packageName, ai.logo, ai);
-        if (drawable != null) {
-            return drawable;
-        }
-        drawable = loadDrawable(packageManager, packageName, ai.icon, ai);
-        if (drawable != null) {
-            return drawable;
-        }
-        return new ColorDrawable(Color.TRANSPARENT);
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_AVAILABLE_KEYBOARD;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-
-    @Override
-    public void onSaveInputMethodPreference(InputMethodPreferenceController pref) {
-        final boolean hasHardwareKeyboard = mContext.getResources().getConfiguration().keyboard
-                == Configuration.KEYBOARD_QWERTY;
-        InputMethodAndSubtypeUtilCompat.saveInputMethodSubtypeList(mContext,
-                mPreferenceCompatManager,
-                mContext.getContentResolver(), mImm.getInputMethodList(), hasHardwareKeyboard);
-        // Update input method settings and preference list.
-        mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
-        updateInputMethodPreferenceViews();
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/inputmethod/KeyboardState.java b/SettingsAPI/java/com/android/tv/settings/library/inputmethod/KeyboardState.java
deleted file mode 100644
index db8842f81..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/inputmethod/KeyboardState.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.inputmethod;
-
-import static com.android.tv.settings.library.ManagerUtil.KEY_KEYBOARD_SETTINGS;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.ArraySet;
-import android.view.inputmethod.InputMethodInfo;
-
-import com.android.tv.settings.library.ManagerUtil;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.overlay.FlavorUtils;
-import com.android.tv.settings.library.settingslib.AutofillHelper;
-import com.android.tv.settings.library.settingslib.DefaultAppInfo;
-import com.android.tv.settings.library.settingslib.InputMethodHelper;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * State to handle the business logic for KeyboardFragment.
- */
-public class KeyboardState extends PreferenceControllerState {
-    private static final String KEY_KEYBOARD_CATEGORY = "keyboardCategory";
-
-    private static final String KEY_CURRENT_KEYBOARD = "currentKeyboard";
-
-    private static final String KEY_AUTOFILL_CATEGORY = "autofillCategory";
-
-    static final String KEY_CURRENT_AUTOFILL = "currentAutofill";
-
-    private PreferenceCompat mKeyboardCategory;
-    private PreferenceCompat mCurrentKeyboard;
-    private PreferenceCompat mAutofillCategory;
-    private PreferenceCompat mCurrentAutofill;
-    private PreferenceCompat mKeyboardSettings;
-    private PackageManager mPm;
-
-    public KeyboardState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-
-    @Override
-    public void onAttach() {
-        super.onAttach();
-        mPm = mContext.getPackageManager();
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        mKeyboardCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_KEYBOARD_CATEGORY);
-        mCurrentKeyboard = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_CURRENT_KEYBOARD);
-        mAutofillCategory = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_AUTOFILL_CATEGORY);
-        mCurrentAutofill = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_CURRENT_AUTOFILL);
-        mKeyboardSettings = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_KEYBOARD_SETTINGS);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // no-op
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updateUi();
-    }
-
-    void updateUi() {
-        updateAutofill();
-        updateKeyboards();
-    }
-
-    private void updateKeyboards() {
-        updateCurrentKeyboardPreference();
-        updateKeyboardsSettings();
-    }
-
-    /**
-     * Update autofill related preferences.
-     */
-    private void updateAutofill() {
-        List<DefaultAppInfo> candidates = getAutofillCandidates();
-        if (candidates.isEmpty()) {
-            // No need to show keyboard category and autofill category.
-            // Keyboard only preference screen:
-            mKeyboardCategory.setVisible(false);
-            mAutofillCategory.setVisible(false);
-            mUIUpdateCallback.notifyUpdateScreenTitle(
-                    getStateIdentifier(),
-                    ResourcesUtil.getString(mContext, "system_keyboard"));
-        } else {
-            // Show both keyboard category and autofill category in keyboard & autofill screen.
-            mKeyboardCategory.setVisible(true);
-            mAutofillCategory.setVisible(true);
-            updateCurrentAutofillPreference(candidates);
-            updateAutofillSettings(candidates);
-            mUIUpdateCallback.notifyUpdateScreenTitle(
-                    getStateIdentifier(),
-                    ResourcesUtil.getString(mContext, "system_keyboard_autofill"));
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mKeyboardCategory);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mAutofillCategory);
-    }
-
-    private List<DefaultAppInfo> getAutofillCandidates() {
-        return AutofillHelper.getAutofillCandidates(mContext,
-                mPm, UserHandle.myUserId());
-    }
-
-    private void updateCurrentAutofillPreference(List<DefaultAppInfo> candidates) {
-
-        DefaultAppInfo app = AutofillHelper.getCurrentAutofill(mContext, candidates);
-
-        CharSequence summary = app == null ? ResourcesUtil.getString(mContext, "autofill_none")
-                : app.loadLabel();
-        mCurrentAutofill.setSummary(summary.toString());
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCurrentAutofill);
-    }
-
-    private void updateAutofillSettings(List<DefaultAppInfo> candidates) {
-        for (final DefaultAppInfo info : candidates) {
-            final Intent settingsIntent = AutofillHelper.getAutofillSettingsIntent(mContext,
-                    mPm, info);
-            if (settingsIntent == null) {
-                continue;
-            }
-
-            PreferenceCompat preferenceCompat = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{KEY_AUTOFILL_CATEGORY, info.getKey()});
-            preferenceCompat.setTitle(ResourcesUtil.getString(mContext,
-                    "title_settings", info.loadLabel()));
-            preferenceCompat.setIntent(settingsIntent);
-            mCurrentAutofill.addChildPrefCompat(preferenceCompat);
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCurrentAutofill);
-    }
-
-    private void updateKeyboardsSettings() {
-        final PackageManager packageManager = mContext.getPackageManager();
-        List<InputMethodInfo> enabledInputMethodInfos = InputMethodHelper
-                .getEnabledSystemInputMethodList(mContext);
-
-        final Set<String> enabledInputMethodKeys = new ArraySet<>(enabledInputMethodInfos.size());
-        // Add per-IME settings
-        for (final InputMethodInfo info : enabledInputMethodInfos) {
-            final String uri = InputMethodHelper.getInputMethodsSettingsUri(mContext, info);
-            final Intent settingsIntent = InputMethodHelper.getInputMethodSettingsIntent(info);
-            if (uri == null && settingsIntent == null) {
-                continue;
-            }
-
-            boolean useSlice = FlavorUtils.isTwoPanel(mContext) && uri != null;
-            PreferenceCompat prefCompat = new PreferenceCompat(new String[]{
-                    KEY_KEYBOARD_SETTINGS, info.getId()});
-            prefCompat.setTitle(ResourcesUtil.getString(mContext, "title_settings",
-                    info.loadLabel(packageManager)));
-            if (useSlice) {
-                prefCompat.setHasSlice(true);
-                prefCompat.setSliceUri(uri);
-                prefCompat.setIntent(null);
-            } else {
-                prefCompat.setHasSlice(false);
-                prefCompat.setSliceUri(null);
-                prefCompat.setIntent(settingsIntent);
-            }
-            mKeyboardSettings.addChildPrefCompat(prefCompat);
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mKeyboardSettings);
-    }
-
-    private void updateCurrentKeyboardPreference() {
-        final PackageManager packageManager = mContext.getPackageManager();
-        List<InputMethodInfo> enabledInputMethodInfos = InputMethodHelper
-                .getEnabledSystemInputMethodList(mContext);
-        final List<CharSequence> entries = new ArrayList<>(enabledInputMethodInfos.size());
-        final List<CharSequence> values = new ArrayList<>(enabledInputMethodInfos.size());
-
-        int defaultIndex = 0;
-        final String defaultId = InputMethodHelper.getDefaultInputMethodId(mContext);
-
-        for (final InputMethodInfo info : enabledInputMethodInfos) {
-            entries.add(info.loadLabel(packageManager));
-            final String id = info.getId();
-            values.add(id);
-            if (TextUtils.equals(id, defaultId)) {
-                defaultIndex = values.size() - 1;
-            }
-        }
-
-        mCurrentKeyboard.setEntries(entries.toArray(new CharSequence[entries.size()]));
-        mCurrentKeyboard.setEntryValues(values.toArray(new CharSequence[values.size()]));
-        if (entries.size() > 0) {
-            mCurrentKeyboard.setValueIndex(defaultIndex);
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), mCurrentKeyboard);
-    }
-
-    @Override
-    public boolean onPreferenceChange(String[] key, Object newValue) {
-        if (keyEquals(key, mCurrentKeyboard.getKey())) {
-            InputMethodHelper.setDefaultInputMethodId(mContext, (String) newValue);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return ManagerUtil.STATE_KEYBOARD;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/instrumentation/InstrumentedPreferenceFragment.java b/SettingsAPI/java/com/android/tv/settings/library/instrumentation/InstrumentedPreferenceFragment.java
new file mode 100644
index 000000000..0198e51b7
--- /dev/null
+++ b/SettingsAPI/java/com/android/tv/settings/library/instrumentation/InstrumentedPreferenceFragment.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2017 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.library.instrumentation;
+
+import static com.android.internal.jank.InteractionJankMonitor.CUJ_SETTINGS_PAGE_SCROLL;
+import static com.android.internal.jank.InteractionJankMonitor.Configuration;
+
+import androidx.leanback.preference.LeanbackPreferenceFragmentCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.jank.InteractionJankMonitor;
+
+/**
+ * Instrumented fragment that logs jank.
+ */
+public abstract class InstrumentedPreferenceFragment extends LeanbackPreferenceFragmentCompat {
+
+    private RecyclerView.OnScrollListener mOnScrollListener;
+
+    @Override
+    public void onResume() {
+        // Add scroll listener to trace interaction jank.
+        final RecyclerView recyclerView = getListView();
+        if (recyclerView != null) {
+            mOnScrollListener = new OnScrollListener(getClass().getName());
+            recyclerView.addOnScrollListener(mOnScrollListener);
+        }
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        final RecyclerView recyclerView = getListView();
+        if (recyclerView != null && mOnScrollListener != null) {
+            recyclerView.removeOnScrollListener(mOnScrollListener);
+            mOnScrollListener = null;
+        }
+        super.onPause();
+    }
+
+    private static final class OnScrollListener extends RecyclerView.OnScrollListener {
+        private final InteractionJankMonitor mMonitor = InteractionJankMonitor.getInstance();
+        private final String mClassName;
+
+        private OnScrollListener(String className) {
+            mClassName = className;
+        }
+
+        @Override
+        public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+            switch (newState) {
+                case RecyclerView.SCROLL_STATE_SETTLING -> {
+                    final Configuration.Builder builder =
+                            Configuration.Builder.withView(CUJ_SETTINGS_PAGE_SCROLL, recyclerView)
+                                    .setTag(mClassName);
+                    mMonitor.begin(builder);
+                }
+                case RecyclerView.SCROLL_STATE_IDLE -> mMonitor.end(CUJ_SETTINGS_PAGE_SCROLL);
+                default -> {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
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 b4fe0fd47..ceaab7a6e 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/AccessPoint.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/AccessPoint.java
@@ -18,96 +18,35 @@ package com.android.tv.settings.library.network;
 
 import android.annotation.IntDef;
 import android.annotation.MainThread;
-import android.annotation.Nullable;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.net.NetworkInfo;
-import android.net.NetworkKey;
-import android.net.ScoredNetwork;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiNetworkScoreCache;
-import android.net.wifi.hotspot2.OsuProvider;
-import android.net.wifi.hotspot2.PasspointConfiguration;
-import android.net.wifi.hotspot2.ProvisioningCallback;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.os.SystemClock;
-import android.os.UserHandle;
 import android.text.TextUtils;
-import android.util.ArraySet;
-import android.util.Log;
-import android.util.Pair;
 
-import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.util.CollectionUtils;
-import com.android.tv.settings.library.util.ThreadUtils;
+import com.android.wifitrackerlib.PasspointWifiEntry;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.WeakHashMap;
 
 public class AccessPoint implements Comparable<AccessPoint> {
-    static final String TAG = "SettingsLib.AccessPoint";
+    public static final int SECURITY_NONE = WifiEntry.SECURITY_NONE;
+    public static final int SECURITY_WEP = WifiEntry.SECURITY_WEP;
+    public static final int SECURITY_PSK = WifiEntry.SECURITY_PSK;
+    public static final int SECURITY_EAP = WifiEntry.SECURITY_EAP;
+    public static final int SECURITY_OWE = WifiEntry.SECURITY_OWE;
+    public static final int SECURITY_SAE = WifiEntry.SECURITY_SAE;
+    public static final int SECURITY_EAP_SUITE_B = WifiEntry.SECURITY_EAP_SUITE_B;
 
-    /**
-     * Lower bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int LOWER_FREQ_24GHZ = 2400;
-
-    /**
-     * Upper bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int HIGHER_FREQ_24GHZ = 2500;
-
-    /**
-     * Lower bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int LOWER_FREQ_5GHZ = 4900;
-
-    /**
-     * Upper bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int HIGHER_FREQ_5GHZ = 5900;
-
-    /**
-     * Lower bound on the 60 GHz (802.11ad) WIGIG channels
-     */
-    public static final int LOWER_FREQ_60GHZ = 58320;
-
-    /**
-     * Upper bound on the 60 GHz (802.11ad) WIGIG channels
-     */
-    public static final int HIGHER_FREQ_60GHZ = 70200;
-
-    /** The key which identifies this AccessPoint grouping. */
-    private String mKey;
-
-    /**
-     * Synchronization lock for managing concurrency between main and worker threads.
-     *
-     * <p>This lock should be held for all modifications to {@link #mScanResults} and
-     * {@link #mExtraScanResults}.
-     */
-    private final Object mLock = new Object();
+    public static final String KEY_PREFIX_AP = "AP:";
 
-    @IntDef({
-            AccessPoint.Speed.NONE, AccessPoint.Speed.SLOW, AccessPoint.Speed.MODERATE,
-            AccessPoint.Speed.FAST, AccessPoint.Speed.VERY_FAST})
+    @IntDef({Speed.NONE, Speed.SLOW, Speed.MODERATE, Speed.FAST, Speed.VERY_FAST})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Speed {
         /**
@@ -132,340 +71,37 @@ public class AccessPoint implements Comparable<AccessPoint> {
         int VERY_FAST = 30;
     }
 
-    @IntDef({AccessPoint.PasspointConfigurationVersion.INVALID,
-            AccessPoint.PasspointConfigurationVersion.NO_OSU_PROVISIONED,
-            AccessPoint.PasspointConfigurationVersion.OSU_PROVISIONED})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface PasspointConfigurationVersion {
-        int INVALID = 0;
-        int NO_OSU_PROVISIONED = 1; // R1.
-        int OSU_PROVISIONED = 2;    // R2 or R3.
-    }
-
-    /** The underlying set of scan results comprising this AccessPoint. */
-    @GuardedBy("mLock")
-    private final ArraySet<ScanResult> mScanResults = new ArraySet<>();
-
-    /**
-     * Extra set of unused scan results corresponding to this AccessPoint for verbose logging
-     * purposes, such as a set of Passpoint roaming scan results when home scans are available.
-     */
-    @GuardedBy("mLock")
-    private final ArraySet<ScanResult> mExtraScanResults = new ArraySet<>();
-
-    /**
-     * Map of BSSIDs to scored networks for individual bssids.
-     *
-     * <p>This cache should not be evicted with scan results, as the values here are used to
-     * generate a fallback in the absence of scores for the visible APs.
-     */
-    private final Map<String, TimestampedScoredNetwork> mScoredNetworkCache = new HashMap<>();
-
-    static final String KEY_NETWORKINFO = "key_networkinfo";
-    static final String KEY_WIFIINFO = "key_wifiinfo";
-    static final String KEY_SSID = "key_ssid";
-    static final String KEY_SECURITY = "key_security";
-    static final String KEY_SPEED = "key_speed";
-    static final String KEY_PSKTYPE = "key_psktype";
-    static final String KEY_SCANRESULTS = "key_scanresults";
-    static final String KEY_SCOREDNETWORKCACHE = "key_scorednetworkcache";
-    static final String KEY_CONFIG = "key_config";
-    static final String KEY_PASSPOINT_UNIQUE_ID = "key_passpoint_unique_id";
-    static final String KEY_FQDN = "key_fqdn";
-    static final String KEY_PROVIDER_FRIENDLY_NAME = "key_provider_friendly_name";
-    static final String KEY_EAPTYPE = "eap_psktype";
-    static final String KEY_SUBSCRIPTION_EXPIRATION_TIME_IN_MILLIS =
-            "key_subscription_expiration_time_in_millis";
-    static final String KEY_PASSPOINT_CONFIGURATION_VERSION = "key_passpoint_configuration_version";
-    static final String KEY_IS_PSK_SAE_TRANSITION_MODE = "key_is_psk_sae_transition_mode";
-    static final String KEY_IS_OWE_TRANSITION_MODE = "key_is_owe_transition_mode";
-    static final AtomicInteger sLastId = new AtomicInteger(0);
-
-    /*
-     * NOTE: These constants for security and PSK types are saved to the bundle in saveWifiState,
-     * and sent across IPC. The numeric values should remain stable, otherwise the changes will need
-     * to be synced with other unbundled users of this library.
-     */
-    public static final int SECURITY_NONE = 0;
-    public static final int SECURITY_WEP = 1;
-    public static final int SECURITY_PSK = 2;
-    public static final int SECURITY_EAP = 3;
-    public static final int SECURITY_OWE = 4;
-    public static final int SECURITY_SAE = 5;
-    public static final int SECURITY_EAP_SUITE_B = 6;
-    public static final int SECURITY_EAP_WPA3_ENTERPRISE = 7;
-    public static final int SECURITY_MAX_VAL = 8; // Has to be the last
-
-    private static final int PSK_UNKNOWN = 0;
-    private static final int PSK_WPA = 1;
-    private static final int PSK_WPA2 = 2;
-    private static final int PSK_WPA_WPA2 = 3;
-
-    private static final int EAP_UNKNOWN = 0;
-    private static final int EAP_WPA = 1; // WPA-EAP
-    private static final int EAP_WPA2_WPA3 = 2; // RSN-EAP
-
-    public static final int UNREACHABLE_RSSI = Integer.MIN_VALUE;
-
-    public static final String KEY_PREFIX_AP = "AP:";
-    public static final String KEY_PREFIX_PASSPOINT_UNIQUE_ID = "PASSPOINT:";
-    public static final String KEY_PREFIX_OSU = "OSU:";
-
-    private final Context mContext;
-
-    private WifiManager mWifiManager;
-    private WifiManager.ActionListener mConnectListener;
-
-    private String ssid;
-    private String bssid;
-    private int security;
-    private int networkId = WifiConfiguration.INVALID_NETWORK_ID;
-
-    private int pskType = PSK_UNKNOWN;
-    private int mEapType = EAP_UNKNOWN;
-
-    private WifiConfiguration mConfig;
+    private static final Map<WifiEntry, Object> sTagMap = new WeakHashMap<>();
 
-    private int mRssi = UNREACHABLE_RSSI;
+    private final WifiEntry mWifiEntry;
 
-    private WifiInfo mInfo;
-    private NetworkInfo mNetworkInfo;
-    AccessPoint.AccessPointListener mAccessPointListener;
-
-    private Object mTag;
-
-    @AccessPoint.Speed
-    private int mSpeed = AccessPoint.Speed.NONE;
-    private boolean mIsScoredNetworkMetered = false;
-
-    /**
-     * Information associated with the {@link PasspointConfiguration}.  Only maintaining
-     * the relevant info to preserve spaces.
-     */
-    private String mPasspointUniqueId;
-    private String mFqdn;
-    private String mProviderFriendlyName;
-    private boolean mIsRoaming = false;
-    private long mSubscriptionExpirationTimeInMillis;
-    @AccessPoint.PasspointConfigurationVersion
-    private int mPasspointConfigurationVersion =
-            AccessPoint.PasspointConfigurationVersion.INVALID;
-
-    private OsuProvider mOsuProvider;
-
-    private String mOsuStatus;
-    private String mOsuFailure;
-    private boolean mOsuProvisioningComplete = false;
-
-    private boolean mIsPskSaeTransitionMode = false;
-    private boolean mIsOweTransitionMode = false;
-
-    public AccessPoint(Context context, Bundle savedState) {
-        mContext = context;
-
-        if (savedState.containsKey(KEY_CONFIG)) {
-            mConfig = savedState.getParcelable(KEY_CONFIG);
-        }
-        if (mConfig != null) {
-            loadConfig(mConfig);
-        }
-        if (savedState.containsKey(KEY_SSID)) {
-            ssid = savedState.getString(KEY_SSID);
-        }
-        if (savedState.containsKey(KEY_SECURITY)) {
-            security = savedState.getInt(KEY_SECURITY);
-        }
-        if (savedState.containsKey(KEY_SPEED)) {
-            mSpeed = savedState.getInt(KEY_SPEED);
-        }
-        if (savedState.containsKey(KEY_PSKTYPE)) {
-            pskType = savedState.getInt(KEY_PSKTYPE);
-        }
-        if (savedState.containsKey(KEY_EAPTYPE)) {
-            mEapType = savedState.getInt(KEY_EAPTYPE);
-        }
-        mInfo = savedState.getParcelable(KEY_WIFIINFO);
-        if (savedState.containsKey(KEY_NETWORKINFO)) {
-            mNetworkInfo = savedState.getParcelable(KEY_NETWORKINFO);
-        }
-        if (savedState.containsKey(KEY_SCANRESULTS)) {
-            Parcelable[] scanResults = savedState.getParcelableArray(KEY_SCANRESULTS);
-            mScanResults.clear();
-            for (Parcelable result : scanResults) {
-                mScanResults.add((ScanResult) result);
-            }
-        }
-        if (savedState.containsKey(KEY_SCOREDNETWORKCACHE)) {
-            ArrayList<TimestampedScoredNetwork> scoredNetworkArrayList =
-                    savedState.getParcelableArrayList(KEY_SCOREDNETWORKCACHE);
-            for (TimestampedScoredNetwork timedScore : scoredNetworkArrayList) {
-                mScoredNetworkCache.put(timedScore.getScore().networkKey.wifiKey.bssid, timedScore);
+    private final WifiEntry.WifiEntryCallback mEntryCallback = new WifiEntry.WifiEntryCallback() {
+        @Override
+        public void onUpdated() {
+            if (mAccessPointListener != null) {
+                mAccessPointListener.onAccessPointChanged(AccessPoint.this);
+                mAccessPointListener.onLevelChanged(AccessPoint.this);
             }
         }
-        if (savedState.containsKey(KEY_PASSPOINT_UNIQUE_ID)) {
-            mPasspointUniqueId = savedState.getString(KEY_PASSPOINT_UNIQUE_ID);
-        }
-        if (savedState.containsKey(KEY_FQDN)) {
-            mFqdn = savedState.getString(KEY_FQDN);
-        }
-        if (savedState.containsKey(KEY_PROVIDER_FRIENDLY_NAME)) {
-            mProviderFriendlyName = savedState.getString(KEY_PROVIDER_FRIENDLY_NAME);
-        }
-        if (savedState.containsKey(KEY_SUBSCRIPTION_EXPIRATION_TIME_IN_MILLIS)) {
-            mSubscriptionExpirationTimeInMillis =
-                    savedState.getLong(KEY_SUBSCRIPTION_EXPIRATION_TIME_IN_MILLIS);
-        }
-        if (savedState.containsKey(KEY_PASSPOINT_CONFIGURATION_VERSION)) {
-            mPasspointConfigurationVersion = savedState.getInt(KEY_PASSPOINT_CONFIGURATION_VERSION);
-        }
-        if (savedState.containsKey(KEY_IS_PSK_SAE_TRANSITION_MODE)) {
-            mIsPskSaeTransitionMode = savedState.getBoolean(KEY_IS_PSK_SAE_TRANSITION_MODE);
-        }
-        if (savedState.containsKey(KEY_IS_OWE_TRANSITION_MODE)) {
-            mIsOweTransitionMode = savedState.getBoolean(KEY_IS_OWE_TRANSITION_MODE);
-        }
-
-        update(mConfig, mInfo, mNetworkInfo);
+    };
 
-        // Calculate required fields
-        updateKey();
-        updateBestRssiInfo();
-    }
-
-    /**
-     * Creates an AccessPoint with only a WifiConfiguration. This is used for the saved networks
-     * page.
-     */
-    public AccessPoint(Context context, WifiConfiguration config) {
-        mContext = context;
-        loadConfig(config);
-        updateKey();
-    }
-
-    /**
-     * Initialize an AccessPoint object for a {@link PasspointConfiguration}.  This is mainly
-     * used by "Saved Networks" page for managing the saved {@link PasspointConfiguration}.
-     */
-    public AccessPoint(Context context, PasspointConfiguration config) {
-        mContext = context;
-        mPasspointUniqueId = config.getUniqueId();
-        mFqdn = config.getHomeSp().getFqdn();
-        mProviderFriendlyName = config.getHomeSp().getFriendlyName();
-        mSubscriptionExpirationTimeInMillis = config.getSubscriptionExpirationTimeMillis();
-        if (config.isOsuProvisioned()) {
-            mPasspointConfigurationVersion =
-                    AccessPoint.PasspointConfigurationVersion.OSU_PROVISIONED;
-        } else {
-            mPasspointConfigurationVersion =
-                    AccessPoint.PasspointConfigurationVersion.NO_OSU_PROVISIONED;
-        }
-        updateKey();
-    }
+    AccessPoint.AccessPointListener mAccessPointListener;
 
-    /**
-     * Initialize an AccessPoint object for a Passpoint network.
-     */
-    public AccessPoint(@NonNull Context context, @NonNull WifiConfiguration config,
-            @Nullable Collection<ScanResult> homeScans,
-            @Nullable Collection<ScanResult> roamingScans) {
-        mContext = context;
-        networkId = config.networkId;
-        mConfig = config;
-        mPasspointUniqueId = config.getKey();
-        mFqdn = config.FQDN;
-        setScanResultsPasspoint(homeScans, roamingScans);
-        updateKey();
+    public AccessPoint(WifiEntry wifiEntry) {
+        mWifiEntry = wifiEntry;
     }
 
-    /**
-     * Initialize an AccessPoint object for a Passpoint OSU Provider.
+    /*
+     * Use this for any new code that was not written using legacy WifiTracker AccessPoint
+     * interface.
      */
-    public AccessPoint(@NonNull Context context, @NonNull OsuProvider provider,
-            @NonNull Collection<ScanResult> results) {
-        mContext = context;
-        mOsuProvider = provider;
-        setScanResults(results);
-        updateKey();
-    }
-
-    AccessPoint(Context context, Collection<ScanResult> results) {
-        mContext = context;
-        setScanResults(results);
-        updateKey();
-    }
-
-    @VisibleForTesting
-    void loadConfig(WifiConfiguration config) {
-        ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID));
-        bssid = config.BSSID;
-        security = getSecurity(config);
-        networkId = config.networkId;
-        mConfig = config;
-    }
-
-    /** Updates {@link #mKey} and should only called upon object creation/initialization. */
-    private void updateKey() {
-        if (isPasspoint()) {
-            mKey = getKey(mConfig);
-        } else if (isPasspointConfig()) {
-            mKey = getKey(mPasspointUniqueId);
-        } else if (isOsuProvider()) {
-            mKey = getKey(mOsuProvider);
-        } else { // Non-Passpoint AP
-            mKey = getKey(getSsidStr(), getBssid(), getSecurity());
-        }
+    public WifiEntry getWifiEntry() {
+        return mWifiEntry;
     }
 
-    /**
-     * Returns a negative integer, zero, or a positive integer if this AccessPoint is less than,
-     * equal to, or greater than the other AccessPoint.
-     *
-     * Sort order rules for AccessPoints:
-     * 1. Active before inactive
-     * 2. Reachable before unreachable
-     * 3. Saved before unsaved
-     * 4. Network speed value
-     * 5. Stronger signal before weaker signal
-     * 6. SSID alphabetically
-     *
-     * Note that AccessPoints with a signal are usually also Reachable,
-     * and will thus appear before unreachable saved AccessPoints.
-     */
     @Override
     public int compareTo(@NonNull AccessPoint other) {
-        // Active one goes first.
-        if (isActive() && !other.isActive()) return -1;
-        if (!isActive() && other.isActive()) return 1;
-
-        // Reachable one goes before unreachable one.
-        if (isReachable() && !other.isReachable()) return -1;
-        if (!isReachable() && other.isReachable()) return 1;
-
-        // Configured (saved) one goes before unconfigured one.
-        if (isSaved() && !other.isSaved()) return -1;
-        if (!isSaved() && other.isSaved()) return 1;
-
-        // Faster speeds go before slower speeds - but only if visible change in speed label
-        if (getSpeed() != other.getSpeed()) {
-            return other.getSpeed() - getSpeed();
-        }
-
-        WifiManager wifiManager = getWifiManager();
-        // Sort by signal strength, bucketed by level
-        int difference = wifiManager.calculateSignalLevel(other.mRssi)
-                - wifiManager.calculateSignalLevel(mRssi);
-        if (difference != 0) {
-            return difference;
-        }
-
-        // Sort by title.
-        difference = getTitle().compareToIgnoreCase(other.getTitle());
-        if (difference != 0) {
-            return difference;
-        }
-
-        // Do a case sensitive comparison to distinguish SSIDs that differ in case only
-        return getSsidStr().compareTo(other.getSsidStr());
+        return WifiEntry.WIFI_PICKER_COMPARATOR.compare(mWifiEntry, other.mWifiEntry);
     }
 
     @Override
@@ -476,189 +112,12 @@ public class AccessPoint implements Comparable<AccessPoint> {
 
     @Override
     public int hashCode() {
-        int result = 0;
-        if (mInfo != null) result += 13 * mInfo.hashCode();
-        result += 19 * mRssi;
-        result += 23 * networkId;
-        result += 29 * ssid.hashCode();
-        return result;
+        return mWifiEntry.hashCode();
     }
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder().append("AccessPoint(")
-                .append(ssid);
-        if (bssid != null) {
-            builder.append(":").append(bssid);
-        }
-        if (isSaved()) {
-            builder.append(',').append("saved");
-        }
-        if (isActive()) {
-            builder.append(',').append("active");
-        }
-        if (isEphemeral()) {
-            builder.append(',').append("ephemeral");
-        }
-        if (isConnectable()) {
-            builder.append(',').append("connectable");
-        }
-        if ((security != SECURITY_NONE) && (security != SECURITY_OWE)) {
-            builder.append(',').append(securityToString(security, pskType));
-        }
-        builder.append(",level=").append(getLevel());
-        if (mSpeed != AccessPoint.Speed.NONE) {
-            builder.append(",speed=").append(mSpeed);
-        }
-        builder.append(",metered=").append(isMetered());
-
-        if (isVerboseLoggingEnabled()) {
-            builder.append(",rssi=").append(mRssi);
-            synchronized (mLock) {
-                builder.append(",scan cache size=").append(mScanResults.size()
-                        + mExtraScanResults.size());
-            }
-        }
-
-        return builder.append(')').toString();
-    }
-
-    /**
-     * Updates the AccessPoint rankingScore, metering, and speed, returning true if the data has
-     * changed.
-     *
-     * @param scoreCache             The score cache to use to retrieve scores
-     * @param scoringUiEnabled       Whether to show scoring and badging UI
-     * @param maxScoreCacheAgeMillis the maximum age in milliseconds of scores to consider when
-     *                               generating speed labels
-     */
-    boolean update(
-            WifiNetworkScoreCache scoreCache,
-            boolean scoringUiEnabled,
-            long maxScoreCacheAgeMillis) {
-        boolean scoreChanged = false;
-        if (scoringUiEnabled) {
-            scoreChanged = updateScores(scoreCache, maxScoreCacheAgeMillis);
-        }
-        return updateMetered(scoreCache) || scoreChanged;
-    }
-
-    /**
-     * Updates the AccessPoint rankingScore and speed, returning true if the data has changed.
-     *
-     * <p>Any cached {@link TimestampedScoredNetwork} objects older than the given max age in millis
-     * will be removed when this method is invoked.
-     *
-     * <p>Precondition: {@link #mRssi} is up to date before invoking this method.
-     *
-     * @param scoreCache             The score cache to use to retrieve scores
-     * @param maxScoreCacheAgeMillis the maximum age in milliseconds of scores to consider when
-     *                               generating speed labels
-     * @return true if the set speed has changed
-     */
-    private boolean updateScores(WifiNetworkScoreCache scoreCache, long maxScoreCacheAgeMillis) {
-        long nowMillis = SystemClock.elapsedRealtime();
-        synchronized (mLock) {
-            for (ScanResult result : mScanResults) {
-                ScoredNetwork score = scoreCache.getScoredNetwork(result);
-                if (score == null) {
-                    continue;
-                }
-                TimestampedScoredNetwork timedScore = mScoredNetworkCache.get(result.BSSID);
-                if (timedScore == null) {
-                    mScoredNetworkCache.put(
-                            result.BSSID, new TimestampedScoredNetwork(score, nowMillis));
-                } else {
-                    // Update data since the has been seen in the score cache
-                    timedScore.update(score, nowMillis);
-                }
-            }
-        }
-
-        // Remove old cached networks
-        long evictionCutoff = nowMillis - maxScoreCacheAgeMillis;
-        Iterator<TimestampedScoredNetwork> iterator = mScoredNetworkCache.values().iterator();
-        iterator.forEachRemaining(timestampedScoredNetwork -> {
-            if (timestampedScoredNetwork.getUpdatedTimestampMillis() < evictionCutoff) {
-                iterator.remove();
-            }
-        });
-
-        return updateSpeed();
-    }
-
-    /**
-     * Updates the internal speed, returning true if the update resulted in a speed label change.
-     */
-    private boolean updateSpeed() {
-        int oldSpeed = mSpeed;
-        mSpeed = generateAverageSpeedForSsid();
-
-        boolean changed = oldSpeed != mSpeed;
-        if (isVerboseLoggingEnabled() && changed) {
-            Log.i(TAG, String.format("%s: Set speed to %d", ssid, mSpeed));
-        }
-        return changed;
-    }
-
-    /** Creates a speed value for the current {@link #mRssi} by averaging all non zero badges. */
-    @AccessPoint.Speed
-    private int generateAverageSpeedForSsid() {
-        if (mScoredNetworkCache.isEmpty()) {
-            return AccessPoint.Speed.NONE;
-        }
-
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, String.format("Generating fallbackspeed for %s using cache: %s",
-                    getSsidStr(), mScoredNetworkCache));
-        }
-
-        // TODO(b/63073866): If flickering issues persist, consider mapping using getLevel rather
-        // than specific rssi value so score doesn't change without a visible wifi bar change. This
-        // issue is likely to be more evident for the active AP whose RSSI value is not half-lifed.
-
-        int count = 0;
-        int totalSpeed = 0;
-        for (TimestampedScoredNetwork timedScore : mScoredNetworkCache.values()) {
-            int speed = timedScore.getScore().calculateBadge(mRssi);
-            if (speed != AccessPoint.Speed.NONE) {
-                count++;
-                totalSpeed += speed;
-            }
-        }
-        int speed = count == 0 ? AccessPoint.Speed.NONE : totalSpeed / count;
-        if (isVerboseLoggingEnabled()) {
-            Log.i(TAG, String.format("%s generated fallback speed is: %d", getSsidStr(), speed));
-        }
-        return roundToClosestSpeedEnum(speed);
-    }
-
-    /**
-     * Updates the AccessPoint's metering based on {@link ScoredNetwork#meteredHint}, returning
-     * true if the metering changed.
-     */
-    private boolean updateMetered(WifiNetworkScoreCache scoreCache) {
-        boolean oldMetering = mIsScoredNetworkMetered;
-        mIsScoredNetworkMetered = false;
-
-        if (isActive() && mInfo != null) {
-            NetworkKey key = NetworkKey.createFromWifiInfo(mInfo);
-            ScoredNetwork score = scoreCache.getScoredNetwork(key);
-            if (score != null) {
-                mIsScoredNetworkMetered |= score.meteredHint;
-            }
-        } else {
-            synchronized (mLock) {
-                for (ScanResult result : mScanResults) {
-                    ScoredNetwork score = scoreCache.getScoredNetwork(result);
-                    if (score == null) {
-                        continue;
-                    }
-                    mIsScoredNetworkMetered |= score.meteredHint;
-                }
-            }
-        }
-        return oldMetering != mIsScoredNetworkMetered;
+        return mWifiEntry.toString();
     }
 
     /**
@@ -672,38 +131,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
     }
 
     /**
-     * Returns the AccessPoint key for a WifiConfiguration.
-     * This will return a special Passpoint key if the config is for Passpoint.
-     */
-    public static String getKey(WifiConfiguration config) {
-        if (config.isPasspoint()) {
-            return getKey(config.getKey());
-        } else {
-            return getKey(removeDoubleQuotes(config.SSID), config.BSSID, getSecurity(config));
-        }
-    }
-
-    /**
-     * Returns the AccessPoint key corresponding to a Passpoint network by its unique identifier.
-     */
-    public static String getKey(String passpointUniqueId) {
-        return new StringBuilder()
-                .append(KEY_PREFIX_PASSPOINT_UNIQUE_ID)
-                .append(passpointUniqueId).toString();
-    }
-
-    /**
-     * Returns the AccessPoint key corresponding to the OsuProvider.
-     */
-    public static String getKey(OsuProvider provider) {
-        return new StringBuilder()
-                .append(KEY_PREFIX_OSU)
-                .append(provider.getFriendlyName())
-                .append(',')
-                .append(provider.getServerUri()).toString();
-    }
-
-    /**
      * Returns the AccessPoint key for a normal non-Passpoint network by ssid/bssid and security.
      */
     private static String getKey(String ssid, String bssid, int security) {
@@ -719,960 +146,91 @@ public class AccessPoint implements Comparable<AccessPoint> {
     }
 
     public String getKey() {
-        return mKey;
-    }
-
-    /**
-     * Determines if the other AccessPoint represents the same network as this AccessPoint
-     */
-    public boolean matches(AccessPoint other) {
-        if (isPasspoint() || isPasspointConfig() || isOsuProvider()) {
-            return getKey().equals(other.getKey());
-        }
-
-        if (!isSameSsidOrBssid(other)) {
-            return false;
-        }
-
-        final int otherApSecurity = other.getSecurity();
-        if (mIsPskSaeTransitionMode) {
-            if (otherApSecurity == SECURITY_SAE && getWifiManager().isWpa3SaeSupported()) {
-                return true;
-            } else if (otherApSecurity == SECURITY_PSK) {
-                return true;
-            }
-        } else {
-            if ((security == SECURITY_SAE || security == SECURITY_PSK)
-                    && other.isPskSaeTransitionMode()) {
-                return true;
-            }
-        }
-
-        if (mIsOweTransitionMode) {
-            if (otherApSecurity == SECURITY_OWE && getWifiManager().isEnhancedOpenSupported()) {
-                return true;
-            } else if (otherApSecurity == SECURITY_NONE) {
-                return true;
-            }
-        } else {
-            if ((security == SECURITY_OWE || security == SECURITY_NONE)
-                    && other.isOweTransitionMode()) {
-                return true;
-            }
-        }
-
-        return security == other.getSecurity();
-    }
-
-    public boolean matches(WifiConfiguration config) {
-        if (config.isPasspoint()) {
-            return (isPasspoint() && config.getKey().equals(mConfig.getKey()));
-        }
-
-        if (!ssid.equals(removeDoubleQuotes(config.SSID))
-                || (mConfig != null && mConfig.shared != config.shared)) {
-            return false;
-        }
-
-        final int configSecurity = getSecurity(config);
-        if (mIsPskSaeTransitionMode) {
-            if (configSecurity == SECURITY_SAE && getWifiManager().isWpa3SaeSupported()) {
-                return true;
-            } else if (configSecurity == SECURITY_PSK) {
-                return true;
-            }
-        }
-
-        if (mIsOweTransitionMode) {
-            if (configSecurity == SECURITY_OWE && getWifiManager().isEnhancedOpenSupported()) {
-                return true;
-            } else if (configSecurity == SECURITY_NONE) {
-                return true;
-            }
-        }
-
-        return security == getSecurity(config);
-    }
-
-    private boolean matches(WifiConfiguration config, WifiInfo wifiInfo) {
-        if (config == null || wifiInfo == null) {
-            return false;
-        }
-        if (!config.isPasspoint() && !isSameSsidOrBssid(wifiInfo)) {
-            return false;
-        }
-        return matches(config);
-    }
-
-    @VisibleForTesting
-    boolean matches(ScanResult scanResult) {
-        if (scanResult == null) {
-            return false;
-        }
-        if (isPasspoint() || isOsuProvider()) {
-            throw new IllegalStateException("Should not matches a Passpoint by ScanResult");
-        }
-
-        if (!isSameSsidOrBssid(scanResult)) {
-            return false;
-        }
-
-        if (mIsPskSaeTransitionMode) {
-            if (scanResult.capabilities.contains("SAE")
-                    && getWifiManager().isWpa3SaeSupported()) {
-                return true;
-            } else if (scanResult.capabilities.contains("PSK")) {
-                return true;
-            }
-        } else {
-            if ((security == SECURITY_SAE || security == SECURITY_PSK)
-                    && AccessPoint.isPskSaeTransitionMode(scanResult)) {
-                return true;
-            }
-        }
-
-        if (mIsOweTransitionMode) {
-            final int scanResultSccurity = getSecurity(mContext, scanResult);
-            if (scanResultSccurity == SECURITY_OWE && getWifiManager().isEnhancedOpenSupported()) {
-                return true;
-            } else if (scanResultSccurity == SECURITY_NONE) {
-                return true;
-            }
-        } else {
-            if ((security == SECURITY_OWE || security == SECURITY_NONE)
-                    && AccessPoint.isOweTransitionMode(scanResult)) {
-                return true;
-            }
-        }
-
-        return security == getSecurity(mContext, scanResult);
+        return getKey(getSsidStr(), mWifiEntry.getMacAddress(), getSecurity());
     }
 
     public WifiConfiguration getConfig() {
-        return mConfig;
-    }
-
-    public String getPasspointFqdn() {
-        return mFqdn;
+        return mWifiEntry.getWifiConfiguration();
     }
 
     public void clearConfig() {
-        mConfig = null;
-        networkId = WifiConfiguration.INVALID_NETWORK_ID;
     }
 
     public WifiInfo getInfo() {
-        return mInfo;
+        return null;
     }
 
     /**
      * Returns the number of levels to show for a Wifi icon, from 0 to
      * {@link WifiManager#getMaxSignalLevel()}.
-     *
-     * <p>Use {@link #isReachable()} to determine if an AccessPoint is in range, as this method will
-     * always return at least 0.
      */
     public int getLevel() {
-        return getWifiManager().calculateSignalLevel(mRssi);
-    }
-
-    public int getRssi() {
-        return mRssi;
-    }
-
-    /**
-     * Returns the underlying scan result set.
-     *
-     * <p>Callers should not modify this set.
-     */
-    public Set<ScanResult> getScanResults() {
-        Set<ScanResult> allScans = new ArraySet<>();
-        synchronized (mLock) {
-            allScans.addAll(mScanResults);
-            allScans.addAll(mExtraScanResults);
-        }
-        return allScans;
-    }
-
-    public Map<String, TimestampedScoredNetwork> getScoredNetworkCache() {
-        return mScoredNetworkCache;
-    }
-
-    /**
-     * Updates {@link #mRssi} and sets scan result information to that of the best RSSI scan result.
-     *
-     * <p>If the given connection is active, the existing value of {@link #mRssi} will be returned.
-     * If the given AccessPoint is not active, a value will be calculated from previous scan
-     * results, returning the best RSSI for all matching AccessPoints averaged with the previous
-     * value. If the access point is not connected and there are no scan results, the rssi will be
-     * set to {@link #UNREACHABLE_RSSI}.
-     */
-    private void updateBestRssiInfo() {
-        if (this.isActive()) {
-            return;
-        }
-
-        ScanResult bestResult = null;
-        int bestRssi = UNREACHABLE_RSSI;
-        synchronized (mLock) {
-            for (ScanResult result : mScanResults) {
-                if (result.level > bestRssi) {
-                    bestRssi = result.level;
-                    bestResult = result;
-                }
-            }
-        }
-
-        // Set the rssi to the average of the current rssi and the previous rssi.
-        if (bestRssi != UNREACHABLE_RSSI && mRssi != UNREACHABLE_RSSI) {
-            mRssi = (mRssi + bestRssi) / 2;
-        } else {
-            mRssi = bestRssi;
-        }
-
-        if (bestResult != null) {
-            ssid = bestResult.SSID;
-            bssid = bestResult.BSSID;
-            security = getSecurity(mContext, bestResult);
-            if (security == SECURITY_PSK || security == SECURITY_SAE) {
-                pskType = getPskType(bestResult);
-            }
-            if (security == SECURITY_EAP) {
-                mEapType = getEapType(bestResult);
-            }
-
-            mIsPskSaeTransitionMode = AccessPoint.isPskSaeTransitionMode(bestResult);
-            mIsOweTransitionMode = AccessPoint.isOweTransitionMode(bestResult);
-        }
-        // Update the config SSID of a Passpoint network to that of the best RSSI
-        if (isPasspoint()) {
-            mConfig.SSID = convertToQuotedString(ssid);
-        }
+        return mWifiEntry.getLevel();
     }
 
     /**
      * Returns if the network should be considered metered.
      */
     public boolean isMetered() {
-        return mIsScoredNetworkMetered
-                || WifiConfiguration.isMetered(mConfig, mInfo);
+        return mWifiEntry.isMetered();
     }
 
-    public NetworkInfo getNetworkInfo() {
-        return mNetworkInfo;
-    }
 
     public int getSecurity() {
-        return security;
+        return mWifiEntry.getSecurity();
     }
 
     public String getSsidStr() {
-        return ssid;
-    }
-
-    public String getBssid() {
-        return bssid;
+        return mWifiEntry.getSsid();
     }
 
     public CharSequence getSsid() {
-        return ssid;
+        return getSsidStr();
     }
 
     /**
-     * Returns the name associated with the stored config.
-     *
-     * @deprecated Please use {@link #getTitle()} instead to get the display name of an AccessPoint.
-     */
-    @Deprecated
-    public String getConfigName() {
-        if (mConfig != null && mConfig.isPasspoint()) {
-            return mConfig.providerFriendlyName;
-        } else if (mPasspointUniqueId != null) {
-            return mProviderFriendlyName;
-        } else {
-            return ssid;
-        }
-    }
-
-    public NetworkInfo.DetailedState getDetailedState() {
-        if (mNetworkInfo != null) {
-            return mNetworkInfo.getDetailedState();
-        }
-        Log.w(TAG, "NetworkInfo is null, cannot return detailed state");
-        return null;
-    }
-
-//    public String getSavedNetworkSummary() {
-//        WifiConfiguration config = mConfig;
-//        if (config != null) {
-//            PackageManager pm = mContext.getPackageManager();
-//            String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
-//            int userId = UserHandle.getUserId(config.creatorUid);
-//            ApplicationInfo appInfo = null;
-//            if (config.creatorName != null && config.creatorName.equals(systemName)) {
-//                appInfo = mContext.getApplicationInfo();
-//            } else {
-//                try {
-//                    IPackageManager ipm = AppGlobals.getPackageManager();
-//                    appInfo = ipm.getApplicationInfo(config.creatorName, 0 /* flags */, userId);
-//                } catch (RemoteException rex) {
-//                }
-//            }
-//            if (appInfo != null &&
-//                    !appInfo.packageName.equals(mContext.getString(R.string.settings_package)) &&
-//                    !appInfo.packageName.equals(
-//                            mContext.getString(R.string.certinstaller_package))) {
-//                return mContext.getString(R.string.saved_network, appInfo.loadLabel(pm));
-//            }
-//        }
-//
-//        if (isPasspointConfigurationR1() && isExpired()) {
-//            return mContext.getString(R.string.wifi_passpoint_expired);
-//        }
-//        return "";
-//    }
-
-    /**
      * Returns the display title for the AccessPoint, such as for an AccessPointPreference's title.
      */
     public String getTitle() {
-        if (isPasspoint() && !TextUtils.isEmpty(mConfig.providerFriendlyName)) {
-            return mConfig.providerFriendlyName;
-        } else if (isPasspointConfig() && !TextUtils.isEmpty(mProviderFriendlyName)) {
-            return mProviderFriendlyName;
-        } else if (isOsuProvider() && !TextUtils.isEmpty(mOsuProvider.getFriendlyName())) {
-            return mOsuProvider.getFriendlyName();
-        } else if (!TextUtils.isEmpty(getSsidStr())) {
-            return getSsidStr();
-        } else {
-            return "";
-        }
-    }
-
-    public String getSummary() {
-        return getSettingsSummary();
+        return mWifiEntry.getTitle();
     }
 
     public String getSettingsSummary() {
-        return getSettingsSummary(false /*convertSavedAsDisconnected*/);
-    }
-
-    /**
-     * Returns the summary for the AccessPoint.
-     */
-    public String getSettingsSummary(boolean convertSavedAsDisconnected) {
-//        if (isPasspointConfigurationR1() && isExpired()) {
-//            return mContext.getString(R.string.wifi_passpoint_expired);
-//        }
-//
-//        // Update to new summary
-//        StringBuilder summary = new StringBuilder();
-//
-//        if (isOsuProvider()) {
-//            if (mOsuProvisioningComplete) {
-//                summary.append(mContext.getString(R.string.osu_sign_up_complete));
-//            } else if (mOsuFailure != null) {
-//                summary.append(mOsuFailure);
-//            } else if (mOsuStatus != null) {
-//                summary.append(mOsuStatus);
-//            } else {
-//                summary.append(mContext.getString(R.string.tap_to_sign_up));
-//            }
-//        } else if (isActive()) {
-//            summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),
-//                    mInfo != null && mInfo.isEphemeral(),
-//                    mInfo != null ? mInfo.getRequestingPackageName() : null));
-//        } else { // not active
-//            if (mConfig != null && mConfig.hasNoInternetAccess()) {
-//                int messageID =
-//                        mConfig.getNetworkSelectionStatus().getNetworkSelectionStatus()
-//                                == NETWORK_SELECTION_PERMANENTLY_DISABLED
-//                                ? R.string.wifi_no_internet_no_reconnect
-//                                : R.string.wifi_no_internet;
-//                summary.append(mContext.getString(messageID));
-//            } else if (mConfig != null
-//                    && (mConfig.getNetworkSelectionStatus().getNetworkSelectionStatus()
-//                    != NETWORK_SELECTION_ENABLED)) {
-//                WifiConfiguration.NetworkSelectionStatus networkStatus =
-//                        mConfig.getNetworkSelectionStatus();
-//                switch (networkStatus.getNetworkSelectionDisableReason()) {
-//                    case WifiConfiguration.NetworkSelectionStatus.DISABLED_AUTHENTICATION_FAILURE:
-//                        summary.append(mContext.getString(R.string
-//                        .wifi_disabled_password_failure));
-//                        break;
-//                    case WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD:
-//                        summary.append(mContext.getString(R.string
-//                        .wifi_check_password_try_again));
-//                        break;
-//                    case WifiConfiguration.NetworkSelectionStatus.DISABLED_DHCP_FAILURE:
-//                        summary.append(mContext.getString(R.string
-//                        .wifi_disabled_network_failure));
-//                        break;
-//                    case WifiConfiguration.NetworkSelectionStatus.DISABLED_ASSOCIATION_REJECTION:
-//                        summary.append(mContext.getString(R.string.wifi_disabled_generic));
-//                        break;
-//                }
-//            } else if (!isReachable()) { // Wifi out of range
-//                summary.append(mContext.getString(R.string.wifi_not_in_range));
-//            } else { // In range, not disabled.
-//                if (mConfig != null) { // Is saved network
-//                    // Last attempt to connect to this failed. Show reason why
-//                    switch (mConfig.getRecentFailureReason()) {
-//                        case WifiConfiguration.RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA:
-//                            summary.append(mContext.getString(
-//                                    R.string.wifi_ap_unable_to_handle_new_sta));
-//                            break;
-//                        default:
-//                            if (convertSavedAsDisconnected) {
-//                                // Disconnected
-//                                summary.append(mContext.getString(R.string.wifi_disconnected));
-//                            } else {
-//                                // "Saved"
-//                                summary.append(mContext.getString(R.string.wifi_remembered));
-//                            }
-//                            break;
-//                    }
-//                }
-//            }
-//        }
-//
-//
-//
-//        if (isVerboseLoggingEnabled()) {
-//            summary.append(WifiUtils.buildLoggingSummary(this, mConfig));
-//        }
-//
-//        if (mConfig != null && (WifiUtils.isMeteredOverridden(mConfig) || mConfig.meteredHint)) {
-//            return mContext.getResources().getString(
-//                    R.string.preference_summary_default_combination,
-//                    WifiUtils.getMeteredLabel(mContext, mConfig),
-//                    summary.toString());
-//        }
-//
-//        // If Speed label and summary are both present, use the preference combination to combine
-//        // the two, else return the non-null one.
-//        if (getSpeedLabel() != null && summary.length() != 0) {
-//            return mContext.getResources().getString(
-//                    R.string.preference_summary_default_combination,
-//                    getSpeedLabel(),
-//                    summary.toString());
-//        } else if (getSpeedLabel() != null) {
-//            return getSpeedLabel();
-//        } else {
-//            return summary.toString();
-//        }
         return "";
     }
 
-    /**
-     * Return whether this is the active connection.
-     * For ephemeral connections (networkId is invalid), this returns false if the network is
-     * disconnected.
-     */
     public boolean isActive() {
-        return mNetworkInfo != null &&
-                (networkId != WifiConfiguration.INVALID_NETWORK_ID ||
-                        mNetworkInfo.getState() != NetworkInfo.State.DISCONNECTED);
-    }
-
-    public boolean isConnectable() {
-        return getLevel() != -1 && getDetailedState() == null;
-    }
-
-    public boolean isEphemeral() {
-        return mInfo != null && mInfo.isEphemeral() &&
-                mNetworkInfo != null && mNetworkInfo.getState() != NetworkInfo.State.DISCONNECTED;
+        return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED;
     }
 
     /**
      * Return true if this AccessPoint represents a Passpoint AP.
      */
     public boolean isPasspoint() {
-        return mConfig != null && mConfig.isPasspoint();
-    }
-
-    /**
-     * Return true if this AccessPoint represents a Passpoint provider configuration.
-     */
-    public boolean isPasspointConfig() {
-        return mPasspointUniqueId != null && mConfig == null;
-    }
-
-    /**
-     * Return true if this AccessPoint represents an OSU Provider.
-     */
-    public boolean isOsuProvider() {
-        return mOsuProvider != null;
-    }
-
-    /**
-     * Return true if this AccessPoint is expired.
-     */
-    public boolean isExpired() {
-        if (mSubscriptionExpirationTimeInMillis <= 0) {
-            // Expiration time not specified.
-            return false;
-        } else {
-            return System.currentTimeMillis() >= mSubscriptionExpirationTimeInMillis;
-        }
-    }
-
-    public boolean isPasspointConfigurationR1() {
-        return mPasspointConfigurationVersion
-                == AccessPoint.PasspointConfigurationVersion.NO_OSU_PROVISIONED;
-    }
-
-    /**
-     * Return true if {@link PasspointConfiguration#isOsuProvisioned} is true, this may refer to R2
-     * or R3.
-     */
-    public boolean isPasspointConfigurationOsuProvisioned() {
-        return mPasspointConfigurationVersion
-                == AccessPoint.PasspointConfigurationVersion.OSU_PROVISIONED;
-    }
-
-    /**
-     * Starts the OSU Provisioning flow.
-     */
-    public void startOsuProvisioning(@Nullable WifiManager.ActionListener connectListener) {
-        mConnectListener = connectListener;
-
-        getWifiManager().startSubscriptionProvisioning(
-                mOsuProvider,
-                mContext.getMainExecutor(),
-                new AccessPoint.AccessPointProvisioningCallback()
-        );
-    }
-
-    /**
-     * Return whether the given {@link WifiInfo} is for this access point.
-     * If the current AP does not have a network Id then the config is used to
-     * match based on SSID and security.
-     */
-    private boolean isInfoForThisAccessPoint(WifiConfiguration config, WifiInfo info) {
-        if (info.isOsuAp() || mOsuStatus != null) {
-            return (info.isOsuAp() && mOsuStatus != null);
-        } else if (info.isPasspointAp() || isPasspoint()) {
-            // TODO: Use TextUtils.equals(info.getPasspointUniqueId(), mConfig.getKey()) when API
-            //  is available
-            return (info.isPasspointAp() && isPasspoint()
-                    && TextUtils.equals(info.getPasspointFqdn(), mConfig.FQDN)
-                    && TextUtils.equals(info.getPasspointProviderFriendlyName(),
-                    mConfig.providerFriendlyName));
-        }
-
-        if (networkId != WifiConfiguration.INVALID_NETWORK_ID) {
-            return networkId == info.getNetworkId();
-        } else if (config != null) {
-            return matches(config, info);
-        } else {
-            // Might be an ephemeral connection with no WifiConfiguration. Try matching on SSID.
-            // (Note that we only do this if the WifiConfiguration explicitly equals INVALID).
-            // TODO: Handle hex string SSIDs.
-            return TextUtils.equals(removeDoubleQuotes(info.getSSID()), ssid);
-        }
+        return mWifiEntry instanceof PasspointWifiEntry;
     }
 
     public boolean isSaved() {
-        return mConfig != null;
+        return mWifiEntry.isSaved();
     }
 
     public Object getTag() {
-        return mTag;
+        return sTagMap.get(mWifiEntry);
     }
 
     public void setTag(Object tag) {
-        mTag = tag;
-    }
-
-    /**
-     * Generate and save a default wifiConfiguration with common values.
-     * Can only be called for unsecured networks.
-     */
-    public void generateOpenNetworkConfig() {
-        if (!isOpenNetwork()) {
-            throw new IllegalStateException();
-        }
-        if (mConfig != null) {
-            return;
-        }
-        mConfig = new WifiConfiguration();
-        mConfig.SSID = AccessPoint.convertToQuotedString(ssid);
-
-        if (security == SECURITY_NONE) {
-            mConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
-        } else {
-            mConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);
-            mConfig.requirePmf = true;
-        }
-    }
-
-    public void saveWifiState(Bundle savedState) {
-        if (ssid != null) savedState.putString(KEY_SSID, getSsidStr());
-        savedState.putInt(KEY_SECURITY, security);
-        savedState.putInt(KEY_SPEED, mSpeed);
-        savedState.putInt(KEY_PSKTYPE, pskType);
-        savedState.putInt(KEY_EAPTYPE, mEapType);
-        if (mConfig != null) savedState.putParcelable(KEY_CONFIG, mConfig);
-        savedState.putParcelable(KEY_WIFIINFO, mInfo);
-        synchronized (mLock) {
-            savedState.putParcelableArray(KEY_SCANRESULTS,
-                    mScanResults.toArray(new Parcelable[mScanResults.size()
-                            + mExtraScanResults.size()]));
-        }
-        savedState.putParcelableArrayList(KEY_SCOREDNETWORKCACHE,
-                new ArrayList<>(mScoredNetworkCache.values()));
-        if (mNetworkInfo != null) {
-            savedState.putParcelable(KEY_NETWORKINFO, mNetworkInfo);
-        }
-        if (mPasspointUniqueId != null) {
-            savedState.putString(KEY_PASSPOINT_UNIQUE_ID, mPasspointUniqueId);
-        }
-        if (mFqdn != null) {
-            savedState.putString(KEY_FQDN, mFqdn);
-        }
-        if (mProviderFriendlyName != null) {
-            savedState.putString(KEY_PROVIDER_FRIENDLY_NAME, mProviderFriendlyName);
-        }
-        savedState.putLong(KEY_SUBSCRIPTION_EXPIRATION_TIME_IN_MILLIS,
-                mSubscriptionExpirationTimeInMillis);
-        savedState.putInt(KEY_PASSPOINT_CONFIGURATION_VERSION, mPasspointConfigurationVersion);
-        savedState.putBoolean(KEY_IS_PSK_SAE_TRANSITION_MODE, mIsPskSaeTransitionMode);
-        savedState.putBoolean(KEY_IS_OWE_TRANSITION_MODE, mIsOweTransitionMode);
+        sTagMap.put(mWifiEntry, tag);
     }
 
     public void setListener(AccessPoint.AccessPointListener listener) {
         mAccessPointListener = listener;
+        mWifiEntry.setListener(listener != null ? mEntryCallback : null);
     }
 
-    /**
-     * Sets {@link #mScanResults} to the given collection and updates info based on the best RSSI
-     * scan result.
-     *
-     * @param scanResults a collection of scan results to add to the internal set
-     */
-    void setScanResults(Collection<ScanResult> scanResults) {
-        if (CollectionUtils.isEmpty(scanResults)) {
-            Log.d(TAG, "Cannot set scan results to empty list");
-            return;
-        }
-
-        // Validate scan results are for current AP only by matching SSID/BSSID
-        // Passpoint networks are not bound to a specific SSID/BSSID, so skip this for passpoint.
-        if (mKey != null && !isPasspoint() && !isOsuProvider()) {
-            for (ScanResult result : scanResults) {
-                if (!matches(result)) {
-                    Log.d(TAG, String.format(
-                            "ScanResult %s\nkey of %s did not match current AP key %s",
-                            result, getKey(mContext, result), mKey));
-                    return;
-                }
-            }
-        }
-
-        int oldLevel = getLevel();
-        synchronized (mLock) {
-            mScanResults.clear();
-            mScanResults.addAll(scanResults);
-        }
-        updateBestRssiInfo();
-        int newLevel = getLevel();
-
-        // If newLevel is 0, there will be no displayed Preference since the AP is unreachable
-        if (newLevel > 0 && newLevel != oldLevel) {
-            // Only update labels on visible rssi changes
-            updateSpeed();
-            ThreadUtils.postOnMainThread(() -> {
-                if (mAccessPointListener != null) {
-                    mAccessPointListener.onLevelChanged(this);
-                }
-            });
-
-        }
-
-        ThreadUtils.postOnMainThread(() -> {
-            if (mAccessPointListener != null) {
-                mAccessPointListener.onAccessPointChanged(this);
-            }
-        });
-    }
-
-    /**
-     * Sets the internal scan result cache to the list of home scans.
-     * If there are no home scans, then the roaming scan list is used, and the AccessPoint is
-     * marked as roaming.
-     */
-    void setScanResultsPasspoint(
-            @Nullable Collection<ScanResult> homeScans,
-            @Nullable Collection<ScanResult> roamingScans) {
-        synchronized (mLock) {
-            mExtraScanResults.clear();
-            if (!CollectionUtils.isEmpty(homeScans)) {
-                mIsRoaming = false;
-                if (!CollectionUtils.isEmpty(roamingScans)) {
-                    mExtraScanResults.addAll(roamingScans);
-                }
-                setScanResults(homeScans);
-            } else if (!CollectionUtils.isEmpty(roamingScans)) {
-                mIsRoaming = true;
-                setScanResults(roamingScans);
-            }
-        }
-    }
-
-    /**
-     * Attempt to update the AccessPoint with the current connection info.
-     * This is used to set an AccessPoint to the active one if the connection info matches, or
-     * conversely to set an AccessPoint to inactive if the connection info does not match. The RSSI
-     * is also updated upon a match. Listeners will be notified if an update occurred.
-     *
-     * This is called in {@link WifiTracker#updateAccessPoints} as well as in callbacks for handling
-     * NETWORK_STATE_CHANGED_ACTION, RSSI_CHANGED_ACTION, and onCapabilitiesChanged in WifiTracker.
-     *
-     * Returns true if an update occurred.
-     */
-    public boolean update(
-            @Nullable WifiConfiguration config, WifiInfo info, NetworkInfo networkInfo) {
-        boolean updated = false;
-        final int oldLevel = getLevel();
-        if (info != null && isInfoForThisAccessPoint(config, info)) {
-            updated = (mInfo == null);
-            if (!isPasspoint() && mConfig != config) {
-                // We do not set updated = true as we do not want to increase the amount of sorting
-                // and copying performed in WifiTracker at this time. If issues involving refresh
-                // are still seen, we will investigate further.
-                update(config); // Notifies the AccessPointListener of the change
-            }
-            if (mRssi != info.getRssi() && info.getRssi() != WifiInfo.INVALID_RSSI) {
-                mRssi = info.getRssi();
-                updated = true;
-            } else if (mNetworkInfo != null && networkInfo != null
-                    && mNetworkInfo.getDetailedState() != networkInfo.getDetailedState()) {
-                updated = true;
-            }
-            mInfo = info;
-            mNetworkInfo = networkInfo;
-        } else if (mInfo != null) {
-            updated = true;
-            mInfo = null;
-            mNetworkInfo = null;
-        }
-        if (updated && mAccessPointListener != null) {
-            ThreadUtils.postOnMainThread(() -> {
-                if (mAccessPointListener != null) {
-                    mAccessPointListener.onAccessPointChanged(this);
-                }
-            });
-
-            if (oldLevel != getLevel() /* current level */) {
-                ThreadUtils.postOnMainThread(() -> {
-                    if (mAccessPointListener != null) {
-                        mAccessPointListener.onLevelChanged(this);
-                    }
-                });
-            }
-        }
-
-        return updated;
-    }
-
-    void update(@Nullable WifiConfiguration config) {
-        mConfig = config;
-        if (mConfig != null && !isPasspoint()) {
-            ssid = removeDoubleQuotes(mConfig.SSID);
-        }
-        networkId = config != null ? config.networkId : WifiConfiguration.INVALID_NETWORK_ID;
-        ThreadUtils.postOnMainThread(() -> {
-            if (mAccessPointListener != null) {
-                mAccessPointListener.onAccessPointChanged(this);
-            }
-        });
-    }
-
-    @VisibleForTesting
-    void setRssi(int rssi) {
-        mRssi = rssi;
-    }
-
-    /** Sets the rssi to {@link #UNREACHABLE_RSSI}. */
-    void setUnreachable() {
-        setRssi(AccessPoint.UNREACHABLE_RSSI);
-    }
-
-    int getSpeed() {
-        return mSpeed;
-    }
-
-//    @Nullable
-//    String getSpeedLabel() {
-//        return getSpeedLabel(mSpeed);
-//    }
-
-    @Nullable
-    @AccessPoint.Speed
-    private static int roundToClosestSpeedEnum(int speed) {
-        if (speed < AccessPoint.Speed.SLOW) {
-            return AccessPoint.Speed.NONE;
-        } else if (speed < (
-                AccessPoint.Speed.SLOW + AccessPoint.Speed.MODERATE) / 2) {
-            return AccessPoint.Speed.SLOW;
-        } else if (speed < (
-                AccessPoint.Speed.MODERATE + AccessPoint.Speed.FAST) / 2) {
-            return AccessPoint.Speed.MODERATE;
-        } else if (speed < (
-                AccessPoint.Speed.FAST + AccessPoint.Speed.VERY_FAST) / 2) {
-            return AccessPoint.Speed.FAST;
-        } else {
-            return AccessPoint.Speed.VERY_FAST;
-        }
-    }
-
-//    @Nullable
-//    String getSpeedLabel(@AccessPoint.Speed int speed) {
-//        return getSpeedLabel(mContext, speed);
-//    }
-
-//  /*  private static String getSpeedLabel(Context context, int speed) {
-//        switch (speed) {
-//            case AccessPoint.Speed.VERY_FAST:
-//                return context.getString(R.string.speed_label_very_fast);
-//            case AccessPoint.Speed.FAST:
-//                return context.getString(R.string.speed_label_fast);
-//            case AccessPoint.Speed.MODERATE:
-//                return context.getString(R.string.speed_label_okay);
-//            case AccessPoint.Speed.SLOW:
-//                return context.getString(R.string.speed_label_slow);
-//            case AccessPoint.Speed.NONE:
-//            default:
-//                return null;
-//        }
-//    }*/
-
-//    /** Return the speed label for a {@link ScoredNetwork} at the specified {@code rssi} level. */
-//    @Nullable
-//    public static String getSpeedLabel(Context context, ScoredNetwork scoredNetwork, int rssi) {
-//        return getSpeedLabel(context, roundToClosestSpeedEnum(scoredNetwork.calculateBadge
-//        (rssi)));
-//    }
-
-    /** Return true if the current RSSI is reachable, and false otherwise. */
-    public boolean isReachable() {
-        return mRssi != UNREACHABLE_RSSI;
-    }
-
-    private static CharSequence getAppLabel(String packageName, PackageManager packageManager) {
-        CharSequence appLabel = "";
-        ApplicationInfo appInfo = null;
-        try {
-            int userId = UserHandle.getUserId(UserHandle.USER_CURRENT);
-            appInfo = packageManager.getApplicationInfoAsUser(packageName, 0 /* flags */, userId);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "Failed to get app info", e);
-            return appLabel;
-        }
-        if (appInfo != null) {
-            appLabel = appInfo.loadLabel(packageManager);
-        }
-        return appLabel;
-    }
-
-//    public static String getSummary(Context context, String ssid, NetworkInfo.DetailedState state,
-//            boolean isEphemeral, String suggestionOrSpecifierPackageName) {
-//        if (state == NetworkInfo.DetailedState.CONNECTED) {
-//            if (isEphemeral && !TextUtils.isEmpty(suggestionOrSpecifierPackageName)) {
-//                CharSequence appLabel =
-//                        getAppLabel(suggestionOrSpecifierPackageName, context.getPackageManager
-//                        ());
-//                return context.getString(R.string.connected_via_app, appLabel);
-//            } else if (isEphemeral) {
-//                // Special case for connected + ephemeral networks.
-//                final NetworkScoreManager networkScoreManager = context.getSystemService(
-//                        NetworkScoreManager.class);
-//                NetworkScorerAppData scorer = networkScoreManager.getActiveScorer();
-//                if (scorer != null && scorer.getRecommendationServiceLabel() != null) {
-//                    String format = context.getString(R.string.connected_via_network_scorer);
-//                    return String.format(format, scorer.getRecommendationServiceLabel());
-//                } else {
-//                    return context.getString(R.string.connected_via_network_scorer_default);
-//                }
-//            }
-//        }
-//
-//        // Case when there is wifi connected without internet connectivity.
-//        final ConnectivityManager cm = (ConnectivityManager)
-//                context.getSystemService(Context.CONNECTIVITY_SERVICE);
-//        if (state == NetworkInfo.DetailedState.CONNECTED) {
-//            WifiManager wifiManager = context.getSystemService(WifiManager.class);
-//            NetworkCapabilities nc = cm.getNetworkCapabilities(wifiManager.getCurrentNetwork());
-//
-//            if (nc != null) {
-//                if (nc.hasCapability(nc.NET_CAPABILITY_CAPTIVE_PORTAL)) {
-//                    int id = context.getResources()
-//                            .getIdentifier("network_available_sign_in", "string", "android");
-//                    return context.getString(id);
-//                } else if (nc.hasCapability(
-//                        NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY)) {
-//                    return context.getString(R.string.wifi_limited_connection);
-//                } else if (!nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
-//                    final String mode = Settings.Global.getString(context.getContentResolver(),
-//                            Settings.Global.PRIVATE_DNS_MODE);
-//                    if (nc.isPrivateDnsBroken()) {
-//                        return context.getString(R.string.private_dns_broken);
-//                    } else {
-//                        return context.getString(R.string.wifi_connected_no_internet);
-//                    }
-//                }
-//            }
-//        }
-//        if (state == null) {
-//            Log.w(TAG, "state is null, returning empty summary");
-//            return "";
-//        }
-//        String[] formats = context.getResources().getStringArray((ssid == null)
-//                ? R.array.wifi_status : R.array.wifi_status_with_ssid);
-//        int index = state.ordinal();
-//
-//        if (index >= formats.length || formats[index].length() == 0) {
-//            return "";
-//        }
-//        return String.format(formats[index], ssid);
-//    }
-
     public static String convertToQuotedString(String string) {
         return "\"" + string + "\"";
     }
 
-    private static int getPskType(ScanResult result) {
-        boolean wpa = result.capabilities.contains("WPA-PSK");
-        boolean wpa2 = result.capabilities.contains("RSN-PSK");
-        boolean wpa3 = result.capabilities.contains("RSN-SAE");
-        if (wpa2 && wpa) {
-            return PSK_WPA_WPA2;
-        } else if (wpa2) {
-            return PSK_WPA2;
-        } else if (wpa) {
-            return PSK_WPA;
-        } else {
-            if (!wpa3) {
-                // Suppress warning for WPA3 only networks
-                Log.w(TAG, "Received abnormal flag string: " + result.capabilities);
-            }
-            return PSK_UNKNOWN;
-        }
-    }
-
-    private static int getEapType(ScanResult result) {
-        // WPA2-Enterprise and WPA3-Enterprise (non 192-bit) advertise RSN-EAP-CCMP
-        if (result.capabilities.contains("RSN-EAP")) {
-            return EAP_WPA2_WPA3;
-        }
-        // WPA-Enterprise advertises WPA-EAP-TKIP
-        if (result.capabilities.contains("WPA-EAP")) {
-            return EAP_WPA;
-        }
-        return EAP_UNKNOWN;
-    }
-
     private static int getSecurity(Context context, ScanResult result) {
         final boolean isWep = result.capabilities.contains("WEP");
         final boolean isSae = result.capabilities.contains("SAE");
@@ -1709,79 +267,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
         return SECURITY_NONE;
     }
 
-    static int getSecurity(WifiConfiguration config) {
-        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE)) {
-            return SECURITY_SAE;
-        }
-        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_PSK)) {
-            return SECURITY_PSK;
-        }
-        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SUITE_B_192)) {
-            return SECURITY_EAP_SUITE_B;
-        }
-        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP) ||
-                config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X)) {
-            return SECURITY_EAP;
-        }
-        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE)) {
-            return SECURITY_OWE;
-        }
-        return (config.wepTxKeyIndex >= 0
-                && config.wepTxKeyIndex < config.wepKeys.length
-                && config.wepKeys[config.wepTxKeyIndex] != null)
-                ? SECURITY_WEP : SECURITY_NONE;
-    }
-
-    public static String securityToString(int security, int pskType) {
-        if (security == SECURITY_WEP) {
-            return "WEP";
-        } else if (security == SECURITY_PSK) {
-            if (pskType == PSK_WPA) {
-                return "WPA";
-            } else if (pskType == PSK_WPA2) {
-                return "WPA2";
-            } else if (pskType == PSK_WPA_WPA2) {
-                return "WPA_WPA2";
-            }
-            return "PSK";
-        } else if (security == SECURITY_EAP) {
-            return "EAP";
-        } else if (security == SECURITY_SAE) {
-            return "SAE";
-        } else if (security == SECURITY_EAP_SUITE_B) {
-            return "SUITE_B";
-        } else if (security == SECURITY_OWE) {
-            return "OWE";
-        }
-        return "NONE";
-    }
-
-    static String removeDoubleQuotes(String string) {
-        if (TextUtils.isEmpty(string)) {
-            return "";
-        }
-        int length = string.length();
-        if ((length > 1) && (string.charAt(0) == '"')
-                && (string.charAt(length - 1) == '"')) {
-            return string.substring(1, length - 1);
-        }
-        return string;
-    }
-
-    private WifiManager getWifiManager() {
-        if (mWifiManager == null) {
-            mWifiManager = mContext.getSystemService(WifiManager.class);
-        }
-        return mWifiManager;
-    }
-
-    /**
-     * Return true if this is an open network AccessPoint.
-     */
-    public boolean isOpenNetwork() {
-        return security == SECURITY_NONE || security == SECURITY_OWE;
-    }
-
     /**
      * Callbacks relaying changes to the AccessPoint representation.
      *
@@ -1821,169 +306,4 @@ public class AccessPoint implements Comparable<AccessPoint> {
         @MainThread
         void onLevelChanged(AccessPoint accessPoint);
     }
-
-    private static boolean isVerboseLoggingEnabled() {
-        return WifiTracker.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE);
-    }
-
-    /**
-     * Callbacks relaying changes to the OSU provisioning status started in startOsuProvisioning().
-     *
-     * All methods are invoked on the Main Thread
-     */
-    @VisibleForTesting
-    class AccessPointProvisioningCallback extends ProvisioningCallback {
-        @Override
-        @MainThread
-        public void onProvisioningFailure(int status) {
-//            if (TextUtils.equals(mOsuStatus, mContext.getString(R.string
-//            .osu_completing_sign_up))) {
-//                mOsuFailure = mContext.getString(R.string.osu_sign_up_failed);
-//            } else {
-//                mOsuFailure = mContext.getString(R.string.osu_connect_failed);
-//            }
-            mOsuStatus = null;
-            mOsuProvisioningComplete = false;
-            ThreadUtils.postOnMainThread(() -> {
-                if (mAccessPointListener != null) {
-                    mAccessPointListener.onAccessPointChanged(
-                            AccessPoint.this);
-                }
-            });
-        }
-
-        @Override
-        @MainThread
-        public void onProvisioningStatus(int status) {
-            String newStatus = null;
-            switch (status) {
-                case OSU_STATUS_AP_CONNECTING:
-                case OSU_STATUS_AP_CONNECTED:
-                case OSU_STATUS_SERVER_CONNECTING:
-                case OSU_STATUS_SERVER_VALIDATED:
-                case OSU_STATUS_SERVER_CONNECTED:
-                case OSU_STATUS_INIT_SOAP_EXCHANGE:
-                case OSU_STATUS_WAITING_FOR_REDIRECT_RESPONSE:
-//                    newStatus = String.format(mContext.getString(R.string.osu_opening_provider),
-//                            mOsuProvider.getFriendlyName());
-                    break;
-                case OSU_STATUS_REDIRECT_RESPONSE_RECEIVED:
-                case OSU_STATUS_SECOND_SOAP_EXCHANGE:
-                case OSU_STATUS_THIRD_SOAP_EXCHANGE:
-                case OSU_STATUS_RETRIEVING_TRUST_ROOT_CERTS:
-//                    newStatus = mContext.getString(
-//                            R.string.osu_completing_sign_up);
-                    break;
-            }
-            boolean updated = !TextUtils.equals(mOsuStatus, newStatus);
-            mOsuStatus = newStatus;
-            mOsuFailure = null;
-            mOsuProvisioningComplete = false;
-            if (updated) {
-                ThreadUtils.postOnMainThread(() -> {
-                    if (mAccessPointListener != null) {
-                        mAccessPointListener.onAccessPointChanged(
-                                AccessPoint.this);
-                    }
-                });
-            }
-        }
-
-        @Override
-        @MainThread
-        public void onProvisioningComplete() {
-            mOsuProvisioningComplete = true;
-            mOsuFailure = null;
-            mOsuStatus = null;
-
-            ThreadUtils.postOnMainThread(() -> {
-                if (mAccessPointListener != null) {
-                    mAccessPointListener.onAccessPointChanged(
-                            AccessPoint.this);
-                }
-            });
-
-            // Connect to the freshly provisioned network.
-            WifiManager wifiManager = getWifiManager();
-
-            PasspointConfiguration passpointConfig = wifiManager
-                    .getMatchingPasspointConfigsForOsuProviders(Collections.singleton(mOsuProvider))
-                    .get(mOsuProvider);
-            if (passpointConfig == null) {
-                Log.e(TAG, "Missing PasspointConfiguration for newly provisioned network!");
-                if (mConnectListener != null) {
-                    mConnectListener.onFailure(0);
-                }
-                return;
-            }
-
-            String uniqueId = passpointConfig.getUniqueId();
-            for (Pair<WifiConfiguration, Map<Integer, List<ScanResult>>> pairing :
-                    wifiManager.getAllMatchingWifiConfigs(wifiManager.getScanResults())) {
-                WifiConfiguration config = pairing.first;
-                if (TextUtils.equals(config.getKey(), uniqueId)) {
-                    List<ScanResult> homeScans =
-                            pairing.second.get(WifiManager.PASSPOINT_HOME_NETWORK);
-                    List<ScanResult> roamingScans =
-                            pairing.second.get(WifiManager.PASSPOINT_ROAMING_NETWORK);
-
-                    AccessPoint connectionAp =
-                            new AccessPoint(mContext, config, homeScans, roamingScans);
-                    wifiManager.connect(connectionAp.getConfig(), mConnectListener);
-                    return;
-                }
-            }
-            if (mConnectListener != null) {
-                mConnectListener.onFailure(0);
-            }
-        }
-    }
-
-    public boolean isPskSaeTransitionMode() {
-        return mIsPskSaeTransitionMode;
-    }
-
-    public boolean isOweTransitionMode() {
-        return mIsOweTransitionMode;
-    }
-
-    private static boolean isPskSaeTransitionMode(ScanResult scanResult) {
-        return scanResult.capabilities.contains("PSK")
-                && scanResult.capabilities.contains("SAE");
-    }
-
-    private static boolean isOweTransitionMode(ScanResult scanResult) {
-        return scanResult.capabilities.contains("OWE_TRANSITION");
-    }
-
-    private boolean isSameSsidOrBssid(ScanResult scanResult) {
-        if (scanResult == null) {
-            return false;
-        }
-
-        if (TextUtils.equals(ssid, scanResult.SSID)) {
-            return true;
-        } else return scanResult.BSSID != null && TextUtils.equals(bssid, scanResult.BSSID);
-    }
-
-    private boolean isSameSsidOrBssid(WifiInfo wifiInfo) {
-        if (wifiInfo == null) {
-            return false;
-        }
-
-        if (TextUtils.equals(ssid, removeDoubleQuotes(wifiInfo.getSSID()))) {
-            return true;
-        } else return wifiInfo.getBSSID() != null && TextUtils.equals(bssid, wifiInfo.getBSSID());
-    }
-
-    private boolean isSameSsidOrBssid(AccessPoint accessPoint) {
-        if (accessPoint == null) {
-            return false;
-        }
-
-        if (TextUtils.equals(ssid, accessPoint.getSsid())) {
-            return true;
-        } else return accessPoint.getBssid() != null
-                && TextUtils.equals(bssid, accessPoint.getBssid());
-    }
 }
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/AccessPointPreferenceController.java b/SettingsAPI/java/com/android/tv/settings/library/network/AccessPointPreferenceController.java
index f30132acc..c2457c8c8 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/AccessPointPreferenceController.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/AccessPointPreferenceController.java
@@ -32,6 +32,7 @@ import com.android.tv.settings.library.UIUpdateCallback;
 import com.android.tv.settings.library.data.PreferenceCompatManager;
 import com.android.tv.settings.library.util.ResourcesUtil;
 import com.android.tv.settings.library.util.RestrictedPreferenceController;
+import com.android.wifitrackerlib.WifiEntry;
 
 /** Preference controller for access point preference in NetworkState. */
 public class AccessPointPreferenceController extends RestrictedPreferenceController {
@@ -95,7 +96,7 @@ public class AccessPointPreferenceController extends RestrictedPreferenceControl
         WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
         ConnectivityManager connectivityManager = mContext.getSystemService(
                 ConnectivityManager.class);
-        if (accessPoint.getDetailedState() != NetworkInfo.DetailedState.CONNECTED) {
+        if (accessPoint.getWifiEntry().getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {
             return false;
         }
         NetworkCapabilities nc = connectivityManager.getNetworkCapabilities(
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/ConnectivityListener.java b/SettingsAPI/java/com/android/tv/settings/library/network/ConnectivityListener.java
index d323726a9..2dbbffed4 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/ConnectivityListener.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/ConnectivityListener.java
@@ -110,7 +110,8 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         mEthernetManager = mContext.getSystemService(EthernetManager.class);
         mListener = listener;
         if (mWifiManager != null) {
-            mWifiTracker = new WifiTracker(context, this, true, true);
+            mWifiTracker = new WifiTracker(context, this, null, mWifiManager,
+                    mConnectivityManager);
         }
         mEthernetListener = (iface, state, role, configuration) -> {
             if (state == EthernetManager.STATE_LINK_UP) {
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/WifiDetailsState.java b/SettingsAPI/java/com/android/tv/settings/library/network/WifiDetailsState.java
index a9ac266c4..508f7421b 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/WifiDetailsState.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/WifiDetailsState.java
@@ -23,6 +23,7 @@ import android.content.Intent;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
@@ -36,6 +37,7 @@ import com.android.tv.settings.library.data.PreferenceCompatManager;
 import com.android.tv.settings.library.data.PreferenceControllerState;
 import com.android.tv.settings.library.settingslib.RestrictedLockUtils;
 import com.android.tv.settings.library.util.AbstractPreferenceController;
+import com.android.tv.settings.library.util.DataBinder;
 import com.android.tv.settings.library.util.ResourcesUtil;
 import com.android.tv.settings.library.util.RestrictedPreferenceController;
 
@@ -77,16 +79,14 @@ public class WifiDetailsState extends PreferenceControllerState implements
     }
 
     public static void prepareArgs(@NonNull Bundle args, AccessPoint accessPoint) {
-        final Bundle apBundle = new Bundle();
-        accessPoint.saveWifiState(apBundle);
-        args.putParcelable(ARG_ACCESS_POINT_STATE, apBundle);
+        args.putBinder(ARG_ACCESS_POINT_STATE, DataBinder.with(accessPoint));
     }
 
     @Override
     public void onCreate(Bundle extras) {
         mNetworkModule = NetworkModule.getInstance(mContext);
         mPreferenceCompatManager = new PreferenceCompatManager();
-        mAccessPoint = new AccessPoint(mContext, extras.getBundle(ARG_ACCESS_POINT_STATE));
+        mAccessPoint = DataBinder.getData(extras.getBinder(ARG_ACCESS_POINT_STATE));
         if (mUIUpdateCallback != null) {
             mUIUpdateCallback.notifyUpdateScreenTitle(getStateIdentifier(),
                     String.valueOf(mAccessPoint.getSsid()));
@@ -237,7 +237,7 @@ public class WifiDetailsState extends PreferenceControllerState implements
         // For saved Passpoint network, framework doesn't have the field to keep the MAC choice
         // persistently, so Passpoint network will always use the default value so far, which is
         // randomized MAC address, so don't need to modify title.
-        if (mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig()) {
+        if (mAccessPoint.isPasspoint()) {
             return;
         }
         mMacAddressPref.setTitle(
@@ -254,8 +254,7 @@ public class WifiDetailsState extends PreferenceControllerState implements
                 (connectivityListener.getWifiMacRandomizationSetting(mAccessPoint)
                         == WifiConfiguration.RANDOMIZATION_PERSISTENT);
         mRandomMacPref.setValue(isMacRandomized ? VALUE_MAC_RANDOM : VALUE_MAC_DEVICE);
-        if (mAccessPoint.isEphemeral() || mAccessPoint.isPasspoint()
-                || mAccessPoint.isPasspointConfig()) {
+        if (!mAccessPoint.getWifiEntry().canSetPrivacy()) {
             mRandomMacPref.setSelectable(PreferenceCompat.STATUS_OFF);
             mRandomMacPref.setSummary(ResourcesUtil.getString(
                     mContext, "mac_address_ephemeral_summary"));
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/WifiSavedConfigUtils.java b/SettingsAPI/java/com/android/tv/settings/library/network/WifiSavedConfigUtils.java
deleted file mode 100644
index 1dbd648d9..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/network/WifiSavedConfigUtils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.network;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.net.wifi.hotspot2.PasspointConfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Provide utility functions for retrieving saved Wi-Fi configurations.
- */
-public class WifiSavedConfigUtils {
-    /**
-     * Returns all the saved configurations on the device, including both Wi-Fi networks and
-     * Passpoint profiles, represented by {@link .AccessPoint}.
-     *
-     * @param context     The application context
-     * @param wifiManager An instance of {@link WifiManager}
-     * @return List of {@link .AccessPoint}
-     */
-    public static List<AccessPoint> getAllConfigs(Context context, WifiManager wifiManager) {
-        List<AccessPoint> savedConfigs = new ArrayList<>();
-        List<WifiConfiguration> savedNetworks = wifiManager.getConfiguredNetworks();
-        for (WifiConfiguration network : savedNetworks) {
-            // Configuration for Passpoint network is configured temporary by WifiService for
-            // connection attempt only.  The underlying configuration is saved as Passpoint
-            // configuration, which will be retrieved with WifiManager#getPasspointConfiguration
-            // call below.
-            if (network.isPasspoint()) {
-                continue;
-            }
-            // Ephemeral networks are not saved to the persistent storage, ignore them.
-            if (network.isEphemeral()) {
-                continue;
-            }
-            savedConfigs.add(new AccessPoint(context, network));
-        }
-        try {
-            List<PasspointConfiguration> savedPasspointConfigs =
-                    wifiManager.getPasspointConfigurations();
-            if (savedPasspointConfigs != null) {
-                for (PasspointConfiguration config : savedPasspointConfigs) {
-                    savedConfigs.add(new AccessPoint(context, config));
-                }
-            }
-        } catch (UnsupportedOperationException e) {
-            // Passpoint not supported.
-        }
-        return savedConfigs;
-    }
-
-    /**
-     * Returns the count of the saved configurations on the device, including both Wi-Fi networks
-     * and Passpoint profiles.
-     *
-     * @param context     The application context
-     * @param wifiManager An instance of {@link WifiManager}
-     * @return count of saved Wi-Fi networks
-     */
-    public static int getAllConfigsCount(Context context, WifiManager wifiManager) {
-        return getAllConfigs(context, wifiManager).size();
-    }
-}
-
-
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/WifiTracker.java b/SettingsAPI/java/com/android/tv/settings/library/network/WifiTracker.java
index ffb191991..d9c16df5d 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/WifiTracker.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/WifiTracker.java
@@ -16,82 +16,51 @@
 
 package com.android.tv.settings.library.network;
 
-import android.annotation.AnyThread;
 import android.annotation.MainThread;
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkKey;
-import android.net.NetworkRequest;
-import android.net.NetworkScoreManager;
-import android.net.ScoredNetwork;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiNetworkScoreCache;
-import android.net.wifi.WifiNetworkScoreCache.CacheListener;
-import android.net.wifi.hotspot2.OsuProvider;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.os.Message;
 import android.os.Process;
+import android.os.SimpleClock;
 import android.os.SystemClock;
-import android.provider.Settings;
-import android.text.format.DateUtils;
-import android.util.ArrayMap;
-import android.util.ArraySet;
-import android.util.Log;
-import android.util.Pair;
 
-import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 
 import com.android.tv.settings.library.util.ThreadUtils;
-import com.android.tv.settings.library.util.lifecycle.Lifecycle;
-import com.android.tv.settings.library.util.lifecycle.LifecycleObserver;
-import com.android.tv.settings.library.util.lifecycle.events.OnDestroy;
-import com.android.tv.settings.library.util.lifecycle.events.OnStart;
-import com.android.tv.settings.library.util.lifecycle.events.OnStop;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
-import java.io.PrintWriter;
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
 /**
  * Tracks saved or available wifi networks and their state.
  *
- * @deprecated WifiTracker/AccessPoint is no longer supported, and will be removed in a future
+ * WifiTracker/AccessPoint is no longer supported, and will be removed in a future
  * release. Clients that need a dynamic list of available wifi networks should migrate to one of the
  * newer tracker classes,
  * {@link com.android.wifitrackerlib.WifiPickerTracker},
  * {@link com.android.wifitrackerlib.SavedNetworkTracker},
  * {@link com.android.wifitrackerlib.NetworkDetailsTracker},
  * in conjunction with {@link com.android.wifitrackerlib.WifiEntry} to represent each wifi network.
+ * TODO: Migrate this local copy to use WifiPickerTracker internally.
  */
-@Deprecated
-public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestroy {
+public class WifiTracker implements DefaultLifecycleObserver {
     /**
      * Default maximum age in millis of cached scored networks in
      * {@link .AccessPoint#mScoredNetworkCache} to be used for speed label generation.
      */
-    private static final long DEFAULT_MAX_CACHED_SCORE_AGE_MILLIS = 20 * DateUtils.MINUTE_IN_MILLIS;
 
     /** Maximum age of scan results to hold onto while actively scanning. **/
     @VisibleForTesting
@@ -99,969 +68,118 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
 
     private static final String TAG = "WifiTracker";
 
-    private static final boolean DBG() {
-        return Log.isLoggable(TAG, Log.DEBUG);
-    }
-
-    private static boolean isVerboseLoggingEnabled() {
-        return WifiTracker.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE);
-    }
-
-    /**
-     * Verbose logging flag set thru developer debugging options and used so as to assist with
-     * in-the-field WiFi connectivity debugging.
-     *
-     * <p>{@link #isVerboseLoggingEnabled()} should be read rather than referencing this value
-     * directly, to ensure adb TAG level verbose settings are respected.
-     */
-    public static boolean sVerboseLogging;
+    private static final Clock ELAPSED_REALTIME_CLOCK = new SimpleClock(ZoneOffset.UTC) {
+        @Override
+        public long millis() {
+            return SystemClock.elapsedRealtime();
+        }
+    };
 
     // TODO: Allow control of this?
     // Combo scans can take 5-6s to complete - set to 10s.
     private static final int WIFI_RESCAN_INTERVAL_MS = 10 * 1000;
 
-    private final Context mContext;
-    private final WifiManager mWifiManager;
-    private final IntentFilter mFilter;
-    private final ConnectivityManager mConnectivityManager;
-    private final NetworkRequest mNetworkRequest;
-    private final AtomicBoolean mConnected = new AtomicBoolean(false);
-    private final WifiTracker.WifiListenerExecutor mListener;
-    @VisibleForTesting
-    Handler mWorkHandler;
-    private HandlerThread mWorkThread;
-
-    private WifiTracker.WifiTrackerNetworkCallback mNetworkCallback;
-
-    /**
-     * Synchronization lock for managing concurrency between main and worker threads.
-     *
-     * <p>This lock should be held for all modifications to {@link #mInternalAccessPoints} and
-     * {@link #mScanner}.
-     */
-    private final Object mLock = new Object();
-
-    /** The list of AccessPoints, aggregated visible ScanResults with metadata. */
-    @GuardedBy("mLock")
-    private final List<AccessPoint> mInternalAccessPoints = new ArrayList<>();
-
-    @GuardedBy("mLock")
-    private final Set<NetworkKey> mRequestedScores = new ArraySet<>();
-
-    /**
-     * Tracks whether fresh scan results have been received since scanning start.
-     *
-     * <p>If this variable is false, we will not invoke callbacks so that we do not
-     * update the UI with stale data / clear out existing UI elements prematurely.
-     */
-    private boolean mStaleScanResults = true;
-
-    /**
-     * Tracks whether the latest SCAN_RESULTS_AVAILABLE_ACTION contained new scans. If not, then
-     * we treat the last scan as an aborted scan and increase the eviction timeout window to avoid
-     * completely flushing the AP list before the next successful scan completes.
-     */
-    private boolean mLastScanSucceeded = true;
-
-    // Does not need to be locked as it only updated on the worker thread, with the exception of
-    // during onStart, which occurs before the receiver is registered on the work handler.
-    private final HashMap<String, ScanResult> mScanResultCache = new HashMap<>();
-    private boolean mRegistered;
+    private final WifiTracker.WifiListener mListener;
 
-    private NetworkInfo mLastNetworkInfo;
-    private WifiInfo mLastInfo;
+    private final WifiPickerTracker mWifiPickerTracker;
 
-    private final NetworkScoreManager mNetworkScoreManager;
-    private WifiNetworkScoreCache mScoreCache;
-    private boolean mNetworkScoringUiEnabled;
-    private long mMaxSpeedLabelScoreCacheAge;
-
-    private static final String WIFI_SECURITY_PSK = "PSK";
-    private static final String WIFI_SECURITY_EAP = "EAP";
-    private static final String WIFI_SECURITY_SAE = "SAE";
-    private static final String WIFI_SECURITY_OWE = "OWE";
-    private static final String WIFI_SECURITY_SUITE_B_192 = "SUITE_B_192";
-
-    @GuardedBy("mLock")
     @VisibleForTesting
-    WifiTracker.Scanner mScanner;
-
-    private static IntentFilter newIntentFilter() {
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        filter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-        filter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
-        filter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
-        filter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
-        filter.addAction(WifiManager.ACTION_LINK_CONFIGURATION_CHANGED);
-        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        filter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-
-        return filter;
-    }
+    Handler mWorkHandler;
+    private final HandlerThread mWorkThread;
 
-    /**
-     * Use the lifecycle constructor below whenever possible
-     */
-    @Deprecated
-    public WifiTracker(Context context, WifiTracker.WifiListener wifiListener,
-            boolean includeSaved, boolean includeScans) {
-        this(context, wifiListener,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                newIntentFilter());
-    }
+    private final LifecycleOwner mFallbackLifecycleOwner = new LifecycleOwner() {
+        @NonNull
+        @Override
+        public Lifecycle getLifecycle() {
+            return mFallbackLifecycle;
+        }
+    };
 
-    // calling apps once IC window is complete
-    public WifiTracker(Context context, WifiTracker.WifiListener wifiListener,
-            @NonNull Lifecycle lifecycle, boolean includeSaved, boolean includeScans) {
-        this(context, wifiListener,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                newIntentFilter());
+    private final WifiPickerTracker.WifiPickerTrackerCallback mPickerTrackerCallback =
+            new WifiPickerTracker.WifiPickerTrackerCallback() {
+        @Override
+        public void onWifiEntriesChanged() {
+            if (mListener != null) {
+                mListener.onAccessPointsChanged();
+            }
+        }
 
-        lifecycle.addObserver(this);
-    }
+        @Override
+        public void onNumSavedNetworksChanged() {}
 
-    @VisibleForTesting
-    WifiTracker(Context context, WifiTracker.WifiListener wifiListener,
-            WifiManager wifiManager, ConnectivityManager connectivityManager,
-            NetworkScoreManager networkScoreManager,
-            IntentFilter filter) {
-        mContext = context;
-        mWifiManager = wifiManager;
-        mListener = new WifiTracker.WifiListenerExecutor(wifiListener);
-        mConnectivityManager = connectivityManager;
+        @Override
+        public void onNumSavedSubscriptionsChanged() {}
 
-        // check if verbose logging developer option has been turned on or off
-        sVerboseLogging = mWifiManager != null && mWifiManager.isVerboseLoggingEnabled();
+        @Override
+        public void onWifiStateChanged() {
+            mListener.onWifiStateChanged(mWifiPickerTracker.getWifiState());
+        }
+    };
 
-        mFilter = filter;
+    private final LifecycleRegistry mFallbackLifecycle = new LifecycleRegistry(
+            mFallbackLifecycleOwner);
 
-        mNetworkRequest = new NetworkRequest.Builder()
-                .clearCapabilities()
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
-                .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-                .build();
+    private final LifecycleObserver lifecycleObserver = new DefaultLifecycleObserver() {
+        @Override
+        public void onDestroy(@NonNull LifecycleOwner owner) {
+           mWorkThread.quitSafely();
+        }
+    };
 
-        mNetworkScoreManager = networkScoreManager;
+    public WifiTracker(Context context, WifiTracker.WifiListener wifiListener,
+            Lifecycle lifecycle,
+            WifiManager wifiManager, ConnectivityManager connectivityManager) {
+        mListener = wifiListener;
 
-        final HandlerThread workThread = new HandlerThread(TAG
+        mWorkThread = new HandlerThread(TAG
                 + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
                 Process.THREAD_PRIORITY_BACKGROUND);
-        workThread.start();
-        setWorkThread(workThread);
-    }
-
-    /**
-     * Validity warning: this wipes out mScoreCache, so use with extreme caution
-     *
-     * @param workThread substitute Handler thread, for testing purposes only
-     */
-    @VisibleForTesting
-    // during construction
-    void setWorkThread(HandlerThread workThread) {
-        mWorkThread = workThread;
-        mWorkHandler = new Handler(workThread.getLooper());
-        mScoreCache = new WifiNetworkScoreCache(mContext, new CacheListener(mWorkHandler) {
-            @Override
-            public void networkCacheUpdated(List<ScoredNetwork> networks) {
-                if (!mRegistered) return;
-
-                if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                    Log.v(TAG, "Score cache was updated with networks: " + networks);
-                }
-                updateNetworkScores();
-            }
-        });
-    }
-
-    @Override
-    public void onDestroy() {
-        mWorkThread.quit();
-    }
+        mWorkThread.start();
+        mWorkHandler = mWorkThread.getThreadHandler();
 
-    /**
-     * Temporarily stop scanning for wifi networks.
-     *
-     * <p>Sets {@link #mStaleScanResults} to true.
-     */
-    private void pauseScanning() {
-        synchronized (mLock) {
-            if (mScanner != null) {
-                mScanner.pause();
-                mScanner = null;
-            }
+        if (lifecycle == null) {
+            lifecycle = mFallbackLifecycle;
         }
-        mStaleScanResults = true;
-    }
 
-    /**
-     * Resume scanning for wifi networks after it has been paused.
-     *
-     * <p>The score cache should be registered before this method is invoked.
-     */
-    public void resumeScanning() {
-        synchronized (mLock) {
-            if (mScanner == null) {
-                mScanner = new WifiTracker.Scanner();
-            }
-
-            if (isWifiEnabled()) {
-                mScanner.resume();
-            }
-        }
+        mWifiPickerTracker = new WifiPickerTracker(
+                lifecycle,
+                context, wifiManager, connectivityManager, ThreadUtils.getUiThreadHandler(),
+                mWorkHandler, ELAPSED_REALTIME_CLOCK, MAX_SCAN_RESULT_AGE_MILLIS,
+                WIFI_RESCAN_INTERVAL_MS, mPickerTrackerCallback);
+        lifecycle.addObserver(lifecycleObserver);
     }
 
-    /**
-     * Start tracking wifi networks and scores.
-     *
-     * <p>Registers listeners and starts scanning for wifi networks. If this is not called
-     * then forceUpdate() must be called to populate getAccessPoints().
-     */
-    @Override
     @MainThread
-    public void onStart() {
-        // fetch current ScanResults instead of waiting for broadcast of fresh results
-        forceUpdate();
-
-        registerScoreCache();
-
-        mNetworkScoringUiEnabled =
-                Settings.Global.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Global.NETWORK_SCORING_UI_ENABLED, 0) == 1;
-
-        mMaxSpeedLabelScoreCacheAge =
-                Settings.Global.getLong(
-                        mContext.getContentResolver(),
-                        Settings.Global.SPEED_LABEL_CACHE_EVICTION_AGE_MILLIS,
-                        DEFAULT_MAX_CACHED_SCORE_AGE_MILLIS);
-
-        resumeScanning();
-        if (!mRegistered) {
-            mContext.registerReceiver(mReceiver, mFilter, null /* permission */, mWorkHandler,
-                    Context.RECEIVER_EXPORTED_UNAUDITED);
-            // NetworkCallback objects cannot be reused. http://b/20701525 .
-            mNetworkCallback = new WifiTracker.WifiTrackerNetworkCallback();
-            mConnectivityManager.registerNetworkCallback(
-                    mNetworkRequest, mNetworkCallback, mWorkHandler);
-            mRegistered = true;
-        }
+    public void onDestroy() {
+        mFallbackLifecycle.setCurrentState(Lifecycle.State.DESTROYED);
     }
 
-
-    /**
-     * Synchronously update the list of access points with the latest information.
-     *
-     * <p>Intended to only be invoked within {@link #onStart()}.
-     */
     @MainThread
-    @VisibleForTesting
-    void forceUpdate() {
-        mLastInfo = mWifiManager.getConnectionInfo();
-        mLastNetworkInfo = mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork());
-
-        fetchScansAndConfigsAndUpdateAccessPoints();
-    }
-
-    private void registerScoreCache() {
-        mNetworkScoreManager.registerNetworkScoreCache(
-                NetworkKey.TYPE_WIFI,
-                mScoreCache,
-                NetworkScoreManager.SCORE_FILTER_SCAN_RESULTS);
-    }
-
-    private void requestScoresForNetworkKeys(Collection<NetworkKey> keys) {
-        if (keys.isEmpty()) return;
-
-        if (DBG()) {
-            Log.d(TAG, "Requesting scores for Network Keys: " + keys);
-        }
-        mNetworkScoreManager.requestScores(keys.toArray(new NetworkKey[keys.size()]));
-        synchronized (mLock) {
-            mRequestedScores.addAll(keys);
-        }
+    public void onStart() {
+        mFallbackLifecycle.setCurrentState(Lifecycle.State.STARTED);
     }
 
-    /**
-     * Stop tracking wifi networks and scores.
-     *
-     * <p>This should always be called when done with a WifiTracker (if onStart was called) to
-     * ensure proper cleanup and prevent any further callbacks from occurring.
-     *
-     * <p>Calling this method will set the {@link #mStaleScanResults} bit, which prevents
-     * {@link WifiTracker.WifiListener#onAccessPointsChanged()} callbacks from being invoked (until
-     * the bit
-     * is unset on the next SCAN_RESULTS_AVAILABLE_ACTION).
-     */
-    @Override
     @MainThread
     public void onStop() {
-        if (mRegistered) {
-            mContext.unregisterReceiver(mReceiver);
-            mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-            mRegistered = false;
-        }
-        unregisterScoreCache();
-        pauseScanning(); // and set mStaleScanResults
-
-        mWorkHandler.removeCallbacksAndMessages(null /* remove all */);
-    }
-
-    private void unregisterScoreCache() {
-        mNetworkScoreManager.unregisterNetworkScoreCache(NetworkKey.TYPE_WIFI, mScoreCache);
-
-        // We do not want to clear the existing scores in the cache, as this method is called during
-        // stop tracking on activity pause. Hence, on resumption we want the ability to show the
-        // last known, potentially stale, scores. However, by clearing requested scores, the scores
-        // will be requested again upon resumption of tracking, and if any changes have occurred
-        // the listeners (UI) will be updated accordingly.
-        synchronized (mLock) {
-            mRequestedScores.clear();
-        }
+        mFallbackLifecycle.setCurrentState(Lifecycle.State.CREATED);
     }
 
     /**
      * Gets the current list of access points.
-     *
-     * <p>This method is can be called on an abitrary thread by clients, but is normally called on
-     * the UI Thread by the rendering App.
      */
-    @AnyThread
     public List<AccessPoint> getAccessPoints() {
-        synchronized (mLock) {
-            return new ArrayList<>(mInternalAccessPoints);
-        }
-    }
-
-    public WifiManager getManager() {
-        return mWifiManager;
-    }
-
-    public boolean isWifiEnabled() {
-        return mWifiManager != null && mWifiManager.isWifiEnabled();
-    }
-
-    /**
-     * Returns the number of saved networks on the device, regardless of whether the WifiTracker
-     * is tracking saved networks.
-     * TODO(b/62292448): remove this function and update callsites to use WifiSavedConfigUtils
-     * directly.
-     */
-    public int getNumSavedNetworks() {
-        return WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager).size();
-    }
-
-    public boolean isConnected() {
-        return mConnected.get();
-    }
-
-    public void dump(PrintWriter pw) {
-        pw.println("  - wifi tracker ------");
-        for (AccessPoint accessPoint : getAccessPoints()) {
-            pw.println("  " + accessPoint);
-        }
-    }
-
-    private ArrayMap<String, List<ScanResult>> updateScanResultCache(
-            final List<ScanResult> newResults) {
-        // memory efficiency
-        for (ScanResult newResult : newResults) {
-            if (newResult.SSID == null || newResult.SSID.isEmpty()) {
-                continue;
-            }
-            mScanResultCache.put(newResult.BSSID, newResult);
-        }
-
-        // Evict old results in all conditions
-        evictOldScans();
-
-        ArrayMap<String, List<ScanResult>> scanResultsByApKey = new ArrayMap<>();
-        for (ScanResult result : mScanResultCache.values()) {
-            // Ignore hidden and ad-hoc networks.
-            if (result.SSID == null || result.SSID.length() == 0 ||
-                    result.capabilities.contains("[IBSS]")) {
-                continue;
-            }
-
-            String apKey = AccessPoint.getKey(mContext, result);
-            List<ScanResult> resultList;
-            if (scanResultsByApKey.containsKey(apKey)) {
-                resultList = scanResultsByApKey.get(apKey);
-            } else {
-                resultList = new ArrayList<>();
-                scanResultsByApKey.put(apKey, resultList);
-            }
-
-            resultList.add(result);
-        }
-
-        return scanResultsByApKey;
-    }
-
-    /**
-     * Remove old scan results from the cache. If {@link #mLastScanSucceeded} is false, then
-     * increase the timeout window to avoid completely flushing the AP list before the next
-     * successful scan completes.
-     *
-     * <p>Should only ever be invoked from {@link #updateScanResultCache(List)} when
-     * {@link #mStaleScanResults} is false.
-     */
-    private void evictOldScans() {
-        long evictionTimeoutMillis = mLastScanSucceeded ? MAX_SCAN_RESULT_AGE_MILLIS
-                : MAX_SCAN_RESULT_AGE_MILLIS * 2;
-
-        long nowMs = SystemClock.elapsedRealtime();
-        for (Iterator<ScanResult> iter = mScanResultCache.values().iterator(); iter.hasNext(); ) {
-            ScanResult result = iter.next();
-            // result timestamp is in microseconds
-            if (nowMs - result.timestamp / 1000 > evictionTimeoutMillis) {
-                iter.remove();
-            }
-        }
-    }
-
-    private WifiConfiguration getWifiConfigurationForNetworkId(
-            int networkId, final List<WifiConfiguration> configs) {
-        if (configs != null) {
-            for (WifiConfiguration config : configs) {
-                if (mLastInfo != null && networkId == config.networkId) {
-                    return config;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Retrieves latest scan results and wifi configs, then calls
-     * {@link #updateAccessPoints(List, List)}.
-     */
-    private void fetchScansAndConfigsAndUpdateAccessPoints() {
-        List<ScanResult> newScanResults = mWifiManager.getScanResults();
-
-        // Filter all unsupported networks from the scan result list
-        final List<ScanResult> filteredScanResults =
-                filterScanResultsByCapabilities(newScanResults);
-
-        if (isVerboseLoggingEnabled()) {
-            Log.i(TAG, "Fetched scan results: " + filteredScanResults);
-        }
-
-        List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
-        updateAccessPoints(filteredScanResults, configs);
-    }
-
-    /** Update the internal list of access points. */
-    private void updateAccessPoints(final List<ScanResult> newScanResults,
-            List<WifiConfiguration> configs) {
-
-        WifiConfiguration connectionConfig = null;
-        if (mLastInfo != null) {
-            connectionConfig = getWifiConfigurationForNetworkId(mLastInfo.getNetworkId(), configs);
-        }
-
-        // Rather than dropping and reacquiring the lock multiple times in this method, we lock
-        // once for efficiency of lock acquisition time and readability
-        synchronized (mLock) {
-            ArrayMap<String, List<ScanResult>> scanResultsByApKey =
-                    updateScanResultCache(newScanResults);
-
-            // Swap the current access points into a cached list for maintaining AP listeners
-            List<AccessPoint> cachedAccessPoints;
-            cachedAccessPoints = new ArrayList<>(mInternalAccessPoints);
-
-            ArrayList<AccessPoint> accessPoints = new ArrayList<>();
-
-            final List<NetworkKey> scoresToRequest = new ArrayList<>();
-
-            for (Map.Entry<String, List<ScanResult>> entry : scanResultsByApKey.entrySet()) {
-                for (ScanResult result : entry.getValue()) {
-                    NetworkKey key = NetworkKey.createFromScanResult(result);
-                    if (key != null && !mRequestedScores.contains(key)) {
-                        scoresToRequest.add(key);
-                    }
-                }
-
-                AccessPoint accessPoint =
-                        getCachedOrCreate(entry.getValue(), cachedAccessPoints);
-
-                // Update the matching config if there is one, to populate saved network info
-                final List<WifiConfiguration> matchedConfigs = configs.stream()
-                        .filter(config -> accessPoint.matches(config))
-                        .collect(Collectors.toList());
-
-                final int matchedConfigCount = matchedConfigs.size();
-                if (matchedConfigCount == 0) {
-                    accessPoint.update(null);
-                } else if (matchedConfigCount == 1) {
-                    accessPoint.update(matchedConfigs.get(0));
-                } else {
-                    // We may have 2 matched configured WifiCongiguration if the AccessPoint is
-                    // of PSK/SAE transition mode or open/OWE transition mode.
-                    Optional<WifiConfiguration> preferredConfig = matchedConfigs.stream()
-                            .filter(config -> isSaeOrOwe(config)).findFirst();
-                    if (preferredConfig.isPresent()) {
-                        accessPoint.update(preferredConfig.get());
-                    } else {
-                        accessPoint.update(matchedConfigs.get(0));
-                    }
-                }
-
-                accessPoints.add(accessPoint);
-            }
-
-            List<ScanResult> cachedScanResults = new ArrayList<>(mScanResultCache.values());
-
-            // Add a unique Passpoint AccessPoint for each Passpoint profile's unique identifier.
-            accessPoints.addAll(updatePasspointAccessPoints(
-                    mWifiManager.getAllMatchingWifiConfigs(cachedScanResults), cachedAccessPoints));
-
-            // Add OSU Provider AccessPoints
-            accessPoints.addAll(updateOsuAccessPoints(
-                    mWifiManager.getMatchingOsuProviders(cachedScanResults), cachedAccessPoints));
-
-            if (mLastInfo != null && mLastNetworkInfo != null) {
-                for (AccessPoint ap : accessPoints) {
-                    ap.update(connectionConfig, mLastInfo, mLastNetworkInfo);
-                }
-            }
-
-            // If there were no scan results, create an AP for the currently connected network (if
-            // it exists).
-            if (accessPoints.isEmpty() && connectionConfig != null) {
-                AccessPoint
-                        activeAp = new AccessPoint(mContext, connectionConfig);
-                activeAp.update(connectionConfig, mLastInfo, mLastNetworkInfo);
-                accessPoints.add(activeAp);
-                scoresToRequest.add(NetworkKey.createFromWifiInfo(mLastInfo));
-            }
-
-            requestScoresForNetworkKeys(scoresToRequest);
-            for (AccessPoint ap : accessPoints) {
-                ap.update(mScoreCache, mNetworkScoringUiEnabled, mMaxSpeedLabelScoreCacheAge);
-            }
-
-            // Pre-sort accessPoints to speed preference insertion
-            Collections.sort(accessPoints);
-
-            // Log accesspoints that are being removed
-            if (DBG()) {
-                Log.d(TAG,
-                        "------ Dumping AccessPoints that were not seen on this scan ------");
-                for (AccessPoint prevAccessPoint : mInternalAccessPoints) {
-                    String prevTitle = prevAccessPoint.getTitle();
-                    boolean found = false;
-                    for (AccessPoint newAccessPoint : accessPoints) {
-                        if (newAccessPoint.getTitle() != null && newAccessPoint.getTitle()
-                                .equals(prevTitle)) {
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (!found) {
-                        Log.d(TAG, "Did not find " + prevTitle + " in this scan");
-                    }
-                }
-                Log.d(TAG,
-                        "---- Done dumping AccessPoints that were not seen on this scan ----");
-            }
-
-            mInternalAccessPoints.clear();
-            mInternalAccessPoints.addAll(accessPoints);
-        }
-
-        conditionallyNotifyListeners();
-    }
-
-    private static boolean isSaeOrOwe(WifiConfiguration config) {
-        final int security = AccessPoint.getSecurity(config);
-        return security == AccessPoint.SECURITY_SAE || security == AccessPoint.SECURITY_OWE;
-    }
-
-    @VisibleForTesting
-    List<AccessPoint> updatePasspointAccessPoints(
-            List<Pair<WifiConfiguration, Map<Integer, List<ScanResult>>>> passpointConfigsAndScans,
-            List<AccessPoint> accessPointCache) {
-        List<AccessPoint> accessPoints = new ArrayList<>();
-
-        Set<String> seenFQDNs = new ArraySet<>();
-        for (Pair<WifiConfiguration,
-                Map<Integer, List<ScanResult>>> pairing : passpointConfigsAndScans) {
-            WifiConfiguration config = pairing.first;
-            if (seenFQDNs.add(config.FQDN)) {
-                List<ScanResult> homeScans =
-                        pairing.second.get(WifiManager.PASSPOINT_HOME_NETWORK);
-                List<ScanResult> roamingScans =
-                        pairing.second.get(WifiManager.PASSPOINT_ROAMING_NETWORK);
-
-                AccessPoint accessPoint =
-                        getCachedOrCreatePasspoint(config, homeScans, roamingScans,
-                                accessPointCache);
-                accessPoints.add(accessPoint);
-            }
-        }
-        return accessPoints;
-    }
-
-    @VisibleForTesting
-    List<AccessPoint> updateOsuAccessPoints(
-            Map<OsuProvider, List<ScanResult>> providersAndScans,
-            List<AccessPoint> accessPointCache) {
-        List<AccessPoint> accessPoints = new ArrayList<>();
-
-        Set<OsuProvider> alreadyProvisioned = mWifiManager
-                .getMatchingPasspointConfigsForOsuProviders(
-                        providersAndScans.keySet()).keySet();
-        for (OsuProvider provider : providersAndScans.keySet()) {
-            if (!alreadyProvisioned.contains(provider)) {
-                AccessPoint accessPointOsu =
-                        getCachedOrCreateOsu(provider, providersAndScans.get(provider),
-                                accessPointCache);
-                accessPoints.add(accessPointOsu);
-            }
-        }
-        return accessPoints;
-    }
-
-    private AccessPoint getCachedOrCreate(
-            List<ScanResult> scanResults,
-            List<AccessPoint> cache) {
-        AccessPoint accessPoint = getCachedByKey(cache,
-                AccessPoint.getKey(mContext, scanResults.get(0)));
-        if (accessPoint == null) {
-            accessPoint = new AccessPoint(mContext, scanResults);
-        } else {
-            accessPoint.setScanResults(scanResults);
-        }
-        return accessPoint;
-    }
-
-    private AccessPoint getCachedOrCreatePasspoint(
-            WifiConfiguration config,
-            List<ScanResult> homeScans,
-            List<ScanResult> roamingScans,
-            List<AccessPoint> cache) {
-        AccessPoint
-                accessPoint = getCachedByKey(cache, AccessPoint.getKey(config));
-        if (accessPoint == null) {
-            accessPoint = new AccessPoint(mContext, config, homeScans, roamingScans);
-        } else {
-            accessPoint.update(config);
-            accessPoint.setScanResultsPasspoint(homeScans, roamingScans);
-        }
-        return accessPoint;
-    }
-
-    private AccessPoint getCachedOrCreateOsu(
-            OsuProvider provider,
-            List<ScanResult> scanResults,
-            List<AccessPoint> cache) {
-        AccessPoint
-                accessPoint = getCachedByKey(cache, AccessPoint.getKey(provider));
-        if (accessPoint == null) {
-            accessPoint = new AccessPoint(mContext, provider, scanResults);
-        } else {
-            accessPoint.setScanResults(scanResults);
-        }
-        return accessPoint;
-    }
-
-    private AccessPoint getCachedByKey(List<AccessPoint> cache, String key) {
-        ListIterator<AccessPoint> lit = cache.listIterator();
-        while (lit.hasNext()) {
-            AccessPoint currentAccessPoint = lit.next();
-            if (currentAccessPoint.getKey().equals(key)) {
-                lit.remove();
-                return currentAccessPoint;
-            }
-        }
-        return null;
-    }
-
-    private void updateNetworkInfo(NetworkInfo networkInfo) {
-        /* Sticky broadcasts can call this when wifi is disabled */
-        if (!isWifiEnabled()) {
-            clearAccessPointsAndConditionallyUpdate();
-            return;
-        }
-
-        if (networkInfo != null) {
-            mLastNetworkInfo = networkInfo;
-            if (DBG()) {
-                Log.d(TAG, "mLastNetworkInfo set: " + mLastNetworkInfo);
-            }
-
-            if (networkInfo.isConnected() != mConnected.getAndSet(networkInfo.isConnected())) {
-                mListener.onConnectedChanged();
-            }
-        }
-
-        WifiConfiguration connectionConfig = null;
-
-        mLastInfo = mWifiManager.getConnectionInfo();
-        if (DBG()) {
-            Log.d(TAG, "mLastInfo set as: " + mLastInfo);
-        }
-        if (mLastInfo != null) {
-            connectionConfig = getWifiConfigurationForNetworkId(mLastInfo.getNetworkId(),
-                    mWifiManager.getConfiguredNetworks());
-        }
-
-        boolean updated = false;
-        boolean reorder = false; // Only reorder if connected AP was changed
-
-        synchronized (mLock) {
-            for (int i = mInternalAccessPoints.size() - 1; i >= 0; --i) {
-                AccessPoint ap = mInternalAccessPoints.get(i);
-                boolean previouslyConnected = ap.isActive();
-                if (ap.update(connectionConfig, mLastInfo, mLastNetworkInfo)) {
-                    updated = true;
-                    if (previouslyConnected != ap.isActive()) reorder = true;
-                }
-                if (ap.update(mScoreCache, mNetworkScoringUiEnabled, mMaxSpeedLabelScoreCacheAge)) {
-                    reorder = true;
-                    updated = true;
-                }
-            }
-
-            if (reorder) {
-                Collections.sort(mInternalAccessPoints);
-            }
-            if (updated) {
-                conditionallyNotifyListeners();
-            }
-        }
-    }
-
-    /**
-     * Clears the access point list and conditionally invokes
-     * {@link WifiTracker.WifiListener#onAccessPointsChanged()} if required (i.e. the list was not
-     * already
-     * empty).
-     */
-    private void clearAccessPointsAndConditionallyUpdate() {
-        synchronized (mLock) {
-            if (!mInternalAccessPoints.isEmpty()) {
-                mInternalAccessPoints.clear();
-                conditionallyNotifyListeners();
-            }
-        }
-    }
-
-    /**
-     * Update all the internal access points rankingScores, badge and metering.
-     *
-     * <p>Will trigger a resort and notify listeners of changes if applicable.
-     *
-     * <p>Synchronized on {@link #mLock}.
-     */
-    private void updateNetworkScores() {
-        synchronized (mLock) {
-            boolean updated = false;
-            for (int i = 0; i < mInternalAccessPoints.size(); i++) {
-                if (mInternalAccessPoints.get(i).update(
-                        mScoreCache, mNetworkScoringUiEnabled, mMaxSpeedLabelScoreCacheAge)) {
-                    updated = true;
-                }
-            }
-            if (updated) {
-                Collections.sort(mInternalAccessPoints);
-                conditionallyNotifyListeners();
-            }
-        }
-    }
-
-    /**
-     * Receiver for handling broadcasts.
-     *
-     * This receiver is registered on the WorkHandler.
-     */
-    @VisibleForTesting
-    final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-
-            if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
-                updateWifiState(
-                        intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
-                                WifiManager.WIFI_STATE_UNKNOWN));
-            } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action)) {
-                mStaleScanResults = false;
-                mLastScanSucceeded =
-                        intent.getBooleanExtra(WifiManager.EXTRA_RESULTS_UPDATED, true);
-
-                fetchScansAndConfigsAndUpdateAccessPoints();
-            } else if (WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION.equals(action)
-                    || WifiManager.ACTION_LINK_CONFIGURATION_CHANGED.equals(action)) {
-                fetchScansAndConfigsAndUpdateAccessPoints();
-            } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
-                // onAccessPointsChanged updates being called from this intent.
-                NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-                updateNetworkInfo(info);
-                fetchScansAndConfigsAndUpdateAccessPoints();
-            } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
-                updateNetworkInfo(/* networkInfo= */ null);
-            }
-        }
-    };
-
-    /**
-     * Handles updates to WifiState.
-     *
-     * <p>If Wifi is not enabled in the enabled state, {@link #mStaleScanResults} will be set to
-     * true.
-     */
-    private void updateWifiState(int state) {
-        if (isVerboseLoggingEnabled()) {
-            Log.d(TAG, "updateWifiState: " + state);
-        }
-        if (state == WifiManager.WIFI_STATE_ENABLED) {
-            synchronized (mLock) {
-                if (mScanner != null) {
-                    // We only need to resume if mScanner isn't null because
-                    // that means we want to be scanning.
-                    mScanner.resume();
-                }
-            }
-        } else {
-            clearAccessPointsAndConditionallyUpdate();
-            mLastInfo = null;
-            mLastNetworkInfo = null;
-            synchronized (mLock) {
-                if (mScanner != null) {
-                    mScanner.pause();
-                }
-            }
-            mStaleScanResults = true;
-        }
-        mListener.onWifiStateChanged(state);
-    }
-
-    private final class WifiTrackerNetworkCallback extends ConnectivityManager.NetworkCallback {
-        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
-            if (network.equals(mWifiManager.getCurrentNetwork())) {
-                // more sense fetch the latest network info here:
-
-                // We don't send a NetworkInfo object along with this message, because even if we
-                // fetch one from ConnectivityManager, it might be older than the most recent
-                // NetworkInfo message we got via a WIFI_STATE_CHANGED broadcast.
-                updateNetworkInfo(/* networkInfo= */ null);
-            }
-        }
-    }
-
-    @VisibleForTesting
-    class Scanner extends Handler {
-        static final int MSG_SCAN = 0;
-
-        private int mRetry = 0;
-
-        void resume() {
-            if (isVerboseLoggingEnabled()) {
-                Log.d(TAG, "Scanner resume");
-            }
-            if (!hasMessages(MSG_SCAN)) {
-                sendEmptyMessage(MSG_SCAN);
-            }
-        }
-
-        void pause() {
-            if (isVerboseLoggingEnabled()) {
-                Log.d(TAG, "Scanner pause");
-            }
-            mRetry = 0;
-            removeMessages(MSG_SCAN);
-        }
-
-        @VisibleForTesting
-        boolean isScanning() {
-            return hasMessages(MSG_SCAN);
-        }
-
-        @Override
-        public void handleMessage(Message message) {
-            if (message.what != MSG_SCAN) return;
-            if (mWifiManager.startScan()) {
-                mRetry = 0;
-            } else if (++mRetry >= 3) {
-                mRetry = 0;
-                if (mContext != null) {
-//                    Toast.makeText(mContext, R.string.wifi_fail_to_scan, Toast.LENGTH_LONG)
-//                    .show();
-                }
-                return;
-            }
-            sendEmptyMessageDelayed(MSG_SCAN, WIFI_RESCAN_INTERVAL_MS);
-        }
-    }
-
-    /** A restricted multimap for use in constructAccessPoints */
-    private static class Multimap<K, V> {
-        private final HashMap<K, List<V>> store = new HashMap<K, List<V>>();
-
-        /** retrieve a non-null list of values with key K */
-        List<V> getAll(K key) {
-            List<V> values = store.get(key);
-            return values != null ? values : Collections.emptyList();
-        }
-
-        void put(K key, V val) {
-            List<V> curVals = store.get(key);
-            if (curVals == null) {
-                curVals = new ArrayList<V>(3);
-                store.put(key, curVals);
-            }
-            curVals.add(val);
+        List<AccessPoint> result = new ArrayList<>();
+        WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedEntry != null) {
+            result.add(new AccessPoint(connectedEntry));
         }
-    }
-
-    /**
-     * Wraps the given {@link WifiTracker.WifiListener} instance and executes its methods on the
-     * Main Thread.
-     *
-     * <p>Also logs all callbacks invocations when verbose logging is enabled.
-     */
-    @VisibleForTesting
-    class WifiListenerExecutor implements
-            WifiTracker.WifiListener {
 
-        private final WifiTracker.WifiListener mDelegatee;
-
-        public WifiListenerExecutor(WifiTracker.WifiListener listener) {
-            mDelegatee = listener;
-        }
-
-        @Override
-        public void onWifiStateChanged(int state) {
-            runAndLog(() -> mDelegatee.onWifiStateChanged(state),
-                    String.format("Invoking onWifiStateChanged callback with state %d", state));
-        }
-
-        @Override
-        public void onConnectedChanged() {
-            runAndLog(mDelegatee::onConnectedChanged, "Invoking onConnectedChanged callback");
-        }
-
-        @Override
-        public void onAccessPointsChanged() {
-            runAndLog(mDelegatee::onAccessPointsChanged, "Invoking onAccessPointsChanged callback");
+        List<WifiEntry> entries = mWifiPickerTracker.getWifiEntries();
+        for (WifiEntry entry : entries) {
+            result.add(new AccessPoint(entry));
         }
 
-        private void runAndLog(Runnable r, String verboseLog) {
-            ThreadUtils.postOnMainThread(() -> {
-                if (mRegistered) {
-                    if (isVerboseLoggingEnabled()) {
-                        Log.i(TAG, verboseLog);
-                    }
-                    r.run();
-                }
-            });
-        }
+        return result;
     }
 
     /**
@@ -1086,8 +204,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
         void onWifiStateChanged(int state);
 
         /**
-         * Called when the connection state of wifi has changed and
-         * {@link WifiTracker#isConnected()} should be called to get the updated state.
+         * Called when the connection state of wifi has changed.
          */
         void onConnectedChanged();
 
@@ -1097,63 +214,4 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
          */
         void onAccessPointsChanged();
     }
-
-    /**
-     * Invokes {@link WifiTracker.WifiListenerExecutor#onAccessPointsChanged()} iif {@link
-     * #mStaleScanResults}
-     * is false.
-     */
-    private void conditionallyNotifyListeners() {
-        if (mStaleScanResults) {
-            return;
-        }
-
-        mListener.onAccessPointsChanged();
-    }
-
-    /**
-     * Filters unsupported networks from scan results. New WPA3 networks and OWE networks
-     * may not be compatible with the device HW/SW.
-     *
-     * @param scanResults List of scan results
-     * @return List of filtered scan results based on local device capabilities
-     */
-    private List<ScanResult> filterScanResultsByCapabilities(List<ScanResult> scanResults) {
-        if (scanResults == null) {
-            return null;
-        }
-
-        // Get and cache advanced capabilities
-        final boolean isOweSupported = mWifiManager.isEnhancedOpenSupported();
-        final boolean isSaeSupported = mWifiManager.isWpa3SaeSupported();
-        final boolean isSuiteBSupported = mWifiManager.isWpa3SuiteBSupported();
-
-        List<ScanResult> filteredScanResultList = new ArrayList<>();
-
-        // Iterate through the list of scan results and filter out APs which are not
-        // compatible with our device.
-        for (ScanResult scanResult : scanResults) {
-            if (scanResult.capabilities.contains(WIFI_SECURITY_PSK)) {
-                // All devices (today) support RSN-PSK or WPA-PSK
-                // Add this here because some APs may support both PSK and SAE and the check
-                // below will filter it out.
-                filteredScanResultList.add(scanResult);
-                continue;
-            }
-
-            if ((scanResult.capabilities.contains(WIFI_SECURITY_SUITE_B_192) && !isSuiteBSupported)
-                    || (scanResult.capabilities.contains(WIFI_SECURITY_SAE) && !isSaeSupported)
-                    || (scanResult.capabilities.contains(WIFI_SECURITY_OWE) && !isOweSupported)) {
-                if (isVerboseLoggingEnabled()) {
-                    Log.v(TAG, "filterScanResultsByCapabilities: Filtering SSID "
-                            + scanResult.SSID + " with capabilities: " + scanResult.capabilities);
-                }
-            } else {
-                // Safe to add
-                filteredScanResultList.add(scanResult);
-            }
-        }
-
-        return filteredScanResultList;
-    }
 }
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/WifiTrackerFactory.java b/SettingsAPI/java/com/android/tv/settings/library/network/WifiTrackerFactory.java
new file mode 100644
index 000000000..382623d38
--- /dev/null
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/WifiTrackerFactory.java
@@ -0,0 +1,30 @@
+package com.android.tv.settings.library.network;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+
+public class WifiTrackerFactory {
+    private static WifiTracker sTestingWifiTracker;
+
+    @Keep // Keep proguard from stripping this method since it is only used in tests
+    public static void setTestingWifiTracker(WifiTracker tracker) {
+        sTestingWifiTracker = tracker;
+    }
+
+    public static WifiTracker create(
+            Context context, WifiTracker.WifiListener wifiListener, @NonNull Lifecycle lifecycle,
+            boolean includeSaved, boolean includeScans) {
+        if(sTestingWifiTracker != null) {
+            return sTestingWifiTracker;
+        }
+        return new WifiTracker(context, wifiListener, lifecycle,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class));
+    }
+
+}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/network/WifiUtils.java b/SettingsAPI/java/com/android/tv/settings/library/network/WifiUtils.java
index 9141e8342..5f385709a 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/network/WifiUtils.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/network/WifiUtils.java
@@ -218,18 +218,6 @@ public class WifiUtils {
 //        return stringBuilder.toString();
 //    }
 
-    @AccessPoint.Speed
-    private static int getSpecificApSpeed(ScanResult result,
-            Map<String, TimestampedScoredNetwork> scoredNetworkCache) {
-        TimestampedScoredNetwork timedScore = scoredNetworkCache.get(result.BSSID);
-        if (timedScore == null) {
-            return AccessPoint.Speed.NONE;
-        }
-        // For debugging purposes we may want to use mRssi rather than result.level as the average
-        // speed wil be determined by mRssi
-        return timedScore.getScore().calculateBadge(result.level);
-    }
-
 //    public static String getMeteredLabel(Context context, WifiConfiguration config) {
 //        // meteredOverride is whether the user manually set the metered setting or not.
 //        // meteredHint is whether the network itself is telling us that it is metered
diff --git a/SettingsAPI/java/com/android/tv/settings/library/privacy/PrivacyState.java b/SettingsAPI/java/com/android/tv/settings/library/privacy/PrivacyState.java
deleted file mode 100644
index bdb527412..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/privacy/PrivacyState.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.privacy;
-
-import static com.android.tv.settings.library.ManagerUtil.STATE_PRIVACY;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-
-import java.util.List;
-
-/**
- * Provide data for privacy settings screen in TV settings.
- */
-public class PrivacyState extends PreferenceControllerState {
-    private static final String KEY_MIC = "microphone";
-    private static final String KEY_CAMERA = "camera";
-
-    public PrivacyState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        PreferenceCompat micPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_MIC);
-        PreferenceCompat cameraPref = mPreferenceCompatManager.getOrCreatePrefCompat(KEY_CAMERA);
-        PrivacyToggle.MIC_TOGGLE.preparePreferenceWithSensorState(mContext,
-                micPref, SensorState.TOGGLE_EXTRA);
-        PrivacyToggle.CAMERA_TOGGLE.preparePreferenceWithSensorState(mContext,
-                cameraPref, SensorState.TOGGLE_EXTRA);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), micPref);
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), cameraPref);
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return STATE_PRIVACY;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/settingslib/DreamBackend.java b/SettingsAPI/java/com/android/tv/settings/library/settingslib/DreamBackend.java
deleted file mode 100644
index f382fbff1..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/settingslib/DreamBackend.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.settingslib;
-
-import android.annotation.IntDef;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.graphics.drawable.Drawable;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.provider.Settings;
-import android.service.dreams.DreamService;
-import android.service.dreams.IDreamManager;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Xml;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class DreamBackend {
-    private static final String TAG = "DreamBackend";
-    private static final boolean DEBUG = false;
-
-    public static class DreamInfo {
-        public CharSequence caption;
-        public Drawable icon;
-        public boolean isActive;
-        public ComponentName componentName;
-        public ComponentName settingsComponentName;
-
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder(DreamBackend.DreamInfo.class.getSimpleName());
-            sb.append('[').append(caption);
-            if (isActive) {
-                sb.append(",active");
-            }
-            sb.append(',').append(componentName);
-            if (settingsComponentName != null) {
-                sb.append("settings=").append(settingsComponentName);
-            }
-            return sb.append(']').toString();
-        }
-    }
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({WHILE_CHARGING, WHILE_DOCKED, EITHER, NEVER})
-    public @interface WhenToDream {
-    }
-
-    public static final int WHILE_CHARGING = 0;
-    public static final int WHILE_DOCKED = 1;
-    public static final int EITHER = 2;
-    public static final int NEVER = 3;
-
-    private final Context mContext;
-    private final IDreamManager mDreamManager;
-    private final DreamBackend.DreamInfoComparator mComparator;
-    private final boolean mDreamsEnabledByDefault;
-    private final boolean mDreamsActivatedOnSleepByDefault;
-    private final boolean mDreamsActivatedOnDockByDefault;
-
-    private static DreamBackend sInstance;
-
-    public static DreamBackend getInstance(Context context) {
-        if (sInstance == null) {
-            sInstance = new DreamBackend(context);
-        }
-        return sInstance;
-    }
-
-    public DreamBackend(Context context) {
-        mContext = context.getApplicationContext();
-        mDreamManager = IDreamManager.Stub.asInterface(
-                ServiceManager.getService(DreamService.DREAM_SERVICE));
-        mComparator = new DreamBackend.DreamInfoComparator(getDefaultDream());
-        mDreamsEnabledByDefault = mContext.getResources()
-                .getBoolean(mContext.getResources().getIdentifier("config_dreamsEnabledByDefault",
-                        "bool", "android"));
-        mDreamsActivatedOnSleepByDefault = mContext.getResources()
-                .getBoolean(mContext.getResources().getIdentifier(
-                "config_dreamsActivatedOnSleepByDefault", "bool", "android"));
-        mDreamsActivatedOnDockByDefault = mContext.getResources()
-                .getBoolean(mContext.getResources().getIdentifier(
-                "config_dreamsActivatedOnDockByDefault", "bool", "android"));
-    }
-
-    public List<DreamBackend.DreamInfo> getDreamInfos() {
-        logd("getDreamInfos()");
-        ComponentName activeDream = getActiveDream();
-        PackageManager pm = mContext.getPackageManager();
-        Intent dreamIntent = new Intent(DreamService.SERVICE_INTERFACE);
-        List<ResolveInfo> resolveInfos = pm.queryIntentServices(dreamIntent,
-                PackageManager.GET_META_DATA);
-        List<DreamBackend.DreamInfo> dreamInfos = new ArrayList<>(resolveInfos.size());
-        for (ResolveInfo resolveInfo : resolveInfos) {
-            if (resolveInfo.serviceInfo == null) {
-                continue;
-            }
-            DreamBackend.DreamInfo
-                    dreamInfo = new DreamBackend.DreamInfo();
-            dreamInfo.caption = resolveInfo.loadLabel(pm);
-            dreamInfo.icon = resolveInfo.loadIcon(pm);
-            dreamInfo.componentName = getDreamComponentName(resolveInfo);
-            dreamInfo.isActive = dreamInfo.componentName.equals(activeDream);
-            dreamInfo.settingsComponentName = getSettingsComponentName(pm, resolveInfo);
-            dreamInfos.add(dreamInfo);
-        }
-        Collections.sort(dreamInfos, mComparator);
-        return dreamInfos;
-    }
-
-    public ComponentName getDefaultDream() {
-        if (mDreamManager == null) {
-            return null;
-        }
-        try {
-            return mDreamManager.getDefaultDreamComponentForUser(mContext.getUserId());
-        } catch (RemoteException e) {
-            Log.w(TAG, "Failed to get default dream", e);
-            return null;
-        }
-    }
-
-    public CharSequence getActiveDreamName() {
-        ComponentName cn = getActiveDream();
-        if (cn != null) {
-            PackageManager pm = mContext.getPackageManager();
-            try {
-                ServiceInfo ri = pm.getServiceInfo(cn, 0);
-                if (ri != null) {
-                    return ri.loadLabel(pm);
-                }
-            } catch (PackageManager.NameNotFoundException exc) {
-                return null; // uninstalled?
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Gets an icon from active dream.
-     */
-    public Drawable getActiveIcon() {
-        final ComponentName cn = getActiveDream();
-        if (cn != null) {
-            final PackageManager pm = mContext.getPackageManager();
-            try {
-                final ServiceInfo ri = pm.getServiceInfo(cn, 0);
-                if (ri != null) {
-                    return ri.loadIcon(pm);
-                }
-            } catch (PackageManager.NameNotFoundException exc) {
-                return null;
-            }
-        }
-        return null;
-    }
-
-    public @DreamBackend.WhenToDream
-    int getWhenToDreamSetting() {
-        if (!isEnabled()) {
-            return NEVER;
-        }
-        return isActivatedOnDock() && isActivatedOnSleep() ? EITHER
-                : isActivatedOnDock() ? WHILE_DOCKED
-                        : isActivatedOnSleep() ? WHILE_CHARGING
-                                : NEVER;
-    }
-
-    public void setWhenToDream(@DreamBackend.WhenToDream int whenToDream) {
-        setEnabled(whenToDream != NEVER);
-
-        switch (whenToDream) {
-            case WHILE_CHARGING:
-                setActivatedOnDock(false);
-                setActivatedOnSleep(true);
-                break;
-
-            case WHILE_DOCKED:
-                setActivatedOnDock(true);
-                setActivatedOnSleep(false);
-                break;
-
-            case EITHER:
-                setActivatedOnDock(true);
-                setActivatedOnSleep(true);
-                break;
-
-            case NEVER:
-            default:
-                break;
-        }
-
-    }
-
-    public boolean isEnabled() {
-        return getBoolean(Settings.Secure.SCREENSAVER_ENABLED, mDreamsEnabledByDefault);
-    }
-
-    public void setEnabled(boolean value) {
-        logd("setEnabled(%s)", value);
-        setBoolean(Settings.Secure.SCREENSAVER_ENABLED, value);
-    }
-
-    public boolean isActivatedOnDock() {
-        return getBoolean(Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
-                mDreamsActivatedOnDockByDefault);
-    }
-
-    public void setActivatedOnDock(boolean value) {
-        logd("setActivatedOnDock(%s)", value);
-        setBoolean(Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, value);
-    }
-
-    public boolean isActivatedOnSleep() {
-        return getBoolean(Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP,
-                mDreamsActivatedOnSleepByDefault);
-    }
-
-    public void setActivatedOnSleep(boolean value) {
-        logd("setActivatedOnSleep(%s)", value);
-        setBoolean(Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, value);
-    }
-
-    private boolean getBoolean(String key, boolean def) {
-        return Settings.Secure.getInt(mContext.getContentResolver(), key, def ? 1 : 0) == 1;
-    }
-
-    private void setBoolean(String key, boolean value) {
-        Settings.Secure.putInt(mContext.getContentResolver(), key, value ? 1 : 0);
-    }
-
-    public void setActiveDream(ComponentName dream) {
-        logd("setActiveDream(%s)", dream);
-        if (mDreamManager == null) {
-            return;
-        }
-        try {
-            ComponentName[] dreams = {dream};
-            mDreamManager.setDreamComponents(dream == null ? null : dreams);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Failed to set active dream to " + dream, e);
-        }
-    }
-
-    public ComponentName getActiveDream() {
-        if (mDreamManager == null) {
-            return null;
-        }
-        try {
-            ComponentName[] dreams = mDreamManager.getDreamComponents();
-            return dreams != null && dreams.length > 0 ? dreams[0] : null;
-        } catch (RemoteException e) {
-            Log.w(TAG, "Failed to get active dream", e);
-            return null;
-        }
-    }
-
-    public void launchSettings(Context uiContext, DreamBackend.DreamInfo dreamInfo) {
-        logd("launchSettings(%s)", dreamInfo);
-        if (dreamInfo == null || dreamInfo.settingsComponentName == null) {
-            return;
-        }
-        uiContext.startActivity(new Intent().setComponent(dreamInfo.settingsComponentName));
-    }
-
-    public void preview(DreamBackend.DreamInfo dreamInfo) {
-        logd("preview(%s)", dreamInfo);
-        if (mDreamManager == null || dreamInfo == null || dreamInfo.componentName == null) {
-            return;
-        }
-        try {
-            mDreamManager.testDream(mContext.getUserId(), dreamInfo.componentName);
-        } catch (RemoteException e) {
-            Log.w(TAG, "Failed to preview " + dreamInfo, e);
-        }
-    }
-
-    public void startDreaming() {
-        logd("startDreaming()");
-        if (mDreamManager == null) {
-            return;
-        }
-        try {
-            mDreamManager.dream();
-        } catch (RemoteException e) {
-            Log.w(TAG, "Failed to dream", e);
-        }
-    }
-
-    private static ComponentName getDreamComponentName(ResolveInfo resolveInfo) {
-        if (resolveInfo == null || resolveInfo.serviceInfo == null) {
-            return null;
-        }
-        return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
-    }
-
-    private static ComponentName getSettingsComponentName(PackageManager pm,
-            ResolveInfo resolveInfo) {
-        if (resolveInfo == null
-                || resolveInfo.serviceInfo == null
-                || resolveInfo.serviceInfo.metaData == null) {
-            return null;
-        }
-        String cn = null;
-        XmlResourceParser parser = null;
-        Exception caughtException = null;
-        try {
-            parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, DreamService.DREAM_META_DATA);
-            if (parser == null) {
-                Log.w(TAG, "No " + DreamService.DREAM_META_DATA + " meta-data");
-                return null;
-            }
-            Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
-            AttributeSet attrs = Xml.asAttributeSet(parser);
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-            }
-            String nodeName = parser.getName();
-            if (!"dream".equals(nodeName)) {
-                Log.w(TAG, "Meta-data does not start with dream tag");
-                return null;
-            }
-            TypedArray sa = res.obtainAttributes(attrs, com.android.internal.R.styleable.Dream);
-            cn = sa.getString(
-                    res.getIdentifier("Dream_settingsActivity", "styleable", "android"));
-            sa.recycle();
-        } catch (PackageManager.NameNotFoundException | IOException | XmlPullParserException e) {
-            caughtException = e;
-        } finally {
-            if (parser != null) parser.close();
-        }
-        if (caughtException != null) {
-            Log.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException);
-            return null;
-        }
-        if (cn != null && cn.indexOf('/') < 0) {
-            cn = resolveInfo.serviceInfo.packageName + "/" + cn;
-        }
-        return cn == null ? null : ComponentName.unflattenFromString(cn);
-    }
-
-    private static void logd(String msg, Object... args) {
-        if (DEBUG) {
-            Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
-        }
-    }
-
-    private static class DreamInfoComparator implements
-            Comparator<DreamBackend.DreamInfo> {
-        private final ComponentName mDefaultDream;
-
-        public DreamInfoComparator(ComponentName defaultDream) {
-            mDefaultDream = defaultDream;
-        }
-
-        @Override
-        public int compare(
-                DreamBackend.DreamInfo lhs, DreamBackend.DreamInfo rhs) {
-            return sortKey(lhs).compareTo(sortKey(rhs));
-        }
-
-        private String sortKey(DreamBackend.DreamInfo di) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(di.componentName.equals(mDefaultDream) ? '0' : '1');
-            sb.append(di.caption);
-            return sb.toString();
-        }
-    }
-}
-
diff --git a/SettingsAPI/java/com/android/tv/settings/library/settingslib/RestrictedLockUtilsInternal.java b/SettingsAPI/java/com/android/tv/settings/library/settingslib/RestrictedLockUtilsInternal.java
index 25999501b..b95545235 100644
--- a/SettingsAPI/java/com/android/tv/settings/library/settingslib/RestrictedLockUtilsInternal.java
+++ b/SettingsAPI/java/com/android/tv/settings/library/settingslib/RestrictedLockUtilsInternal.java
@@ -388,7 +388,7 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils {
      */
     public static EnforcedAdmin checkIfUsbDataSignalingIsDisabled(Context context, int userId) {
         DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
-        if (dpm == null || dpm.isUsbDataSignalingEnabledForUser(userId)) {
+        if (dpm == null || dpm.isUsbDataSignalingEnabled()) {
             return null;
         } else {
             EnforcedAdmin admin = getProfileOrDeviceOwner(context, getUserHandleOf(userId));
diff --git a/SettingsAPI/java/com/android/tv/settings/library/system/DevelopmentState.java b/SettingsAPI/java/com/android/tv/settings/library/system/DevelopmentState.java
deleted file mode 100644
index 1b4eec7aa..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/system/DevelopmentState.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.system;
-
-import static com.android.tv.settings.library.ManagerUtil.STATE_DEVELOPMENT;
-import static com.android.tv.settings.library.overlay.FlavorUtils.X_EXPERIENCE_FLAVORS_MASK;
-
-import android.app.AppOpsManager;
-import android.app.admin.DevicePolicyManager;
-import android.app.backup.IBackupManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.ServiceManager;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.sysprop.AdbProperties;
-import android.view.IWindowManager;
-import android.widget.Toast;
-
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.overlay.FlavorUtils;
-import com.android.tv.settings.library.system.development.audio.AudioDebug;
-import com.android.tv.settings.library.system.development.audio.AudioMetrics;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-import com.android.tv.settings.library.util.ResourcesUtil;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-
-public class DevelopmentState extends PreferenceControllerState {
-    private static final String TAG = "DevelopmentSettings";
-
-    private static final String ENABLE_DEVELOPER = "development_settings_enable";
-    private static final String ENABLE_ADB = "enable_adb";
-    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
-    private static final String ENABLE_TERMINAL = "enable_terminal";
-    private static final String KEEP_SCREEN_ON = "keep_screen_on";
-    private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
-    private static final String BTSNOOP_LOG_MODE_PROPERTY = "persist.bluetooth.btsnooplogmode";
-    private static final String ENABLE_OEM_UNLOCK = "oem_unlock_enable";
-    private static final String HDCP_CHECKING_KEY = "hdcp_checking";
-    private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
-    private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
-    private static final String BUGREPORT = "bugreport";
-    private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power";
-
-    private static final String DEBUG_APP_KEY = "debug_app";
-    private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
-    private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
-    private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
-    private static final String DEBUG_VIEW_ATTRIBUTES = "debug_view_attributes";
-    private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
-    private static final String STRICT_MODE_KEY = "strict_mode";
-    private static final String POINTER_LOCATION_KEY = "pointer_location";
-    private static final String SHOW_TOUCHES_KEY = "show_touches";
-    private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
-    private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
-    private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
-    private static final String USB_AUDIO_KEY = "usb_audio";
-    private static final String RECORD_AUDIO_KEY = "record_audio";
-    private static final String PLAY_RECORDED_AUDIO_KEY = "play_recorded_audio";
-    private static final String SAVE_RECORDED_AUDIO_KEY = "save_recorded_audio";
-    private static final String TIME_TO_START_READ_KEY = "time_to_start_read";
-    private static final String TIME_TO_VALID_AUDIO_KEY = "time_to_valid_audio";
-    private static final String EMPTY_AUDIO_DURATION_KEY = "empty_audio_duration";
-    private static final String FORCE_MSAA_KEY = "force_msaa";
-    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
-    private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
-    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_updates";
-    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_updates";
-    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
-    private static final String DEBUG_LAYOUT_KEY = "debug_layout";
-    private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
-    private static final String WINDOW_BLURS_KEY = "window_blurs";
-    private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
-    private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
-    private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
-    private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
-    private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
-
-    private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
-    private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
-    private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";
-    private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";
-    private static final String KEY_COLOR_MODE = "color_mode";
-    private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
-
-    private static final String INACTIVE_APPS_KEY = "inactive_apps";
-
-    private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
-
-    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY =
-            "immediately_destroy_activities";
-    private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
-
-    private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
-
-    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
-
-    private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
-
-    private static final int RESULT_DEBUG_APP = 1000;
-    private static final int RESULT_MOCK_LOCATION_APP = 1001;
-
-    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
-
-    private static final String DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES = "262144"; // 256K
-
-    private static final int[] MOCK_LOCATION_APP_OPS = new int[]{AppOpsManager.OP_MOCK_LOCATION};
-
-    private static final String STATE_SHOWING_DIALOG_KEY = "showing_dialog_key";
-
-    private String mPendingDialogKey;
-
-    private IWindowManager mWindowManager;
-    private IBackupManager mBackupManager;
-    private DevicePolicyManager mDpm;
-    private UserManager mUm;
-    private WifiManager mWifiManager;
-    private ContentResolver mContentResolver;
-
-    private boolean mLastEnabledState;
-    private boolean mHaveDebugSettings;
-
-    private PreferenceCompat mEnableDeveloper;
-    private PreferenceCompat mEnableAdb;
-    private PreferenceCompat mClearAdbKeys;
-    private PreferenceCompat mEnableTerminal;
-    private PreferenceCompat mBugreport;
-    private PreferenceCompat mKeepScreenOn;
-    private PreferenceCompat mDebugDebuggingCategory;
-    private PreferenceCompat mBtHciSnoopLog;
-    private PreferenceCompat mDebugViewAttributes;
-    private PreferenceCompat mForceAllowOnExternal;
-
-    private PreferenceCompat mPassword;
-    private String mDebugApp;
-    private PreferenceCompat mDebugAppPref;
-
-    private String mMockLocationApp;
-    private PreferenceCompat mMockLocationAppPref;
-
-    private PreferenceCompat mWaitForDebugger;
-    private PreferenceCompat mVerifyAppsOverUsb;
-    private PreferenceCompat mWifiDisplayCertification;
-    private PreferenceCompat mWifiVerboseLogging;
-    private PreferenceCompat mMobileDataAlwaysOn;
-
-    private PreferenceCompat mStrictMode;
-    private PreferenceCompat mPointerLocation;
-    private PreferenceCompat mShowTouches;
-    private PreferenceCompat mShowScreenUpdates;
-    private PreferenceCompat mDisableOverlays;
-    private PreferenceCompat mForceMsaa;
-    private PreferenceCompat mShowHwScreenUpdates;
-    private PreferenceCompat mShowHwLayersUpdates;
-    private PreferenceCompat mDebugLayout;
-    private PreferenceCompat mForceRtlLayout;
-    private PreferenceCompat mWindowBlurs;
-    private PreferenceCompat mDebugHwOverdraw;
-    private PreferenceCompat mTrackFrameTime;
-    private PreferenceCompat mShowNonRectClip;
-    private PreferenceCompat mWindowAnimationScale;
-    private PreferenceCompat mTransitionAnimationScale;
-    private PreferenceCompat mAnimatorDurationScale;
-    private PreferenceCompat mOverlayDisplayDevices;
-    private PreferenceCompat mOpenGLTraces;
-    private PreferenceCompat mSimulateColorSpace;
-    private PreferenceCompat mUSBAudio;
-    private PreferenceCompat mRecordAudio;
-    private PreferenceCompat mPlayRecordedAudio;
-    private PreferenceCompat mSaveAudio;
-    private PreferenceCompat mTimeToStartRead;
-    private PreferenceCompat mTimeToValidAudio;
-    private PreferenceCompat mEmptyAudioDuration;
-    private PreferenceCompat mImmediatelyDestroyActivities;
-    private PreferenceCompat mAppProcessLimit;
-    private PreferenceCompat mShowAllANRs;
-    private PreferenceCompat mForceResizable;
-    private PreferenceCompat mHdcpChecking;
-
-    private boolean mUnavailable;
-
-    private AudioDebug mAudioDebug;
-    private final ArrayList<PreferenceCompat> mAllPrefCompats = new ArrayList<>();
-    private final ArrayList<PreferenceCompat> mResetSwitchPrefCompats = new ArrayList<>();
-    private final HashSet<PreferenceCompat> mDisabledPrefCompats = new HashSet<>();
-
-    public DevelopmentState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        if (extras != null) {
-            // Don't show this in onCreate since we might be on the back stack
-            mPendingDialogKey = extras.getString(STATE_SHOWING_DIALOG_KEY);
-        }
-
-        mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
-        mBackupManager = IBackupManager.Stub.asInterface(
-                ServiceManager.getService(Context.BACKUP_SERVICE));
-        mDpm = mContext.getSystemService(DevicePolicyManager.class);
-        mUm = mContext.getSystemService(UserManager.class);
-
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-
-        mContentResolver = mContext.getContentResolver();
-
-        mAudioDebug = new AudioDebug(mContext,
-                (boolean successful) -> onAudioRecorded(successful),
-                (AudioMetrics.Data data) -> updateAudioRecordingMetrics(data));
-        mEnableDeveloper = mPreferenceCompatManager.getOrCreatePrefCompat(ENABLE_DEVELOPER);
-        mEnableAdb = findAndInitSwitchPrefCompat(ENABLE_DEVELOPER);
-        mDebugDebuggingCategory = mPreferenceCompatManager.getOrCreatePrefCompat(
-                DEBUG_DEBUGGING_CATEGORY_KEY);
-        mClearAdbKeys = mPreferenceCompatManager.getOrCreatePrefCompat(CLEAR_ADB_KEYS);
-        mKeepScreenOn = mPreferenceCompatManager.getOrCreatePrefCompat(KEEP_SCREEN_ON);
-        if (!AdbProperties.secure().orElse(false)) {
-            mClearAdbKeys.setVisible(false);
-        }
-        mAllPrefCompats.add(mClearAdbKeys);
-        mEnableTerminal = findAndInitSwitchPrefCompat(ENABLE_TERMINAL);
-        if (!isPackageInstalled(mContext, TERMINAL_APP_PACKAGE)) {
-            mEnableTerminal.setVisible(false);
-        }
-        mBugreport = mPreferenceCompatManager.getOrCreatePrefCompat(BUGREPORT);
-        if (!showBugReportPreference()) {
-            mBugreport.setVisible(false);
-        }
-
-        mKeepScreenOn = findAndInitSwitchPrefCompat(KEEP_SCREEN_ON);
-        mBtHciSnoopLog = addListPrefCompat(BT_HCI_SNOOP_LOG);
-        mDebugViewAttributes = findAndInitSwitchPrefCompat(DEBUG_VIEW_ATTRIBUTES);
-        mForceAllowOnExternal = findAndInitSwitchPrefCompat(FORCE_ALLOW_ON_EXTERNAL_KEY);
-        if (!mUm.isAdminUser()) {
-            disableForUser(mEnableAdb);
-            disableForUser(mClearAdbKeys);
-            disableForUser(mEnableTerminal);
-            disableForUser(mPassword);
-        }
-        mDebugAppPref = mPreferenceCompatManager.getOrCreatePrefCompat(DEBUG_APP_KEY);
-        mAllPrefCompats.add(mDebugAppPref);
-        mWaitForDebugger = findAndInitSwitchPrefCompat(WAIT_FOR_DEBUGGER_KEY);
-        mMockLocationAppPref = mPreferenceCompatManager.getOrCreatePrefCompat(
-                MOCK_LOCATION_APP_KEY);
-        mAllPrefCompats.add(mMockLocationAppPref);
-        mVerifyAppsOverUsb = findAndInitSwitchPrefCompat(VERIFY_APPS_OVER_USB_KEY);
-        if (!showVerifierSetting()) {
-            mVerifyAppsOverUsb.setVisible(false);
-            mVerifyAppsOverUsb.setEnabled(false);
-        }
-        mStrictMode = findAndInitSwitchPrefCompat(STRICT_MODE_KEY);
-        mPointerLocation = findAndInitSwitchPrefCompat(POINTER_LOCATION_KEY);
-        mShowTouches = findAndInitSwitchPrefCompat(SHOW_TOUCHES_KEY);
-        mShowScreenUpdates = findAndInitSwitchPrefCompat(SHOW_SCREEN_UPDATES_KEY);
-        mDisableOverlays = findAndInitSwitchPrefCompat(DISABLE_OVERLAYS_KEY);
-        mForceMsaa = findAndInitSwitchPrefCompat(FORCE_MSAA_KEY);
-        mTrackFrameTime = addListPrefCompat(TRACK_FRAME_TIME_KEY);
-        mShowNonRectClip = addListPrefCompat(SHOW_NON_RECTANGULAR_CLIP_KEY);
-        mShowHwScreenUpdates = findAndInitSwitchPrefCompat(SHOW_HW_SCREEN_UPDATES_KEY);
-        mShowHwLayersUpdates = findAndInitSwitchPrefCompat(SHOW_HW_LAYERS_UPDATES_KEY);
-        mDebugLayout = findAndInitSwitchPrefCompat(DEBUG_LAYOUT_KEY);
-        mForceRtlLayout = findAndInitSwitchPrefCompat(FORCE_RTL_LAYOUT_KEY);
-        mWindowBlurs = findAndInitSwitchPrefCompat(WINDOW_BLURS_KEY);
-        mDebugHwOverdraw = addListPrefCompat(DEBUG_HW_OVERDRAW_KEY);
-        mWifiDisplayCertification = findAndInitSwitchPrefCompat(WIFI_DISPLAY_CERTIFICATION_KEY);
-        mWifiVerboseLogging = findAndInitSwitchPrefCompat(WIFI_VERBOSE_LOGGING_KEY);
-        mMobileDataAlwaysOn = findAndInitSwitchPrefCompat(MOBILE_DATA_ALWAYS_ON);
-
-        mWindowAnimationScale = addListPrefCompat(WINDOW_ANIMATION_SCALE_KEY);
-        mTransitionAnimationScale = addListPrefCompat(TRANSITION_ANIMATION_SCALE_KEY);
-        mAnimatorDurationScale = addListPrefCompat(ANIMATOR_DURATION_SCALE_KEY);
-        mOverlayDisplayDevices = addListPrefCompat(OVERLAY_DISPLAY_DEVICES_KEY);
-        mOpenGLTraces = addListPrefCompat(OPENGL_TRACES_KEY);
-        mSimulateColorSpace = addListPrefCompat(SIMULATE_COLOR_SPACE);
-        mUSBAudio = findAndInitSwitchPrefCompat(USB_AUDIO_KEY);
-        mRecordAudio = findAndInitSwitchPrefCompat(RECORD_AUDIO_KEY);
-        mPlayRecordedAudio = mPreferenceCompatManager.getOrCreatePrefCompat(
-                PLAY_RECORDED_AUDIO_KEY);
-        mPlayRecordedAudio.setVisible(false);
-        mSaveAudio = mPreferenceCompatManager.getOrCreatePrefCompat(SAVE_RECORDED_AUDIO_KEY);
-        mSaveAudio.setVisible(false);
-        mTimeToStartRead = mPreferenceCompatManager.getOrCreatePrefCompat(TIME_TO_START_READ_KEY);
-        mTimeToStartRead.setVisible(false);
-        mTimeToValidAudio = mPreferenceCompatManager.getOrCreatePrefCompat(TIME_TO_VALID_AUDIO_KEY);
-        mTimeToValidAudio.setVisible(false);
-        mEmptyAudioDuration = mPreferenceCompatManager.getOrCreatePrefCompat(
-                EMPTY_AUDIO_DURATION_KEY);
-        mEmptyAudioDuration.setVisible(false);
-        mForceResizable = findAndInitSwitchPrefCompat(FORCE_RESIZABLE_KEY);
-
-        mImmediatelyDestroyActivities = findAndInitSwitchPrefCompat(
-                IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
-
-        mAppProcessLimit = addListPrefCompat(APP_PROCESS_LIMIT_KEY);
-
-        mShowAllANRs = findAndInitSwitchPrefCompat(SHOW_ALL_ANRS_KEY);
-
-        mHdcpChecking = mPreferenceCompatManager.getOrCreatePrefCompat(HDCP_CHECKING_KEY);
-        mAllPrefCompats.add(mHdcpChecking);
-        removePreferenceForProduction(mHdcpChecking);
-    }
-
-
-    private PreferenceCompat addListPrefCompat(String prefKey) {
-        PreferenceCompat pref = mPreferenceCompatManager.getOrCreatePrefCompat(prefKey);
-        pref.setType(PreferenceCompat.TYPE_LIST);
-        mAllPrefCompats.add(pref);
-        return pref;
-    }
-
-    /** Called when audio recording is finished. Updates UI component states. */
-    private void onAudioRecorded(boolean successful) {
-        mPlayRecordedAudio.setVisible(successful);
-        mSaveAudio.setVisible(successful);
-        mRecordAudio.setChecked(false);
-
-        if (!successful) {
-            Toast errorToast = Toast.makeText(mContext,
-                    ResourcesUtil.getString(mContext, "show_audio_recording_failed"),
-                    Toast.LENGTH_SHORT);
-            errorToast.show();
-        }
-    }
-
-    /** Updates displayed audio recording metrics */
-    private void updateAudioRecordingMetrics(AudioMetrics.Data data) {
-        updateAudioRecordingMetric(mTimeToStartRead, data.timeToStartReadMs);
-        updateAudioRecordingMetric(mTimeToValidAudio, data.timeToValidAudioMs);
-        updateAudioRecordingMetric(mEmptyAudioDuration, data.emptyAudioDurationMs);
-    }
-
-    private static void updateAudioRecordingMetric(PreferenceCompat preference, Optional<Long> ts) {
-        ts.ifPresent(x -> preference.setVisible(true));
-        if (preference.getVisible() == PreferenceCompat.STATUS_ON) {
-            preference.setSummary(AudioMetrics.msTimestampToString(ts));
-        }
-    }
-
-    private boolean removePreferenceForProduction(PreferenceCompat preference) {
-        if ("user".equals(Build.TYPE)) {
-            preference.setVisible(false);
-            return true;
-        }
-        return false;
-    }
-
-    private boolean showVerifierSetting() {
-        return Settings.Global.getInt(mContentResolver,
-                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
-    }
-
-    private PreferenceCompat findAndInitSwitchPrefCompat(String key) {
-        PreferenceCompat pref = mPreferenceCompatManager.getOrCreatePrefCompat(key);
-        pref.setType(PreferenceCompat.TYPE_SWITCH);
-        if (pref == null) {
-            throw new IllegalArgumentException("Cannot find preference with key = " + key);
-        }
-        mAllPrefCompats.add(pref);
-        mResetSwitchPrefCompats.add(pref);
-        return pref;
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return STATE_DEVELOPMENT;
-    }
-
-    private static boolean isPackageInstalled(Context context, String packageName) {
-        try {
-            return context.getPackageManager().getPackageInfo(packageName, 0) != null;
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-
-    private void disableForUser(PreferenceCompat pref) {
-        if (pref != null) {
-            pref.setEnabled(false);
-            mDisabledPrefCompats.add(pref);
-        }
-    }
-
-    private boolean showBugReportPreference() {
-        return (FlavorUtils.getFlavor(mContext) & X_EXPERIENCE_FLAVORS_MASK) == 0;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/system/LanguageState.java b/SettingsAPI/java/com/android/tv/settings/library/system/LanguageState.java
deleted file mode 100644
index 9535f9adc..000000000
--- a/SettingsAPI/java/com/android/tv/settings/library/system/LanguageState.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2021 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.library.system;
-
-import static com.android.tv.settings.library.ManagerUtil.STATE_LANGUAGE;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.RemoteException;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import com.android.internal.app.LocalePicker;
-import com.android.tv.settings.library.PreferenceCompat;
-import com.android.tv.settings.library.UIUpdateCallback;
-import com.android.tv.settings.library.about.DevelopmentSettingsEnabler;
-import com.android.tv.settings.library.data.PreferenceControllerState;
-import com.android.tv.settings.library.util.AbstractPreferenceController;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * State to handle the business logic for LanguageFragment.
- */
-public class LanguageState extends PreferenceControllerState {
-    private static final String TAG = "LanguageFragment";
-
-    // Pseudo locales used for internal purposes only should not be shown in the
-    // language picker.
-    private static final String PSEUDO_LOCALE_EN_XC = "en-XC";
-
-    private static final String LANGUAGE_RADIO_GROUP = "language";
-
-    private final Map<String, LocalePicker.LocaleInfo> mLocaleInfoMap = new ArrayMap<>();
-
-    // Adjust this value to keep things relatively responsive without janking animations
-    private static final int LANGUAGE_SET_DELAY_MS = 500;
-    private final Handler mDelayHandler = new Handler();
-    private Locale mNewLocale;
-    private final Runnable mSetLanguageRunnable = new Runnable() {
-        @Override
-        public void run() {
-            LocalePicker.updateLocale(mNewLocale);
-        }
-    };
-
-    public LanguageState(Context context,
-            UIUpdateCallback callback) {
-        super(context, callback);
-    }
-
-    @Override
-    public void onCreate(Bundle extras) {
-        super.onCreate(extras);
-        Locale currentLocale = null;
-        try {
-            currentLocale = ActivityManager.getService().getConfiguration()
-                    .getLocales().get(0);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Could not retrieve locale", e);
-        }
-
-        final List<LocalePicker.LocaleInfo> localeInfoList =
-                LocalePicker.getAllAssetLocales(mContext,
-                        DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext));
-
-        PreferenceCompat languageList = mPreferenceCompatManager.getOrCreatePrefCompat(
-                LANGUAGE_RADIO_GROUP);
-        for (final LocalePicker.LocaleInfo localeInfo : localeInfoList) {
-            final String languageTag = localeInfo.getLocale().toLanguageTag();
-            if (PSEUDO_LOCALE_EN_XC.equals(languageTag)) {
-                continue;
-            }
-            mLocaleInfoMap.put(languageTag, localeInfo);
-
-            final PreferenceCompat radioPreference = mPreferenceCompatManager.getOrCreatePrefCompat(
-                    new String[]{LANGUAGE_RADIO_GROUP, languageTag});
-            radioPreference.setType(PreferenceCompat.TYPE_RADIO);
-            radioPreference.setTitle(localeInfo.getLabel());
-            if (localeInfo.getLocale().equals(currentLocale)) {
-                radioPreference.setChecked(true);
-                radioPreference.setFocused(true);
-            } else {
-                radioPreference.setChecked(false);
-                radioPreference.setFocused(false);
-            }
-            languageList.addChildPrefCompat(radioPreference);
-        }
-        mUIUpdateCallback.notifyUpdate(getStateIdentifier(), languageList);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // no-op
-    }
-
-    @Override
-    public int getStateIdentifier() {
-        return STATE_LANGUAGE;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(String[] key, boolean status) {
-        if (key.length < 2) {
-            return false;
-        }
-        PreferenceCompat preferenceCompat = mPreferenceCompatManager.getPrefCompat(key);
-        PreferenceCompat languageList = mPreferenceCompatManager
-                .getPrefCompat(new String[]{LANGUAGE_RADIO_GROUP});
-        if (preferenceCompat.getChecked() == PreferenceCompat.STATUS_OFF) {
-            mNewLocale = mLocaleInfoMap.get(preferenceCompat.getKey()[1]).getLocale();
-            mDelayHandler.removeCallbacks(mSetLanguageRunnable);
-            mDelayHandler.postDelayed(mSetLanguageRunnable, LANGUAGE_SET_DELAY_MS);
-            preferenceCompat.setChecked(true);
-            clearOtherRadioPreferences(preferenceCompat, languageList);
-            mUIUpdateCallback.notifyUpdate(getStateIdentifier(), languageList);
-        }
-        return true;
-    }
-
-    public PreferenceCompat clearOtherRadioPreferences(PreferenceCompat checkedPrefCompat,
-            PreferenceCompat languageList) {
-        languageList.getChildPrefCompats().stream().filter(preferenceCompat ->
-                !keyEquals(preferenceCompat.getKey(), checkedPrefCompat.getKey())).forEach(
-                preferenceCompat -> {
-                    preferenceCompat.setChecked(false);
-                }
-        );
-        return languageList;
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> onCreatePreferenceControllers(Context context) {
-        return null;
-    }
-}
diff --git a/SettingsAPI/java/com/android/tv/settings/library/util/DataBinder.java b/SettingsAPI/java/com/android/tv/settings/library/util/DataBinder.java
new file mode 100644
index 000000000..837d852be
--- /dev/null
+++ b/SettingsAPI/java/com/android/tv/settings/library/util/DataBinder.java
@@ -0,0 +1,25 @@
+package com.android.tv.settings.library.util;
+
+import android.os.Binder;
+import android.os.IBinder;
+
+/**
+ * Can be used to pass arbitrary data in an intent within the same process. Note that data will
+ * be lost if intent is serialized and deserialized.
+ */
+public class DataBinder<T> extends Binder {
+    public final T data;
+
+    public static <T> DataBinder<T> with(T data) {
+        return new DataBinder<>(data);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T getData(IBinder binder) {
+        return  ((DataBinder<T>) binder).data;
+    }
+
+    private DataBinder(T data) {
+        this.data = data;
+    }
+}
diff --git a/TwoPanelSettingsLib/Android.bp b/TwoPanelSettingsLib/Android.bp
index 63d338042..057d48670 100644
--- a/TwoPanelSettingsLib/Android.bp
+++ b/TwoPanelSettingsLib/Android.bp
@@ -49,6 +49,7 @@ android_library {
         "androidx.lifecycle_lifecycle-common-java8",
         "androidx.cardview_cardview",
         "statslog-tvsettings",
+        "TvSettingsAPI"
     ],
     lint: {
         baseline_filename: "lint-baseline.xml",
diff --git a/TwoPanelSettingsLib/res/values-my/strings.xml b/TwoPanelSettingsLib/res/values-my/strings.xml
index 7803b5cae..f60797be7 100644
--- a/TwoPanelSettingsLib/res/values-my/strings.xml
+++ b/TwoPanelSettingsLib/res/values-my/strings.xml
@@ -17,9 +17,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="info_status_on" msgid="8274851391556672594">"ဖွင့်ထားသည်"</string>
-    <string name="info_status_off" msgid="1947357954040244822">"ပိတ်ထားသည်"</string>
-    <string name="switch_on" msgid="6078857185301284868">"ဖွင့်ထားသည်"</string>
-    <string name="switch_off" msgid="2555309941117626592">"ပိတ်ထားသည်"</string>
+    <string name="info_status_on" msgid="8274851391556672594">"ဖွင့်"</string>
+    <string name="info_status_off" msgid="1947357954040244822">"ပိတ်"</string>
+    <string name="switch_on" msgid="6078857185301284868">"ဖွင့်"</string>
+    <string name="switch_off" msgid="2555309941117626592">"ပိတ်"</string>
     <string name="switch_talkback_identifier" msgid="3243563960920396436">"ပြောင်းရန်"</string>
 </resources>
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java
index f658f8100..10d77ec11 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/SettingsPreferenceFragmentBase.java
@@ -20,13 +20,14 @@ import android.os.Bundle;
 import android.view.View;
 
 import androidx.annotation.NonNull;
-import androidx.leanback.preference.LeanbackPreferenceFragmentCompat;
+
+import com.android.tv.settings.library.instrumentation.InstrumentedPreferenceFragment;
 
 /**
  * Child preference fragment should extend this class to make two panel settings functionality work,
  * otherwise preview panel would not show up.
  */
-public abstract class SettingsPreferenceFragmentBase extends LeanbackPreferenceFragmentCompat {
+public abstract class SettingsPreferenceFragmentBase extends InstrumentedPreferenceFragment {
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
index 5b61d87b9..6d70fa780 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
@@ -342,7 +342,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
         final FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
         transaction.replace(frameResIds[mPrefPanelIdx + 1], initialPreviewFragment,
                 PREVIEW_FRAGMENT_TAG);
-        transaction.commit();
+        transaction.commitAllowingStateLoss();
 
         moveToPanel(mPrefPanelIdx, true);
         removeFragmentAndAddToBackStack(mPrefPanelIdx - 1);
@@ -426,7 +426,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
         addOrRemovePreferenceFocusedListener(fragment, true);
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
         transaction.add(frameResIds[mPrefPanelIdx], fragment, PREFERENCE_FRAGMENT_TAG);
-        transaction.commitNow();
+        transaction.commitNowAllowingStateLoss();
 
         Fragment initialPreviewFragment = getInitialPreviewFragment(fragment);
         if (initialPreviewFragment == null) {
@@ -437,7 +437,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
         transaction = getChildFragmentManager().beginTransaction();
         transaction.add(frameResIds[mPrefPanelIdx + 1], initialPreviewFragment,
                 initialPreviewFragment.getClass().toString());
-        transaction.commit();
+        transaction.commitAllowingStateLoss();
     }
 
     @Override
@@ -554,7 +554,8 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
         @Override
         public void run() {
             if (mPref == mFocusedPreference) {
-                if (mListView.getScrollState() != RecyclerView.SCROLL_STATE_IDLE) {
+                if (mListView != null
+                        && mListView.getScrollState() != RecyclerView.SCROLL_STATE_IDLE) {
                     mHandler.postDelayed(this, CHECK_IDLE_STATE_MS);
                 } else {
                     handleFragmentTransactionWhenFocused(mPref, mForceFresh, mPanelIndex);
@@ -612,7 +613,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
         transaction.setCustomAnimations(R.animator.fade_in_preview_panel,
                 R.animator.fade_out_preview_panel);
         transaction.replace(frameResIds[mPrefPanelIdx + 1], previewFragment);
-        transaction.commitNow();
+        transaction.commitNowAllowingStateLoss();
 
         // Some fragments may steal focus on creation. Reclaim focus on main fragment.
         if (getView() != null && getView().getViewTreeObserver() != null) {
@@ -681,7 +682,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
                 .add(R.id.two_panel_fragment_container, fragment)
                 .remove(target)
                 .addToBackStack(null)
-                .commit();
+                .commitAllowingStateLoss();
         mHandler.post(() -> {
             updateAccessibilityTitle(fragment);
         });
@@ -915,7 +916,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
     private void removeFragment(int index) {
         Fragment fragment = getChildFragmentManager().findFragmentById(frameResIds[index]);
         if (fragment != null) {
-            getChildFragmentManager().beginTransaction().remove(fragment).commit();
+            getChildFragmentManager().beginTransaction().remove(fragment).commitAllowingStateLoss();
         }
     }
 
@@ -927,7 +928,8 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
         if (removePanel != null) {
             removePanel.setExitTransition(new Fade());
             getChildFragmentManager().beginTransaction().remove(removePanel)
-                    .addToBackStack("remove " + removePanel.getClass().getName()).commit();
+                    .addToBackStack("remove " + removePanel.getClass().getName())
+                    .commitAllowingStateLoss();
         }
     }
 
@@ -1206,7 +1208,7 @@ public abstract class TwoPanelSettingsFragment extends Fragment implements
             transaction.setCustomAnimations(R.animator.fade_in_preview_panel,
                     R.animator.fade_out_preview_panel);
             transaction.replace(frameResIds[mPrefPanelIdx], newPrefFragment);
-            transaction.commit();
+            transaction.commitAllowingStateLoss();
         } else {
             Preference preference = getChosenPreference(prefFragment);
             if (preference != null) {
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreference.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreference.java
index a1611bca1..19c25a8c9 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreference.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreference.java
@@ -68,7 +68,7 @@ public class EmbeddedSlicePreference extends SlicePreference
         setIcon(mHelper.mNewPref.getIcon());
         if (mHelper.mNewPref instanceof HasSliceAction
                 && ((HasSliceAction) mHelper.mNewPref).getSliceAction() != null) {
-            setIntent(((HasSliceAction) mHelper.mNewPref).getSliceAction().getAction().getIntent());
+            setSliceAction(((HasSliceAction) mHelper.mNewPref).getSliceAction());
         }
     }
 
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreferenceHelper.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreferenceHelper.java
index 52d2649cb..dfb84edc1 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreferenceHelper.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/EmbeddedSlicePreferenceHelper.java
@@ -89,10 +89,9 @@ public class EmbeddedSlicePreferenceHelper implements Observer<Slice> {
         // TODO(b/174691340): Refactor this class and integrate the functionality to TsPreference.
         // TODO: Redesign TvSettings project structure so class in twopanelsettings lib can access
         //  FlavorUtils
-        // For now, put true or false here does not affect anything as the only related preference
-        // is not displayed to user anymore.
+        // For now, put true here so IconNeedsToBeProcessed will be respected.
         mNewPref = SlicePreferencesUtil.getPreference(embeddedItem,
-                (ContextThemeWrapper) mContext, null, false);
+                (ContextThemeWrapper) mContext, null, true);
         if (mNewPref == null) {
             updateVisibility(false);
             return;
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
index 3134f8457..ea8ff3538 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
@@ -16,10 +16,8 @@
 
 package com.android.tv.twopanelsettings.slices;
 
-import static android.app.slice.Slice.EXTRA_SLIDER_VALUE;
 import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
 import static android.app.slice.Slice.HINT_PARTIAL;
-
 import static com.android.tv.twopanelsettings.slices.InstrumentationUtils.logEntrySelected;
 import static com.android.tv.twopanelsettings.slices.InstrumentationUtils.logToggleInteracted;
 import static com.android.tv.twopanelsettings.slices.SlicesConstants.EXTRA_PREFERENCE_INFO_STATUS;
@@ -39,7 +37,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
@@ -384,7 +381,9 @@ public class SliceFragment extends SettingsPreferenceFragment implements Observe
                 for (Preference newPref : newPrefs) {
                     if (newPref.getKey() != null && newPref.getKey().equals(oldPref.getKey())
                             && (newPref instanceof HasSliceUri)
-                            == (oldPref instanceof HasSliceUri)) {
+                            == (oldPref instanceof HasSliceUri)
+                            && (newPref instanceof EmbeddedSlicePreference)
+                            == (oldPref instanceof EmbeddedSlicePreference)) {
                         needToRemoveCurrentPref = false;
                         break;
                     }
@@ -417,36 +416,40 @@ public class SliceFragment extends SettingsPreferenceFragment implements Observe
                     // 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 (allowUpdate && sameKey) {
-                        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 (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);
-                    }
-                    if (sameKey) {
                         neededToAddNewPref = false;
                         break;
                     }
@@ -498,7 +501,6 @@ public class SliceFragment extends SettingsPreferenceFragment implements Observe
             try {
                 Intent fillInIntent =
                         new Intent()
-                                .putExtra(EXTRA_SLIDER_VALUE, preference.getValue())
                                 .putExtra(EXTRA_PREFERENCE_KEY, preference.getKey());
                 firePendingIntent((HasSliceAction) preference, fillInIntent);
             } catch (Exception e) {
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java
index 67a4ac2f9..b45f89132 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SlicePreferencesUtil.java
@@ -168,12 +168,13 @@ public final class SlicePreferencesUtil {
         }
 
         if (preference != null) {
+            boolean isEnabled = enabled(item);
             // Set whether preference is enabled.
-            if (preference instanceof InfoPreference || !enabled(item)) {
+            if (preference instanceof InfoPreference || !isEnabled) {
                 preference.setEnabled(false);
             }
             // Set whether preference is selectable
-            if (!selectable(item)) {
+            if (!selectable(item) || !isEnabled) {
                 preference.setSelectable(false);
             }
             // Set the key for the preference
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index c5a8fc1a8..410d5e402 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2525,7 +2525,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="Settings/res/values/energy-modes.xml"
-            line="29"
+            line="32"
             column="5"/>
     </issue>
 
@@ -2541,7 +2541,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="Settings/res/values/energy-modes.xml"
-            line="51"
+            line="54"
             column="5"/>
     </issue>
 
@@ -2557,7 +2557,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="Settings/res/values/energy-modes.xml"
-            line="73"
+            line="77"
             column="5"/>
     </issue>
 
@@ -2573,7 +2573,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="TwoPanelSettingsLib/res/layout/energy_mode_info_fragment.xml"
-            line="37"
+            line="34"
             column="9"/>
     </issue>
 
@@ -2589,7 +2589,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="TwoPanelSettingsLib/res/layout/energy_mode_info_fragment.xml"
-            line="79"
+            line="97"
             column="9"/>
     </issue>
 
@@ -2937,6 +2937,22 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="        android:indeterminateTint=&quot;@color/tv_white&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="Settings/res/layout/settings_progress_bar.xml"
+            line="28"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:indeterminateTint=&quot;@color/setup_list_item_background_focused&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location