diff --git a/res-product/values-fr-feminine/strings.xml b/res-product/values-fr-feminine/strings.xml
new file mode 100644
index 0000000..4027cbd
--- /dev/null
+++ b/res-product/values-fr-feminine/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connectée aux comptes suivants :\n"</string>
+    <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"Votre tablette et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être la seule responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+    <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques d\'applis inconnues. En installant des applis depuis cette source, vous reconnaissez être responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de leur utilisation​."</string>
+    <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être la seule responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+</resources>
diff --git a/res-product/values-fr-masculine/strings.xml b/res-product/values-fr-masculine/strings.xml
new file mode 100644
index 0000000..0bca528
--- /dev/null
+++ b/res-product/values-fr-masculine/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"Votre tablette et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+    <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques d\'applis inconnues. En installant des applis depuis cette source, vous reconnaissez être responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de leur utilisation​."</string>
+    <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+</resources>
diff --git a/res-product/values-fr-neuter/strings.xml b/res-product/values-fr-neuter/strings.xml
new file mode 100644
index 0000000..8777756
--- /dev/null
+++ b/res-product/values-fr-neuter/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connecté·e aux comptes suivants :\n"</string>
+    <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"Votre tablette et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être l\'unique responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+    <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques d\'applis inconnues. En installant des applis depuis cette source, vous reconnaissez être responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de leur utilisation​."</string>
+    <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont très vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être l\'unique responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+</resources>
diff --git a/res-product/values/drawables.xml b/res-product/values/drawables.xml
index a2d66e7..9353030 100644
--- a/res-product/values/drawables.xml
+++ b/res-product/values/drawables.xml
@@ -29,6 +29,8 @@
     <drawable name="a11y_captioning_banner" product="default">@drawable/accessibility_captioning_banner</drawable>
     <drawable name="a11y_captioning_banner" product="tablet">@drawable/accessibility_captioning_banner_tablet</drawable>
 
+    <drawable name="a11y_shortcut_type_quick_settings" product="default">@drawable/accessibility_shortcut_type_quick_settings</drawable>
+
     <drawable name="a11y_shortcut_type_hardware" product="default">@drawable/accessibility_shortcut_type_hardware</drawable>
     <drawable name="a11y_shortcut_type_hardware" product="tablet">@drawable/accessibility_shortcut_type_hardware_tablet</drawable>
 
diff --git a/res/drawable/accessibility_shortcut_type_quick_settings.xml b/res/drawable/accessibility_shortcut_type_quick_settings.xml
new file mode 100644
index 0000000..a801347
--- /dev/null
+++ b/res/drawable/accessibility_shortcut_type_quick_settings.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~ Copyright 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://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="312dp"
+    android:height="130dp"
+    android:viewportWidth="312"
+    android:viewportHeight="130">
+    <group>
+        <clip-path
+            android:pathData="M24,0L288,0A24,24 0,0 1,312 24L312,106A24,24 0,0 1,288 130L24,130A24,24 0,0 1,0 106L0,24A24,24 0,0 1,24 0z"/>
+        <path
+            android:pathData="M24,0L288,0A24,24 0,0 1,312 24L312,106A24,24 0,0 1,288 130L24,130A24,24 0,0 1,0 106L0,24A24,24 0,0 1,24 0z"
+            android:fillColor="#ffffff"/>
+        <path
+            android:pathData="M209,139.62H210V138.62V32C210,24.82 204.18,19 197,19H115C107.82,19 102,24.82 102,32V138.62V139.62H103H209Z"
+            android:strokeWidth="2"
+            android:fillColor="#00000000"
+            android:strokeColor="#6D6D6D"/>
+        <path
+            android:pathData="M103,32C103,25.37 108.37,20 115,20H197C203.63,20 209,25.37 209,32V91.93H103V32Z"
+            android:fillColor="#484848"/>
+        <path
+            android:pathData="M113.31,38.93L149.48,38.93A4,4 0,0 1,153.48 42.93L153.48,52.6A4,4 0,0 1,149.48 56.6L113.31,56.6A4,4 0,0 1,109.31 52.6L109.31,42.93A4,4 0,0 1,113.31 38.93z"
+            android:fillColor="#69B2C9"/>
+        <path
+            android:pathData="M113.31,61.64L149.48,61.64A4,4 0,0 1,153.48 65.64L153.48,75.31A4,4 0,0 1,149.48 79.31L113.31,79.31A4,4 0,0 1,109.31 75.31L109.31,65.64A4,4 0,0 1,113.31 61.64z"
+            android:fillColor="#646464"/>
+        <path
+            android:pathData="M162.52,38.93L198.69,38.93A4,4 0,0 1,202.69 42.93L202.69,52.6A4,4 0,0 1,198.69 56.6L162.52,56.6A4,4 0,0 1,158.52 52.6L158.52,42.93A4,4 0,0 1,162.52 38.93z"
+            android:fillColor="#646464"/>
+        <path
+            android:pathData="M162.52,61.64L198.69,61.64A4,4 0,0 1,202.69 65.64L202.69,75.31A4,4 0,0 1,198.69 79.31L162.52,79.31A4,4 0,0 1,158.52 75.31L158.52,65.64A4,4 0,0 1,162.52 61.64z"
+            android:fillColor="#646464"/>
+    </group>
+</vector>
+
+
+
diff --git a/res/drawable/ic_bubble_all.xml b/res/drawable/ic_bubble_all.xml
deleted file mode 100644
index fdcf6dc..0000000
--- a/res/drawable/ic_bubble_all.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/drawable/ic_bubble_none.xml b/res/drawable/ic_bubble_none.xml
deleted file mode 100644
index e8fd7df..0000000
--- a/res/drawable/ic_bubble_none.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM4,12c0,-4.4 3.6,-8 8,-8 1.8,0 3.5,0.6 4.9,1.7L5.7,16.9C4.6,15.5 4,13.8 4,12zM12,20c-1.8,0 -3.5,-0.6 -4.9,-1.7L18.3,7.1C19.4,8.5 20,10.2 20,12c0,4.4 -3.6,8 -8,8z"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/drawable/ic_bubble_selected.xml b/res/drawable/ic_bubble_selected.xml
deleted file mode 100644
index f953328..0000000
--- a/res/drawable/ic_bubble_selected.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M15,8c0,-1.42 -0.5,-2.73 -1.33,-3.76 0.42,-0.14 0.86,-0.24 1.33,-0.24 2.21,0 4,1.79 4,4s-1.79,4 -4,4c-0.43,0 -0.84,-0.09 -1.23,-0.21 -0.03,-0.01 -0.06,-0.02 -0.1,-0.03C14.5,10.73 15,9.42 15,8zM16.66,13.13C18.03,14.06 19,15.32 19,17v3h4v-3c0,-2.18 -3.58,-3.47 -6.34,-3.87zM9,6c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2m0,9c-2.7,0 -5.8,1.29 -6,2.01L3,18h12v-1c-0.2,-0.71 -3.3,-2 -6,-2M9,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4 -4,-1.79 -4,-4 1.79,-4 4,-4zM9,13c2.67,0 8,1.34 8,4v3L1,20v-3c0,-2.66 5.33,-4 8,-4z"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/layout/bubble_preference.xml b/res/layout/bubble_preference.xml
index eb9a8f1..7c2dbbc 100644
--- a/res/layout/bubble_preference.xml
+++ b/res/layout/bubble_preference.xml
@@ -15,13 +15,12 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:padding="@dimen/notification_importance_toggle_marginTop"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="@dimen/notification_importance_toggle_marginTop">
 
     <!-- If bubbles is managed by the admin this is used to inform the user. -->
     <TextView
@@ -30,102 +29,45 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/notification_importance_button_padding"
         android:textAppearance="@style/TextAppearance.Small"
-        android:visibility="gone"
-        />
+        android:visibility="gone" />
 
-    <com.android.settings.notification.NotificationButtonRelativeLayout
-        android:id="@+id/bubble_all"
+    <RadioGroup
+        android:id="@+id/radio_group"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/notification_importance_button_padding"
-        android:clickable="true"
-        android:focusable="true">
-        <ImageView
-            android:id="@+id/bubble_all_icon"
-            android:src="@drawable/ic_bubble_all"
-            android:background="@android:color/transparent"
-            android:layout_centerVertical="true"
+        android:checkedButton="@+id/redact_sensitive">
+
+        <RadioButton
+            android:id="@+id/bubble_all"
+            style="@style/SudRadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/bubble_all_label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/bubble_all_icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/bubble_app_setting_all"/>
-    </com.android.settings.notification.NotificationButtonRelativeLayout>
+            android:layout_marginVertical="0dp"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
+            android:minHeight="56dp"
+            android:text="@string/bubble_app_setting_all"
+            android:textColor="?android:attr/textColorSecondary" />
 
-    <com.android.settings.notification.NotificationButtonRelativeLayout
-        android:id="@+id/bubble_selected"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/notification_importance_button_padding"
-        android:layout_marginTop="@dimen/notification_importance_button_separation"
-        android:clickable="true"
-        android:focusable="true">
-        <ImageView
-            android:id="@+id/bubble_selected_icon"
-            android:src="@drawable/ic_bubble_selected"
-            android:background="@android:color/transparent"
-            android:layout_centerVertical="true"
+        <RadioButton
+            android:id="@+id/bubble_selected"
+            style="@style/SudRadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/bubble_selected_label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/bubble_selected_icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/bubble_app_setting_selected"/>
-    </com.android.settings.notification.NotificationButtonRelativeLayout>
+            android:layout_marginVertical="0dp"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
+            android:minHeight="56dp"
+            android:text="@string/bubble_app_setting_selected"
+            android:textColor="?android:attr/textColorSecondary" />
 
-    <com.android.settings.notification.NotificationButtonRelativeLayout
-        android:id="@+id/bubble_none"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/notification_importance_button_padding"
-        android:layout_marginTop="@dimen/notification_importance_button_separation"
-        android:clickable="true"
-        android:focusable="true">
-        <ImageView
-            android:id="@+id/bubble_none_icon"
-            android:src="@drawable/ic_bubble_none"
-            android:background="@android:color/transparent"
-            android:layout_centerVertical="true"
+        <RadioButton
+            android:id="@+id/bubble_none"
+            style="@style/SudRadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/bubble_none_label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/bubble_none_icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/bubble_app_setting_none"/>
-    </com.android.settings.notification.NotificationButtonRelativeLayout>
-
+            android:layout_marginVertical="0dp"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
+            android:minHeight="56dp"
+            android:text="@string/bubble_app_setting_none"
+            android:textColor="?android:attr/textColorSecondary" />
+    </RadioGroup>
 </LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index b74089a..b6c201e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Bind regteroor saam"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Bind linkeroor saam"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Vir alle beskikbare gehoortoestelle"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Meer gehoortoestelinstellings"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Verander kruistoestelinstellings soos kortpad- en teledraadkontroles"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Vir hierdie toestel"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Oudio-uitvoer"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Meer oor oudio-uitvoer"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Stel tans privaat ruimte op …"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Kennisgewings van privaat ruimte-apps word versteek as dit gesluit is"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Verken privaatruimte-instellings om privaat ruimte te versteek en outomatiese sluiting op te stel"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Vereiste apps is reeds in jou privaat ruimte geïnstalleer"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Kon nie privaat ruimte opstel nie"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Probeer weer"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Wil jy skermslot gebruik om privaat ruimte te ontsluit?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apps en kennisgewings"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Sensitiewe kennisgewings op sluitskerm"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Wys sensitiewe inhoud wanneer privaat ruimte ontsluit is"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Skep ’n Google-rekening om te help om jou data privaat te hou"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Jy kan op die volgende skerm by ’n rekening aanmeld om saam met jou privaat ruimte te gebruik"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Skep ’n toegewyde rekening om te help keer dat data buite privaat ruimte verskyn, soos:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Gesinkroniseerde foto’s, lêers, e-posse, kontakte, kalendergeleenthede en ander data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Appaflaaigeskiedenis en -aanbevelings"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Blaaigeskiedenis, boekmerke en gestoorde wagwoorde"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Voorgestelde inhoud wat met jou aktiwiteit in privaatruimte-apps verband hou"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Het dit"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> vingerafdrukke byvoeg"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Jy het die maksimum aantal vingerafdrukke bygevoeg"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan nie nog vingerafdrukke byvoeg nie"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> om jou netwerkverbindings te bestuur?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Onlangse liggingversoeke"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ligging vir werkprofiel"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Programliggingtoestemmings"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Ligging is af"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# van {total} apps het toegang tot ligging}other{# van {total} apps het toegang tot ligging}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Stel terug"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Kies wysigersleutel"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Kies ’n nuwe sleutel vir <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Verstek"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Spraak"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Wyserspoed"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Speletjiekontroleerder"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Algemeen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Vertoon"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Kleur en beweging"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kleurkontras"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Hoër kontras laat teks, knoppies en ikone meer uitstaan. Kies die kontras wat vir jou die beste lyk."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Sommige apps steun dalk nie alle kleur- en tekskontrasinstellings nie"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Verstel hoe kleure en teks teen jou skerm se agtergrondkleur lyk"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Voorbeskou"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 dae gelede"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Volg op?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Sakereisverslag"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Kontak \nmy of Helen vir verdere hulp. Hierdie verslag sal"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Kliëntuitgawes"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Maak skerm donkerder"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaksiekontroles"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Tydkontroles"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Ondeursigtig"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Hoëkontrasteks"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Verander tekskleur na swart of wit. Vergroot kontras met die agtergrond."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimeer tekskontras"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Verander tekskleur na swart of wit om kontras met die agtergrond te verskerp."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Dateer outomaties skermvergroting op"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Dateer skermvergroting op tydens programverwisseling"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kragknoppie beëindig oproep"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Kanselleer"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontras"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standaard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Verstek"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Medium"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Hoog"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Hierdie app kan net in 1 venster oopgemaak word"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ffb44c7..fc49616 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"የቀኝ ጆሮን ያጣምሩ"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"የግራ ጆሮን ያጣምሩ"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"ለሁሉም ለሚገኙ የመስሚያ መሣሪያዎች"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"ተጨማሪ የመስማት ችሎታ መሣሪያ ቅንብሮች"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"እንደ አቋራጭ እና የቴሌኮይል ቁጥጥሮች ያሉ የመሣሪያ-ተሻጋሪ ቅንብሮችን ይቀይሩ"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ለዚህ መሳሪያ"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"የኦዲዮ ውጽዓት"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ስለኦዲዮ ውፅዓት"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"የግል ቦታን በማዋቀር ላይ…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ከግል ቦታ መተግበሪያዎች የሚመጡ ማሳወቂያዎች ሲቆለፍ ይደበቃሉ"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"የግል ቦታን ለመደበቅ እና ራስ-ሰር መቆለፍን ለማዘጋጀት የግል ቦታ ቅንብሮችን ያስሱ"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"የሚያስፈልጉ መተግበሪያዎች አስቀድመው በግል ቦታዎ ላይ ተጭነዋል"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"የግል ቦታን ማዋቀር አልተቻለም"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"እንደገና ይሞክሩ"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"የግል ቦታን ለመክፈት ማያ ገጽ መቆለፊያን ይጠቀሙ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"ምስጢራዊነት ያላቸው ማሳወቂያዎች በማያ ገጽ ቁልፍ ላይ"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"የግል ቦታ ሲከፈት ምስጢራዊነት ያለው ይዘት አሳይ"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"የእርስዎን ውሂብ የግል ለማድረግ እንዲያግዝ የGoogle መለያ ይፍጠሩ"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"በሚቀጥለው ማያ ገጽ ላይ በግል ቦታዎ ለመጠቀም ወደ መለያ መግባት ይችላሉ"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"ውሂብ ከግል ቦታ ውጭ እንዳይታይ ለማቆም ለማገዝ ለዚህ የተለየ መለያ ይፍጠሩ፣ ለምሳሌ፦"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"የሰመሩ ፎቶዎች፣ ፋይሎች፣ ኢሜይሎች፣ እውቂያዎች፣ የቀን መቁጠሪያ ክስተቶች እና ሌላ ውሂብ"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"የመተግበሪያ ማውረድ ታሪክ እና ምክሮች"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"የአሰሳ ታሪክ፣ እልባቶች እና የተቀመጡ የይለፍ ቃላት"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"በግል ቦታ መተግበሪያዎች ውስጥ ካለው እንቅስቃሴዎ ጋር የሚዛመድ የተጠቆመ ይዘት"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"ገባኝ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ የጣት አሻራዎችን ማከል ይችላሉ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"የሚፈቀደውን ከፍተኛ የጣት አሻራ ብዛት አክለዋል"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ተጨማሪ የጣት አሻራዎችን ማከል አይቻልም"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"የአውታረ መረብ ግንኙነቶችዎን ለማቀናበር <xliff:g id="NEW_APP">%s</xliff:g>ን ይጠቀሙ?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"የስራ መገለጫ አካባቢ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"የመተግበሪያ አካባቢ ፈቃዶች"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"መገኛ አካባቢ ጠፍቷል"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{ከ{total} መተግበሪያዎች # የአካባቢ መዳረሻ አለው}one{ከ{total} መተግበሪያዎች # የአካባቢ መዳረሻ አለው}other{ከ{total} መተግበሪያዎች # የአካባቢ መዳረሻ አላቸው}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ዳግም አስጀምር"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"አሻሻይ ቁልፍ ይምረጡ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ለ<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> አዲስ ቁልፍ ይምረጡ፦"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ነባሪ"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"ንግግር"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"የጠቋሚ ፍጥነት"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"የጨዋታ መቆጣጠሪያ"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"አጠቃላይ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"አሳይ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ቀለም እና እንቅስቃሴ"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"የቀለም ንጽጽር"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ከፍተኛ ንፅፅር ጽሑፍን፣ አዝራሮችን እና አዶዎችን የበለጠ ጎልቶ እንዲታዩ ያደርጋል። ለእርስዎ የሚስማማውን ንፅፅር ይምረጡ።"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"አንዳንድ መተግበሪያዎች ሁሉንም የቀለም እና የጽሑፍ ንፅፅር ቅንብሮችን ላይደግፉ ይችላሉ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"ቀለሞች እና ጽሁፍ ከማያ ገጽዎ ጀርባ ቀለም አንጻር እንዴት እንደሚመስሉ ያስተካክሉ"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"ቅድመ-ዕይታ"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ሄለን፣ አዳም"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"ከ2 ቀኖች በፊት"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ክትትል ያደርጉበታል?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"የንግድ ጉዞ ሪፖርት"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"ለተጨማሪ እርዳታ እባክዎ \nእኔን ወይም ሄለንን ያግኙ። ይህ ሪፖርት የሚሆነው"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"የደንበኛ ወጪዎች"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ማያ ገጹን ወደ ጥቁር ይቀይሩ"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"የመስተጋብር መቆጣጠሪያዎች"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"የጊዜ መቆጣጠሪያዎች"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"ግልፅ አይደልም"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ከፍተኛ ንጽጽር ጽሁፍ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"የጽሑፍ ቀለም ወደ ጥቁር ወይም ነጭ ይቀይሩ። ከዳራ ንፅፅርን ከፍ ያደርገዋል።"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"የጽሑፍ ንፅፅርን ያሳድጉ"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ከበስተጀርባው ጋር ያለውን ንፅፅር ለመጨመር የጽሑፍ ቀለም ወደ ጥቁር ወይም ነጭ ይቀይሩ።"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"ማጉላትን በራስ-አዘምን"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"የመተግበሪያ ሽግግሮች ላይ ማጉላትን አዘምን"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"የኃይል አዘራር ጥሪውን ይዘገዋል"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ይቅር"</string>
     <string name="contrast_title" msgid="6885768151336508075">"ንጽጽር"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"መደበኛ"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ነባሪ"</string>
     <string name="contrast_medium" msgid="384414510709285811">"መካከለኛ"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ከፍተኛ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ይህ መተግበሪያ መከፈት የሚችለው በ1 መስኮት ብቻ ነው"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c792b11..5d4052a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"إقران السماعة اليمنى"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"إقران السماعة اليسرى"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"لجميع سماعات الأذن الطبية المتاحة"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"مزيد من إعدادات سماعات الأذن الطبية"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"يمكنك تغيير الإعدادات على أجهزة متعددة مثل عناصر التحكُّم في الملف المغناطيسي والاختصارات."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"على هذا الجهاز"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"مصدر إخراج الصوت"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"لمحة عن إخراج الصوت"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"جارٍ إعداد المساحة الخاصة…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"يتم إخفاء الإشعارات الواردة من تطبيقات المساحة الخاصة إذا كانت المساحة مقفلة"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"استكشاف إعدادات المساحة الخاصة لإخفاء المساحة الخاصة وضبط إعدادات القفل التلقائي"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"التطبيقات المطلوبة سبَق أن تم تثبيتها في المساحة الخاصّة"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"تعذَّر إعداد مساحة خاصة"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"إعادة المحاولة"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"هل تريد استخدام قفل الشاشة لفتح قفل مساحتك الخاصة؟"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"التطبيقات والإشعارات"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"الإشعارات الحسّاسة على شاشة القفل"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"عرض المحتوى الحسّاس عند فتح قفل المساحة الخاصة"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"‏إنشاء حساب Google للمساعدة في الحفاظ على خصوصية بياناتك"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"في الشاشة التالية، يمكنك تسجيل الدخول إلى أحد الحسابات لاستخدامه في المساحة الخاصّة."</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"إنشاء حساب مخصّص للمساعدة في منع ظهور البيانات خارج المساحة الخاصّة، مثل:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"الصور والملفات والرسائل الإلكترونية وجهات الاتصال وأحداث التقويم والبيانات الأخرى التي تمت مزامنتها"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"الاقتراحات وسجلّ تنزيل التطبيقات"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"سجلّ التصفُّح والإشارات المرجعية وكلمات المرور المحفوظة"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"المحتوى المقترَح بناءً على نشاطك في تطبيقات المساحة الخاصّة"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"حسنًا"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> بصمات إصبع"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"لقد أضفت الحد الأقصى لعدد بصمات الإصبع"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"يتعذر إضافة مزيد من بصمات الإصبع"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> لإدارة اتصالات الشبكة لديك؟"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"طلبات الموقع الجغرافي الأخيرة"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"الموقع الجغرافي للملف الشخصي للعمل"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"أذونات التطبيقات لتحديد الموقع الجغرافي"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"خدمة الموقع الجغرافي غير مفعّلة"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{يملك تطبيق واحد من إجمالي {total} تطبيق إذن الوصول إلى بيانات الموقع الجغرافي.}zero{يملك # تطبيق من إجمالي {total} تطبيق إذن الوصول إلى بيانات الموقع الجغرافي.}two{يملك تطبيقان من إجمالي {total} تطبيق إذن الوصول إلى بيانات الموقع الجغرافي.}few{يملك # تطبيقات من إجمالي {total} تطبيق إذن الوصول إلى بيانات الموقع الجغرافي.}many{يملك # تطبيقًا من إجمالي {total} تطبيق إذن الوصول إلى بيانات الموقع الجغرافي.}other{يملك # تطبيق من إجمالي {total} تطبيق إذن الوصول إلى بيانات الموقع الجغرافي.}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"إعادة الضبط"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"اختيار مفتاح التعديل"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"اختيار مفتاح جديد لـ \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"تلقائي"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"الكلام"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"سرعة المؤشر"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"وحدة التحكم في الألعاب"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"الإعدادات العامة"</string>
     <string name="display_category_title" msgid="6638191682294461408">"العرض"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"اللون والصور المتحركة"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"تباين الألوان"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"يعمل التباين العالي على زيادة بروز النص والأزرار والرموز. يمكنك اختيار مستوى التباين الأنسب لك."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"قد لا تتوافق بعض التطبيقات مع كل إعدادات التباين في اللون والنص."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"يمكنك تعديل مظهر الألوان والنص بما يتوافق مع لون خلفية الشاشة."</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"معاينة"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"شروق، وآدم"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"قبل يومَين"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"أتريد المتابعة؟"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"تقرير رحلة العمل"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"للحصول على مساعدة إضافية، يرجى الرجوع \nإلىّ أو إلى شروق. سيكون هذا التقرير"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"نفقات العملاء"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"جعل الشاشة أقل سطوعًا"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"عناصر التحكم في التفاعل"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"عناصر التحكّم في التوقيت"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"غير شفاف"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"نص بدرجة تباين عالية"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"يمكنك تغيير لون النص إلى الأبيض أو الأسود. سيؤدي ذلك إلى زيادة التباين مع الخلفية."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"زيادة تباين النص إلى أقصى حد"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"يمكنك تغيير لون النص إلى الأسود أو الأبيض لزيادة درجة التباين عن الخلفية."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"التحديث التلقائي لتكبير الشاشة"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"تحديث تكبير الشاشة أثناء تنقلات التطبيق"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"إنهاء الاتصال عبر زر التشغيل"</string>
@@ -5127,8 +5111,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"إلغاء"</string>
     <string name="contrast_title" msgid="6885768151336508075">"التباين"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"عادي"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"تلقائي"</string>
     <string name="contrast_medium" msgid="384414510709285811">"متوسط"</string>
     <string name="contrast_high" msgid="3988567609694797696">"مرتفع"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"لا يمكن فتح هذا التطبيق إلا في نافذة واحدة."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 6ec76c3..ea105b1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"সোঁ কাণখন পেয়াৰ কৰক"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"বাওঁ কাণখন পেয়াৰ কৰক"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"আটাইবোৰ উপলব্ধ শুনাৰ ডিভাইচৰ বাবে"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"শুনাৰ ডিভাইচৰ অধিক ছেটিং"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"শ্বৰ্টকাট আৰু টেলিকইল নিয়ন্ত্ৰণৰ দৰে ক্ৰছ-ডিভাইচৰ ছেটিংসমূহ সলনি কৰক"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"এই ডিভাইচটোৰ কাৰণে"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"অডিঅ’ আউটপুট"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"অডিঅ’ আউটপুটৰ বিষয়ে"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"ব্যক্তিগত স্পে’চ ছেট আপ কৰি থকা হৈছে…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ব্যক্তিগত স্পে’চ লক হৈ থাকিলে তাত থকা এপৰ জাননী লুকুওৱা হয়"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"প্ৰাইভেট স্পেচ লুকুৱাই ৰাখিবলৈ আৰু স্বয়ংক্ৰিয়ভাৱে লক কৰাটো ছেট আপ কৰিবলৈ প্ৰাইভেট স্পেচৰ ছেটিঙত অন্বেষণ কৰক"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"প্ৰয়োজনীয় এপ্‌সমূহ ইতিমধ্যে আপোনাৰ প্ৰাইভেট স্পেচত ইনষ্টল কৰা হৈছে"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"কোনো ব্যক্তিগত স্পে’চ ছেট আপ কৰিব পৰা নগ’ল"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"পুনৰ চেষ্টা কৰক"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ব্যক্তিগত স্পে’চ আনলক কৰিবলৈ স্ক্ৰীন লক ব্যৱহাৰ কৰিবনে?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"এপ্ আৰু জাননী"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"লক স্ক্ৰীনত সংবেদনশীল জাননী"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"প্ৰাইভেট স্পেচ আনলক হৈ থকাৰ সময়ত সংবেদনশীল সমল দেখুওৱা"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"আপোনাৰ ডেটা ব্যক্তিগত কৰি ৰখাত সহায় কৰিবলৈ এটা Google একাউণ্ট সৃষ্টি কৰক"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"পৰৱৰ্তী স্ক্ৰীনত আপুনি আপোনাৰ প্ৰাইভেট স্পেচৰ সৈতে ব্যৱহাৰ কৰিবলৈ এটা একাউণ্টত ছাইন ইন কৰিব পাৰিব"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"প্ৰাইভেট স্পেচৰ বাহিৰত তথ্য প্ৰদৰ্শিত হোৱাটো বন্ধ কৰাত সহায় কৰিবলৈ এটা সমৰ্পিত একাউণ্ট সৃষ্টি কৰক, যেনে:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"ছিংক কৰা ফট’, ফাইল, ইমেইল, সম্পৰ্ক, কেলেণ্ডাৰৰ অনুষ্ঠান আৰু আন ডেটা"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"এপ্‌ ডাউনল’ডৰ ইতিহাস আৰু চুপাৰিছসমূহ"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ব্ৰাউজিঙৰ ইতিহাস, বুকমাৰ্ক আৰু ছেভ কৰা পাছৱৰ্ডসমূহ"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"প্ৰাইভেট স্পেচৰ এপ্‌সমূহত আপোনাৰ কাৰ্যকলাপৰ সৈতে সম্পৰ্কিত পৰামৰ্শিত সমল"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"বুজি পালোঁ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"আপুনি <xliff:g id="COUNT">%d</xliff:g> টালৈকে ফিংগাৰপ্ৰিণ্ট যোগ কৰিব পাৰে"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"আপুনি সৰ্বাধিক সংখ্যক ফিংগাৰপ্ৰিণ্টবোৰ যোগ কৰিছে"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"আৰু অধিক ফিংগাৰপ্ৰিণ্ট যোগ কৰিব নোৱাৰি"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"আপোনাৰ নেটৱৰ্কৰ সংযোগসমূহ পৰিচালনা কৰিবলৈ <xliff:g id="NEW_APP">%s</xliff:g>ক ব্যৱহাৰ কৰিবনে?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"শেহতীয়া অৱস্থানৰ অনুৰোধ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ বাবে অৱস্থান"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"এপৰ অৱস্থানৰ অনুমতি"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"অৱস্থান সুবিধা অফ আছে"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} টাৰ ভিতৰত # টা এপে অৱস্থান এক্সেছ কৰিব পাৰে}one{{total} টাৰ ভিতৰত # টা এপে অৱস্থান এক্সেছ কৰিব পাৰে}other{{total} টাৰ ভিতৰত # টা এপে অৱস্থান এক্সেছ কৰিব পাৰে}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ৰিছেট কৰক"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"সংশোধক চাবি বাছনি কৰক"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>ৰ বাবে এটা নতুন চাবি বাছনি কৰক:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ডিফ\'ল্ট"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"কথন"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"পইণ্টাৰৰ বেগ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"গেইম নিয়ন্ত্ৰক"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"সাধাৰণ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ডিছপ্লে’"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ৰং আৰু ম’শ্বন"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"ৰঙৰ কনট্ৰাষ্ট"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"উচ্চ কনট্ৰাষ্টে পাঠ, বুটাম আৰু চিহ্নসমূহক অধিক জিলিকাই ৰাখে। আপোনাৰ বাবে যিটো কনট্ৰাষ্ট আটাইতকৈ ভাল লাগে সেইটো বাছনি কৰক।"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"কিছুমান এপে আটাইবোৰ ৰং আৰু পাঠৰ কনট্ৰাষ্টৰ ছেটিং সমৰ্থন নকৰিবও পাৰে"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"আপোনাৰ স্ক্ৰীনৰ পটভূমিৰ ৰঙৰ বিপৰীতে ৰং আৰু পাঠ কেনেকুৱা দেখা যায় সেইটো মিলাওক"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"পূৰ্বদৰ্শন কৰক"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"হেলেন, এডাম"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"২ দিন পূৰ্বে"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ফ’ল’ আপ কৰিবনে?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"ব্যৱসায়িক ভ্ৰমণৰ ৰিপ’ৰ্ট"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"অধিক সহায়ৰ বাবে মোৰ বা হেলেনৰ \nসৈতে যোগাযোগ কৰক। এই ৰিপ’ৰ্টটো"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"ক্লায়েণ্টৰ সৈতে সম্পৰ্কিত ব্যয়"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"স্ক্ৰীনখন গাঢ় কৰক"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ভাব-বিনিময় নিয়ন্ত্ৰণ"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"সময়ৰ নিয়ন্ত্ৰণ"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"স্বচ্ছ নহয়"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ৰঙৰ উচ্চ প্ৰভেদযুক্ত পাঠ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"পাঠৰ ৰং ক’লা অথবা বগালৈ সলনি কৰক। পটভূমিৰ সৈতে কনট্ৰাষ্ট বৃদ্ধি কৰে।"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"পাঠৰ কনট্ৰাষ্ট সৰ্বাধিক কৰক"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"পটভূমিৰ সৈতে কনট্ৰাষ্ট বৃদ্ধি কৰিবলৈ পাঠৰ ৰং ক’লা বা বগালৈ সলনি কৰক।"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"স্ক্ৰীনৰ বিবৰ্ধন স্বয়ংক্ৰিয়ভাৱে আপডে’ট কৰক"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"এপ্ সঞ্চৰণৰ সময়ত স্ক্ৰীনৰ বিবৰ্ধন আপডে’ট কৰক"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"পাৱাৰ বুটাম টিপিলে কল সমাপ্ত হ\'ব"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"বাতিল কৰক"</string>
     <string name="contrast_title" msgid="6885768151336508075">"কনট্ৰাষ্ট"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"মানক"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ডিফ’ল্ট"</string>
     <string name="contrast_medium" msgid="384414510709285811">"মধ্যমীয়া"</string>
     <string name="contrast_high" msgid="3988567609694797696">"উচ্চ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"এই এপ্‌টো কেৱল ১ খন ৱিণ্ড’ত খুলিব পাৰি"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index c5fb8d4..db6b105 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Sağ qulaqlığı birləşdirin"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Sol qulaqlığı birləşdirin"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Bütün əlçatan eşitmə cihazları üçün"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Digər eşitmə cihazı ayarları"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Qısayol və tele-induktor nizamlayıcıları kimi cihazlararası ayarları dəyişin"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Bu cihaz üçün"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio çıxışı"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Audio çıxışı haqqında"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Məxfi yer ayarlanır…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Kilidli olduqda şəxsi sahə tətbiqlərinin bildirişləri gizlədilir"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Şəxsi sahəni gizlətmək və avtomatik kilidləməni qurmaq üçün şəxsi sahə ayarlarını araşdırın"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Lazımi tətbiqlər şəxsi sahəyə quraşdırılıb"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Şəxsi sahə ayarlanmadı"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Yenidən cəhd edin"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Məxfi yer ekran kilidi ilə açılsın?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Tətbiq və bildirişlər"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Kilid ekranında həssas bildirişlər"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Şəxsi sahə kiliddən çıxarıldıqda həssas kontent göstərilsin"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Datanı məxfi saxlamaq üçün Google Hesabı yaradın"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Növbəti ekranda şəxsi sahədən istifadə üçün hesaba daxil ola bilərsiniz"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Datanın şəxsi məkandan kənarda görünməməsi üçün xüsusi hesab yaradın, məsələn:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinxronlaşdırılmış foto, fayl, e-poçt, kontakt, təqvim hadisələri və digər data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Tətbiq endirmə tarixçəsi və tövsiyələr"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Baxış tarixçəsi, əlfəcinlər və saxlanan parollar"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Şəxsi sahə tətbiqlərindəki fəaliyyətlə bağlı təklif olunan məzmun"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Anladım"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> ədədə qədər barmaq izi əlavə edə bilərsiniz"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Maksimum sayda barmaq izi əlavə etmisiniz"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Daha artıq barmaq izi əlavə edilə bilməz"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Şəbəkə bağlantılarını idarə edilmək üçün <xliff:g id="NEW_APP">%s</xliff:g> istifadə edilsin?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Son məkan sorğuları"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"İş profili üçün yer"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Tətbiq məkanı icazələri"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Məkan deaktivdir"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} tətbiqin məkana giriş icazəsi var}other{#/{total} tətbiqin məkana giriş icazəsi var}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Sıfırlayın"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Dəyişdirici açarı seçin"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> üçün yeni açar seçin:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Defolt"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Nitq"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Kursor sürəti"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Oyun Kontrolleri"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Ümumi"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Rəng və hərəkət"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Rəng kontrastı"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Yüksək kontrast mətn, düymələr və ikonaları fərqləndirir. Ən yaxşı görünən kontrastı seçin."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Bəzi tətbiqlər bütün rəng və mətn kontrastı ayarlarını dəstəkləməyə bilər"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Rənglər və mətni ekranda fərqləndirin"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Önizləyin"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 gün əvvəl"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Davam edilsin?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Biznes səfəri hesabatı"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Əlavə yardım üçün \nmənimlə və ya Helen ilə əlaqə saxlayın. Bu hesabat:"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Klient xərcləri"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranı qaraldın"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Qarşılıqlı əlaqə nəzarəti"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Zamanlama üzrə idarə elementləri"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Qeyri-şəffaf"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Yüksək kontrastlı mətn"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Mətnin rəngini qara və ya ağ edin. Arxa fonla kontrastı maksimum dərəcədə artırır."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Mətn kontrastını artırın"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Arxa fonda kontrastı artırmaq üçün mətn rəngini qara və ya ağa dəyişin."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Ekran böyüdücünü avtomatik güncəlləyin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Tətbiq keçidlərində ekran böyüdücünü güncəlləyin"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Qidalanma düyməsi zəngi sonlandırır"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Ləğv edin"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standart"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Defolt"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Orta"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Yüksək"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Bu tətbiq yalnız 1 pəncərədə açıla bilər"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c5e980c..66f86e0 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Upari desno uvo"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Upari levo uvo"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Za sve dostupne slušne aparate"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Još podešavanja slušnog aparata"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Promenite podešavanja na više uređaja, na primer kontrole prečica i telekoila"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Za ovaj uređaj"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio izlaz"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O audio izlazu"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Podešava se privatni prostor…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Obaveštenja iz aplikacija u privatnom prostoru su skrivena kad je on zaključan"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Istražite podešavanja privatnog prostora da biste ga sakrili i podesili automatsko zaključavanje"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Obavezne aplikacije su već instalirane u privatnom prostoru"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Podešavanje privatnog prostora nije uspelo"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Probaj ponovo"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Otključati privatni prostor otključavanjem ekrana?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikacije i obaveštenja"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Osetljiva obaveštenja na zaključanom ekranu"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Prikazujte osetljiv sadržaj kada je privatni prostor otključan"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Otvorite namenski Google nalog da biste zaštitili privatnost podataka"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na sledećem ekranu možete da se prijavite na nalog koji ćete koristiti sa privatnim prostorom"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Otvorite namenski nalog kako biste sprečili da se izvan privatnog prostora prikazuju podaci, na primer:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinhronizovane slike, fajlovi, imejlovi, kontakti, događaji u kalendaru i drugi podaci"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Istorija preuzimanja aplikacije i preporuke"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Istorija pregledanja, obeleživači i sačuvane lozinke"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Predložen sadržaj povezan sa aktivnostima u aplikacijama iz privatnog prostora"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Važi"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Možete da ih dodate do <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ne možete da dodate još otisaka prstiju"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Želite li da koristite aplikaciju <xliff:g id="NEW_APP">%s</xliff:g> za upravljanje mrežnim vezama?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedavni zahtevi za lokaciju"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za poslovni profil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Dozvole za lokaciju aplikacije"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokacija je isključena"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Pristup lokaciji ima # aplikacija od {total}}one{Pristup lokaciji ima # aplikacija od {total}}few{Pristup lokaciji imaju # aplikacije od {total}}other{Pristup lokaciji ima # aplikacija od {total}}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Resetuj"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Odaberite modifikujući taster"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novi taster za <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Podrazumevano"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Kontroler za igre"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Opšte"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Boja i pokret"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontrast boja"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Veći kontrast ističe tekst, dugmad i ikone. Izaberite kontrast koji vam izgleda najbolje."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Neke aplikacije možda ne podržavaju sva podešavanja za kontrast boja i teksta"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Prilagodite izgled boja i teksta u odnosu na boju pozadine ekrana"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Pregled"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helena, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Pre 2 dana"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Dodatni upit?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Izveštaj o poslovnom putu"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Da biste dobili dodatnu pomoć, obratite se \nmeni ili Heleni. Ovaj izveštaj će biti"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Troškovi klijenta"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjuje ekran"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrole interakcije"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Kontrole vremenskih odrednica"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Nije prozirno"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Promenite boju teksta u crnu ili belu. Maksimalno uvećava kontrast sa pozadinom."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimalno uvećajte kontrast teksta"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Promenite boju teksta u crnu ili belu da biste povećali kontrast sa pozadinom."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Automatski ažuriraj uvelič. ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ažurira uveličavanje ekrana pri prelazu aplikacija"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Dugme za uključivanje prekida poziv"</string>
@@ -5124,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Otkaži"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standardno"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Podrazumevano"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Srednje"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Visoko"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ova aplikacija može da se otvori samo u jednom prozoru"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index e9abf0d..06f6c3f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Спалучыць для правага вуха"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Спалучыць для левага вуха"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Для ўсіх даступных слыхавых апаратаў"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Іншыя налады слыхавога апарата"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Змяніце налады для некалькіх прылад (напрыклад, налады індукцыйнай шпулі і хуткага доступу)"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Для гэтай прылады"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аўдыявыхад"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Пра аўдыявыхад"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Ідзе наладжванне прыватнай прасторы…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Калі доступ да прыватнай прасторы заблакіраваны, апавяшчэнні з дададзеных у яе праграм не паказваюцца"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"У наладах прыватнай прасторы яе можна схаваць і задаць аўтаматычную блакіроўку"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Абавязковыя праграмы ўжо ўсталяваны ў прыватнай прасторы"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Не ўдалося наладзіць прыватную прастору"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Паўтарыць спробу"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Выкарыстоўваць спосаб, выбраны для экрана?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Праграмы і апавяшчэнні"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Апавяшчэнні з канфідэнцыяльнай інфармацыяй на экране блакіроўкі"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Паказваць канфідэнцыяльнае змесціва, калі прыватная прастора разблакіравана"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Стварыце Уліковы запіс Google, каб абараніць свае даныя"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"На наступным экране вы зможаце ўвайсці ва ўліковы запіс, каб выкарыстоўваць яго ў прыватнай прасторы"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Стварыце асобны ўліковы запіс, каб даныя не пападалі за межы вашай прыватнай прасторы. Напрыклад:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Сінхранізаваныя фота, файлы, электронныя лісты, кантакты, падзеі ў календары і іншыя даныя"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Рэкамендацыі і гісторыя спампоўвання праграм"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Гісторыя прагляду сайтаў, закладкі і захаваныя паролі"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Змесціва, прапанаванае з улікам вашых дзеянняў у праграмах з прыватнай прасторы"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Вы можаце дадаць да <xliff:g id="COUNT">%d</xliff:g> адбіткаў пальца"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Вы дадалі максімальную колькасць адбіткаў пальцаў"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Немагчыма дадаць больш адбіткаў пальцаў"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Выкарыстоўваць <xliff:g id="NEW_APP">%s</xliff:g> для кіравання вашымі падлучэннямі да сеткі?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Апошнія запыты геаданых"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Месца для рабочага профілю"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Дазволы на доступ да геаданых"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Вызначэнне месцазнаходжання адключана"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{З {total} праграм # мае доступ да даных месцазнаходжання}one{З {total} праграм # мае доступ да даных месцазнаходжання}few{З {total} праграм # маюць доступ да даных месцазнаходжання}many{З {total} праграм # маюць доступ да даных месцазнаходжання}other{З {total} праграм # маюць доступ да даных месцазнаходжання}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Скінуць"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Выберыце клавішу-мадыфікатар"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Выберыце новы ключ для \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Стандартная"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Маўленне"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Хуткасць указальніка"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Прылада кiравання гульнёй"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Агульныя налады"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дысплэй"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Колер і рух"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Кантраснасць колераў"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Чым вышэйшы кантраст, тым больш прыметнымі з\'яўляюцца тэкст, кнопкі і значкі. Падбярыце такі кантраст, які найбольш падыходзіць вам."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Некаторыя праграмы могуць пакуль што не падтрымліваць усе налады кантрасту колераў і тэксту"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Зрабіце колеры і тэкст больш прыметнымі на фоне экрана"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Перадпрагляд"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Алена, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 дні таму"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Ёсць пытанні?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Справаздача аб камандзіроўцы"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Калі вы хочаце яшчэ нешта спытаць, \nзвярніцеся да мяне або Алены. Гэта справаздача будзе"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Выдаткі кліента"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Зацямніць экран"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Элементы кіравання ўзаемадзеяннем"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Элементы кіравання меткамі часу"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Непразрыстая"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Высокая кантраснасць тэксту"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Змяняйце колер тэксту на чорны ці белы, каб павысіць яго кантраст з фонам."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Максімальная кантраснасць тэксту"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Змяніце колер тэксту на чорны або белы, каб зрабіць яго больш прыметным."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Аўтаматычнае абнаўленне павелiчэння экрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Абнаўленне павелiчэння экрану падчас перахода з прыкладання"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Завяршыць выклік кнопкай сілкавання"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Скасаваць"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Кантрастнасць"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандартная"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Стандартнае значэнне"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Сярэдняя"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Высокая"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Гэту праграму можна адкрыць толькі ў адным акне"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cdabf13..7b1a06e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Дясно ухо: Сдвояване"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Ляво ухо: Сдвояване"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"За всички налични слухови апарати"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Още настройки за слухови апарати"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Променете настройките за различни устройства, като например контролите за преки пътища и телебобини"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"За това устройство"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудиоизход"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Всичко за аудиоизхода"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Частното пространство се настройва…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Известията от приложенията в частното пространство са скрити, когато то е заключено"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Разгледайте настройките за частно пространство, за да скриете такова или да настроите автоматично заключване"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Задължителните приложения вече са инсталирани в частното ви пространство"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Не бе настроено частно пространство"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Нов опит"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Да се отключва ли частното простр. по същия начин?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Приложения и известия"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Поверителни известия на заключения екран"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Показване на деликатно съдържание, когато частното пространство е отключено"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Създайте си профил в Google, за да запазите поверителността на данните си"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"На следващия екран можете да влезете в профил, за да използвате частното си пространство"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Създайте си специален профил, така че данните да не се показват извън частното пространство, като например:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синхронизирани снимки, файлове, имейли, контакти, събития от календара и други данни"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"История на изтеглянията и препоръки за приложения"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"История на сърфиране, отметки и запазени пароли"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Предложено съдържание, свързано с активността ви в приложенията в частното пространство"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Разбрах"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Можете да добавите до <xliff:g id="COUNT">%d</xliff:g> отпечатъка"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Добавихте максималния брой отпечатъци"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Не могат да се добавят още отпечатъци"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Да се използва ли <xliff:g id="NEW_APP">%s</xliff:g> за управление на мрежовите ви връзки?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Скорошни заявки за местопол."</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Местоп. за служ. потр. профил"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Разрешения на приложенията за достъп до местоп."</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Функцията за местоположението е изключена"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# от {total} приложения има достъп до местоположението}other{# от {total} приложения имат достъп до местоположението}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Нулиране"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Избиране на модифициращ клавиш"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Изберете нов ключ за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"По подразбиране"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Говор"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Скорост на курсора"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Контролер за игри"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Общи"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Цвят и движение"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Контраст на цветовете"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"При по-висок контраст текстът, бутоните и иконите се открояват повече. Изберете най-подходящия според вас контраст."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Възможно е някои приложения да не поддържат всички настройки за контраст на текста и цветовете"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Коригирайте как цветовете и текстът да изпъкват спрямо цвета на фона на екрана ви"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Визуализация"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелън, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Преди 2 дни"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Посл. действ.?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Отчет за командировка"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"За допълнителна помощ, моля, свържете се с \nмен или Хелън. Този отчет ще бъде"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Разходи на клиента"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затъмняване на екрана"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Контроли за взаимодействие"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Контроли за времевия интервал при докосване"</string>
@@ -2120,7 +2106,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"За да използвате функцията за достъпност, прекарайте три пръста нагоре от долната част на екрана.\n\nЗа превключване между функциите прекарайте три пръста нагоре и задръжте."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"Разбрах"</string>
     <string name="accessibility_tutorial_dialog_link_button" msgid="6797349445794031781">"Настройки за бутона"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Пряк път за <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Пряк път за: <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Бутон за достъпност"</string>
     <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="5489284264414421286">"Жест за достъпност"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Бързо плъзгане нагоре с 2 пръста"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Непрозрачен"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Текст с висок контраст"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Променете цвета на текста на черен или бял. Така контрастът с фона се увеличава максимално."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Увеличаване на контраста на текста"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Променете цвета на текста на черен или бял, за да увеличите контраста спрямо фона."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Авт. актуал. на увеличението на екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Актуал. на увеличението на екрана при преходи на прилож."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Край на обажд. с бутона за вкл./изкл."</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Отказ"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контраст"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандартен"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"По подразбиране"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Среден"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Висок"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Това приложение може да се отвори само в 1 прозорец"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 59bfa28..21283ee 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"ডানদিকেরটি পেয়ার করুন"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"বাঁদিকেরটি পেয়ার করুন"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"উপলভ্য সব হিয়ারিং ডিভাইসের জন্য"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"হিয়ারিং ডিভাইস সংক্রান্ত আরও বেশি সেটিংস"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"শর্টকাট ও টেলিকয়েল কন্ট্রোলের মতো ক্রস-ডিভাইস সেটিংস পরিবর্তন করুন"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"এই ডিভাইসের জন্য"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"অডিও আউটপুট"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"অডিও আউটপুট সম্পর্কে"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"প্রাইভেট স্পেস সেট-আপ করা হচ্ছে…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"এটি লক করা থাকলে প্রাইভেট স্পেস অ্যাপ থেকে বিজ্ঞপ্তি লুকানো থাকে"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"প্রাইভেট স্পেস লুকাতে ও অটোমেটিক লক সেট-আপ করতে প্রাইভেট স্পেসের সেটিংস ঘুরে দেখুন"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"প্রয়োজনীয় অ্যাপ আগেই আপনার প্রাইভেট স্পেসে ইনস্টল করা আছে"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"কোনও প্রাইভেট স্পেস সেট-আপ করা যায়নি"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"আবার চেষ্টা করুন"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"প্রাইভেট স্পেস আনলক করতে স্ক্রিন লক ব্যবহার করবেন?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"অ্যাপ ও বিজ্ঞপ্তি"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"লক স্ক্রিনে সংবেদনশীল বিজ্ঞপ্তি"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"প্রাইভেট স্পেস আনলক করা থাকলে সংবেদনশীল কন্টেন্ট দেখুন"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"আপনার ডেটা ব্যক্তিগত রাখতে Google অ্যাকাউন্ট তৈরি করুন"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"পরবর্তী স্ক্রিনে আপনার প্রাইভেট স্পেসের সাথে ব্যবহার করতে কোনও অ্যাকাউন্টে সাইন-ইন করতে পারবেন"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"প্রাইভেট স্পেসের বাইরে ডেটা দেখতে পাওয়া বন্ধ করতে একটি ডেডিকেটেড অ্যাকাউন্ট তৈরি করুন, যেমন:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"সিঙ্ক করা ফটো, ফাইল, ইমেল, পরিচিতি, ক্যালেন্ডারের ইভেন্ট ও অন্যান্য ডেটা"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"অ্যাপ ডাউনলোড করার ইতিহাস ও সাজেশন"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ব্রাউজিং ইতিহাস, বুকমার্ক ও সেভ করা বুকমার্ক"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"প্রাইভেট স্পেস অ্যাপে আপনার অ্যাক্টিভিটি সম্পর্কিত সাজেস্ট করা কন্টেন্ট"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"বুঝেছি"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"আপনি সর্বাধিক <xliff:g id="COUNT">%d</xliff:g>টি ফিঙ্গারপ্রিন্ট যোগ করতে পারবেন"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"আপনি অনুমোদিত সর্বোচ্চ সংখ্যক আঙ্গুলের ছাপ যোগ করেছেন"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"এর বেশি আঙ্গুলের ছাপ যোগ করা যাবে না"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"আপনার নেটওয়ার্ক কানেকশন পরিচালনা করার জন্য <xliff:g id="NEW_APP">%s</xliff:g> ব্যবহার করবেন?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"সাম্প্রতিক লোকেশন অনুরোধগুলি"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"অফিস প্রোফাইলের জন্য লোকেশন"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"অ্যাপের ক্ষেত্রে লোকেশনের অনুমতি"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"লোকেশন বন্ধ করা আছে"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total}টি অ্যাপের মধ্যে #টি লোকেশন অ্যাক্সেস করতে পারবে}one{{total}টি অ্যাপের মধ্যে #টি লোকেশন অ্যাক্সেস করতে পারবে}other{{total}টি অ্যাপের মধ্যে #টি লোকেশন অ্যাক্সেস করতে পারবে}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"রিসেট করুন"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"\'মডিফায়ার কী\' বেছে নেওয়া"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-এর জন্য নতুন \'কী\' বেছে নিন:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ডিফল্ট"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"স্পিচ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"পয়েন্টারের গতি"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"গেম নিয়ন্ত্রক"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"সাধারণ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ডিসপ্লে"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"রঙ এবং মোশন"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"কালার কনট্রাস্ট"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"চড়া কনট্রাস্ট টেক্সট, বোতাম ও আইকনকে আরও বেশি আলাদা করে তোলে। আপনার কাছে যে কনট্রাস্ট সেরা মনে হবে সেটি বেছে নিন।"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"কিছু অ্যাপ সব রঙ ও টেক্সট কন্ট্রাস্ট সেটিংসে কাজ নাও করতে পারে"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"আপনার স্ক্রিনের ব্যাকগ্রাউন্ডের রঙ হিসেবে রঙ ও টেক্সট কেমন দেখাবে তা অ্যাডজাস্ট করুন"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"প্রিভিউ করুন"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"হেলেন, অ্যাডাম"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"২ দিন আগে"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ফলো-আপ করবেন?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"ব্যবসা ট্রিপ সম্পর্কিত রিপোর্ট"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"আরও বেশি সহায়তার জন্য, আমার\nবা হেলেনের সাথে যোগাযোগ করুন। এই রিপোর্ট হবে"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"ক্লায়েন্ট সম্পর্কিত খরচ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"স্ক্রিনের উজ্জ্বলতা কমান"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ইন্টারঅ্যাকশন নিয়ন্ত্রণগুলি"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"সময় সংক্রান্ত কন্ট্রোল"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"নন-ট্রান্সপারেন্ট"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"উচ্চ কনট্রাস্ট যুক্ত পাঠ্য"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"কালো অথবা সাদাতে টেক্সটের রঙ পরিবর্তন করুন। এটির জন্য ব্যাকগ্রাউন্ডের হিসেবে কনট্রাস্ট বেড়ে যায়।"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"টেক্সটের কনট্রাস্ট বাড়িয়ে নিন"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ব্যাকগ্রাউন্ডের মাধ্যমে কনট্রাস্ট বাড়াতে টেক্সটের রঙ কালো বা সাদাতে পরিবর্তন করুন।"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"স্ক্রিন বৃহত্তরীকরণ স্বতঃ আপডেট"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"অ্যাপ্লিকেশান ট্রানজিশনের উপর স্ক্রিন বৃহত্তরীকরণ আপডেট"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"পাওয়ার বোতামে কল শেষ হয়"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"বাতিল করুন"</string>
     <string name="contrast_title" msgid="6885768151336508075">"কনট্রাস্ট"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"স্ট্যান্ডার্ড"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ডিফল্ট"</string>
     <string name="contrast_medium" msgid="384414510709285811">"মিডিয়াম"</string>
     <string name="contrast_high" msgid="3988567609694797696">"হাই"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"এই অ্যাপটি শুধুমাত্র ১টি উইন্ডোতে খোলা যেতে পারে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 8f3586f..a44b4fa 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Upari desno uho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Upari lijevo uho"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Za sve dostupne slušne aparate"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Više postavki slušnog aparata"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Promijenite postavke na više uređaja kao što su prečica i kontrole telezavojnica"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Za ovaj uređaj"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Izlaz zvuka"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informacije o izlazu zvuka"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Postavljanje privatnog prostora…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Obavještenja iz aplikacija u privatnom prostoru su sakrivena kada je prostor zaključan"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Istražite postavke privatnog prostora da sakrijete privatni prostor i postavite automatsko zaključavanje"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Potrebne aplikacije su već instalirane u privatnom prostoru"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Postavljanje privatnog prostora nije uspjelo"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Pokušaj ponovo"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Koristiti zaklj. ekrana za otklj. priv. prostora?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikacije i obavještenja"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Osjetljiva obavještenja na zaključanom ekranu"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Prikaz osjetljivog sadržaja kada je privatni prostor otključan"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Kreirajte Google račun da zaštitite privatnost podataka"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na sljedećem ekranu se možete prijaviti na račun da ga koristite s privatnim prostorom"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Kreirajte namjenski račun da spriječite pojavljivanje podataka izvan privatnog prostora, npr.:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinhronizirajte slike, fajlove, e-poruke, kontakte, događaje u kalendaru i druge podatke"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historija preuzimanja aplikacija i preporuke"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historija pregledanja, oznake i sačuvane lozinke"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Predloženi sadržaj povezan s aktivnošću u aplikacijama u privatnom prostoru"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Razumijem"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Broj otisaka prstiju koje možete dodati: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nije moguće dodati još otisaka prstiju"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Koristiti <xliff:g id="NEW_APP">%s</xliff:g> za upravljanje vašim mrežnim vezama?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedavni zahtjevi za lokaciju"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za radni profil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Odobrenja lokacije za aplikacije"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokacija je isključena"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# od {total} aplik. ima pristup lokaciji}one{# od {total} aplik. imaju pristup lokaciji}few{# od {total} aplik. imaju pristup lokaciji}other{# od {total} aplik. imaju pristup lokaciji}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Poništi"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Odaberite modifikacijsku tipku"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novu tipku za \"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>\":"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Zadano"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Kontroler za igre"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Opće"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Boja i pokret"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontrast boja"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Viši kontrast omogućava veću istaknutost teksta, dugmadi i ikona. Odaberite kontrast koji vam izgleda najbolje."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Određene aplikacije možda neće podržavati sve postavke kontrasta boja i teksta"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Podesite način na koji boje i tekst izgledaju u odnosu na boju pozadine ekrana"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Pregledajte"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Prije 2 dana"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Dodatni upit?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Izvještaj o poslovnom putovanju"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Za dodatnu pomoć kontaktirajte \nmene ili Helenu. Izvještaj će biti"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Troškovi klijenta"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjivanje ekrana"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrole za interakciju"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Kontrole za vrijeme"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Nije providno"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Promjena boje teksta u crnu ili bijelu. Maksimalno se povećava kontrast s pozadinom."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimiziraj kontrast teksta"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Promijenite boju teksta u crnu ili bijelu da povećate kontrast s pozadinom."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Automatsko ažurir. uvećav. ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ažurira uvećavanje ekrana kod prelaza aplikacija"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Dugme uklj./isklj. prekida poziv"</string>
@@ -5124,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Otkaži"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standardno"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Zadano"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Srednje"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Visoko"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ova aplikacija se može otvoriti samo u 1 prozoru"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index de7883d..287ac48 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Vincula la dreta"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Vincula l\'esquerra"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Per a tots els audiòfons disponibles"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Més opcions de configuració de l\'audiòfon"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Canvia la configuració multidispositiu, com ara els controls de drecera i telebobina"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Per a aquest dispositiu"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Sortida d\'àudio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Sobre la sortida d\'àudio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"S\'està configurant l\'espai privat…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Quan està bloquejat, les notificacions de les aplicacions de l\'espai privat s\'amaguen"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Explora la configuració de l\'espai privat per amagar-lo i configurar el bloqueig automàtic"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Les aplicacions requerides ja estan instal·lades a l\'espai privat"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"No s\'ha pogut configurar un espai privat"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Torna-ho a provar"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Vols utilitzar el bloqueig de pantalla per desbloquejar l\'espai privat?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplicacions i notificacions"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notificacions sensibles a la pantalla de bloqueig"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Mostra contingut sensible quan l\'espai privat està desbloquejat"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Crea un Compte de Google per ajudar a mantenir la privacitat de les teves dades"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"A la pantalla següent pots iniciar la sessió a un compte per utilitzar-lo a l\'espai privat"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Crea un compte dedicat per fer que les dades deixin d\'aparèixer fora de l\'espai privat, com ara:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotos, fitxers, correus, contactes, esdeveniments del calendari i altres dades sincronitzats"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historial de baixades d\'aplicacions i recomanacions"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historial de naveg., adreces d\'interès i contrasenyes desades"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Contingut suggerit relacionat amb la teva activitat en aplicacions de l\'espai privat"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Entesos"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Pots afegir un màxim de <xliff:g id="COUNT">%d</xliff:g> empremtes digitals"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Has afegit el nombre màxim d\'empremtes digitals"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No es poden afegir més empremtes digitals"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> per gestionar les connexions de la xarxa?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Sol·licituds d\'ubicació recents"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ubicació per al perfil de treball"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permisos d\'ubicació d\'aplicacions"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La ubicació està desactivada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# de {total} aplicacions té accés a la ubicació}other{# de {total} aplicacions tenen accés a la ubicació}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Restableix"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Tria la tecla modificadora"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Tria una tecla nova per a <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminat"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Parla"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocitat del punter"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de joc"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visualització"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Color i moviment"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contrast de color"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Un contrast més alt fa que el text, els botons i les icones destaquin més. Tria el contrast que més t\'agradi."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Pot ser que algunes aplicacions encara no admetin totes les opcions de configuració de contrast de color i text"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajusta com es veuen els colors i el text sobre el color del fons de pantalla"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Previsualitza"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Fa 2 dies"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Vols seguir?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Informe de viatge de negocis"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Per obtenir més assistència, contacta amb \nmi o la Helen. L\'informe serà"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Despeses del client"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Enfosqueix la pantalla"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controls d\'interacció"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Controls de temps"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"No transparent"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text d\'alt contrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Canvia el color del text a blanc o negre. Maximitza el contrast amb el fons."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximitza el contrast del text"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Canvia el color del text a negre o blanc per augmentar el contrast amb el fons."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Actualitza ampliació automàticament"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Actualitza augment pantalla a transicions aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"El botó d\'engegada penja"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Cancel·la"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Estàndard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Predeterminat"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Mitjà"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Alt"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Aquesta aplicació només pot obrir-se en 1 finestra"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c78b7e3..b9edaa1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Spárovat pravé ucho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Spárovat levé ucho"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Pro všechna dostupná naslouchátka"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Další nastavení naslouchátek"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Změnit nastavení pro více zařízení, jako jsou ovládací prvky zkratek nebo naslouchátek"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Pro toto zařízení"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Zvukový výstup"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informace o zvukovém výstupu"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Nastavování soukromého prostoru…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Když je soukromý prostor uzamčen, jsou oznámení aplikací v soukromém prostoru skryta"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Pokud chcete skrýt soukromý prostor a nastavit automatické uzamknutí, přejděte do nastavení soukromého prostoru"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Povinné aplikace už jsou v soukromém prostoru nainstalované"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Soukromý prostor se nepodařilo nastavit"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Zkusit znovu"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Používat zámek obrazovky k odemknutí s. prostoru?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikace a oznámení"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Citlivá oznámení na obrazovce uzamčení"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Zobrazovat citlivý obsah, když je soukromý prostor odemčen"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Vytvořte si účet Google za účelem zabezpečení dat"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na další obrazovce se můžete přihlásit k účtu, který chcete používat se soukromým prostorem"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Vytvořte si speciální účet, aby se mimo soukromý prostor nezobrazovala vaše data, jako například:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synchronizované fotky, soubory, e-maily, kontakty, události v kalendáři a další data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historie a doporučení stahování aplikací"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Procházení historie, záložek a uložených hesel"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Navrhovaný obsah související s vaší aktivitou v aplikacích v soukromém prostoru"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Rozumím"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Maximální počet otisků prstů, které lze přidat: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Přidali jste maximální počet otisků prstů"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Další otisky prstů nelze přidat"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedávné žádosti o určení polohy"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Umístění pracovního profilu"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Oprávnění aplikací pro přístup k poloze"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Určování polohy je vypnuto"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Přístup k poloze má # z {total} aplikací}few{Přístup k poloze mají # z {total} aplikací}many{Přístup k poloze má # z {total} aplikací}other{Přístup k poloze má # z {total} aplikací}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Resetovat"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Vyberte modifikační klávesu"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vyberte novou klávesu pro <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Výchozí"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Řeč"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Rychlost kurzoru"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Herní ovladače"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Obecné"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazení"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Barvy a pohyb"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Barevný kontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Text, tlačítka a ikony při vyšším kontrastu více vyniknou. Vyberte kontrast, který vám nejvíc vyhovuje."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Některé aplikace nemusí podporovat všechna nastavení kontrastu barev a textu"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Upravit vzhled barev a textu vůči barvě pozadí obrazovky"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Náhled"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"před 2 dny"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Sledovat?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Hlášení o služební cestě"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Pokud potřebujete pomoct, obraťte se na \nmě nebo na Helen. Toto hlášení bude"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Klientské výdaje"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ztmavit obrazovku"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktivní ovládací prvky"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Ovládací prvky časování"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Neprůhledné"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text s vysokým kontrastem"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Změnit barvu textu na černou nebo bílou, čímž se maximalizuje kontrast vůči pozadí."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximalizovat kontrast textu"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Změnit barvu textu na černou nebo bílou a zvýšit tak kontrast vůči pozadí"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Automaticky aktualizovat přiblížení"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Aktual. přiblížení obrazovky při přepnutí aplikací"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Vypínač ukončí hovor"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Zrušit"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standardní"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Výchozí"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Střední"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Vysoká"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Tuto aplikaci lze otevřít jen v jednom okně"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5940836..4347f3d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Par højre apparat"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Par venstre apparat"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"For alle tilgængelige høreapparater"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Flere indstillinger for høreapparater"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Skift indstillinger på alle enheder, f.eks. indstillinger for genveje og teleslynger"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"For denne enhed"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Lydudgang"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Om lydudgang"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Konfigurerer et privat område…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Notifikationer fra apps i dit private område er skjult, når området er låst"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"I indstillingerne for private områder kan du skjule et privat område og konfigurere automatisk låsning"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Påkrævede apps er allerede installeret i dit private område"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Et privat område kunne ikke konfigureres"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Prøv igen"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Brug skærmlås til at låse dit private område op?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apps og notifikationer"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Følsomme notifikationer på låseskærmen"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Vis følsomt indhold, når det private område er låst op"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Opret en Google-konto for at hjælpe med at beskytte dine data"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"På den næste skærm kan du logge på en konto, du vil bruge med dit private område"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Opret en dedikeret konto for at hjælpe med at undgå, at data vises uden for det private område, f.eks.:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synkroniserede billeder, filer, mails, kontakter, kalenderbegivenheder og andre data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historik for appdownload og anbefalinger"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Browserhistorik, bogmærker og gemte adgangskoder"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Foreslået indhold, der er relateret til din aktivitet i apps i det private område"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kan tilføje op til <xliff:g id="COUNT">%d</xliff:g> fingeraftryk"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du har tilføjet det maksimale antal fingeraftryk"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Du kan ikke tilføje flere fingeraftryk"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Vil du bruge <xliff:g id="NEW_APP">%s</xliff:g> til at administrere dine netværksforbindelser?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Seneste lokationsanmodninger"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokation for arbejdsprofil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Lokationstilladelse for apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokation er slået fra"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# ud af {total} apps har adgang til din lokation}one{# ud af {total} apps har adgang til din lokation}other{# ud af {total} apps har adgang til din lokation}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Nulstil"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Vælg ændringstast"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vælg en ny ændringstast til <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Tale"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Markørens hastighed"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Spillekontroller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Generelt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visning"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Farve og bevægelse"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Farvekontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Højere kontrast gør tekst, knapper og ikoner tydeligere. Vælg den kontrast, du foretrækker."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Visse apps understøtter ikke alle indstillinger for farve- og tekstkontrast"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Juster, hvordan farver og tekst ser ud mod baggrundsfarven på din skærm"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Se forhåndsvisning"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 dage siden"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Vil du følge op?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Forretningsrejserapport"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Kontakt mig eller Helen, hvis du har brug \nfor mere hjælp. Denne rapport er"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Kundeudgifter"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gør skærmen mørkere"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionsstyring"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Tidsrelaterede styringselementer"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Ikke-gennemsigtig"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst med høj kontrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Skift tekstfarven til sort eller hvid. Dette maksimerer kontrasten med baggrunden."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimér tekstkontrast"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Skift tekstfarven til sort eller hvid for at øge kontrasten mod baggrunden."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Opdater skærmforstørrelse automatisk"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Opdater skærmforstørrelsen på appovergange"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Afbryderknap afslutter opkald"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Annuller"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Standard"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Middel"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Høj"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Denne app kan kun åbnes i 1 vindue"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 65593bf..b427616 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Rechtes Ohr koppeln"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Linkes Ohr koppeln"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Für alle verfügbaren Hörgeräte"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Mehr Hörgeräteeinstellungen"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Du kannst die geräteübergreifenden Einstellungen wie Tastenkombinations- und Hörspuleneinstellungen ändern."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Für dieses Gerät"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audioausgabe"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informationen zur Audioausgabe"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Der private Bereich wird eingerichtet…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Benachrichtigungen von Apps im privaten Bereich werden nicht angezeigt, wenn dieser gesperrt ist"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Du kannst die Einstellungen konfigurieren, um den privaten Bereich auszublenden und automatisch sperren zu lassen"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Notwendige Apps sind bereits in deinem privaten Bereich installiert"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Der private Bereich konnte nicht eingerichtet werden"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Noch einmal versuchen"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Privaten Bereich mit Displaysperre entsperren?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apps und Benachrichtigungen"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Sensible Benachrichtigungen auf dem Sperrbildschirm"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Sensible Inhalte werden angezeigt, wenn der private Bereich entsperrt ist"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Ein Google-Konto zum Schutz deiner Daten erstellen"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Auf dem nächsten Bildschirm kannst du dich in einem Konto anmelden, das du für deinen privaten Bereich nutzen möchtest."</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Erstelle ein eigenes Konto, um das Risiko zu minimieren, dass Daten außerhalb des privaten Bereichs erscheinen, wie:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synchronisierte Fotos, Dateien, E-Mails, Kontakte, Kalendertermine und andere Daten"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Verlauf der App-Downloads und Empfehlungen"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Browserverlauf, Lesezeichen und gespeicherte Passwörter"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Vorgeschlagene Inhalte in Bezug auf deine Aktivitäten in Apps im privaten Bereich"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Ok"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Fingerabdrücke hinzufügen."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du hast die maximale Anzahl an Fingerabdrücken hinzugefügt"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Es können keine Fingerabdrücke mehr hinzugefügt werden"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"<xliff:g id="NEW_APP">%s</xliff:g> zur Verwaltung von Netzwerkverbindungen nutzen?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Letzte Standortanfragen"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Standort für Arbeitsprofil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Berechtigungen zur Standortermittlung"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Standortermittlung ist deaktiviert"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# von {total} Apps hat Zugriff auf den Standort}other{# von {total} Apps haben Zugriff auf den Standort}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Zurücksetzen"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Modifikatortaste wählen"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Wähle eine neue Taste für <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Spracheingabe, -erkennung und -ausgabe"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Zeigergeschwindigkeit"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Gamecontroller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Allgemein"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Farbe und Bewegung"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Farbkontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Durch einen stärkeren Kontrast stechen Texte, Schaltflächen und Symbole mehr hervor. Wähle den Kontrast, der für dich am besten aussieht."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Einige Apps unterstützen eventuell noch nicht alle Farb- und Textkontrasteinstellungen."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Du kannst anpassen, wie Farben und Text vor der Hintergrundfarbe deines Bildschirms dargestellt werden."</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Vorschau"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Vor 2 Tagen"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Abklären?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Bericht zur Geschäftsreise"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Falls du weitere Unterstützung benötigst, kontaktiere bitte \nmich oder Helen. Dieser Bericht wird"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Kundenausgaben"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bildschirm dunkler machen"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionssteuerung"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Einstellungen für Zeitvorgaben"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Nicht transparent"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text mit hohem Kontrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Textfarbe in Schwarz oder Weiß ändern. Maximiert den Kontrast zum Hintergrund."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Textkontrast maximieren"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Du kannst die Textfarbe in Schwarz oder Weiß ändern, um einen stärkeren Kontrast zum Hintergrund zu schaffen."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Vergrößerung automatisch aktualisieren"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Vergrößerung bei App-Übergängen aktualisieren"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Ein/Aus-Taste beendet Anruf"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Abbrechen"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Standard"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Mittel"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Hoch"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Diese App kann nur in einem einzigen Fenster geöffnet werden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 33c949a..d25b21b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Σύζευξη δεξιού"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Σύζευξη αριστερού"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Για όλες τις διαθέσιμες συσκευές ακοής"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Περισσότερες ρυθμίσεις συσκευής ακοής"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Αλλάξτε τις ρυθμίσεις πολλών συσκευών, όπως στοιχεία ελέγχου συντομεύσεων και telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Για αυτήν τη συσκευή"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Έξοδος ήχου"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Σχετικά με την έξοδο ήχου"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Ρύθμιση ιδιωτικού χώρου…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Οι ειδοποιήσεις από εφαρμογές του απόρρητου χώρου είναι κρυφές όταν είναι κλειδωμένος"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Εξερευνήστε τις ρυθμίσεις απόρρητου χώρου για απόκρυψη του απόρρητου χώρου και ρύθμιση του αυτόματου κλειδώματος"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Οι απαιτούμενες εφαρμογές έχουν ήδη εγκατασταθεί στον απόρρητο χώρο σας"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Δεν ήταν δυνατή η ρύθμιση ενός απόρρητου χώρου"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Επανάληψη"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Χρήση κλειδώματος οθόνης για τον ιδιωτικό χώρο;"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Εφαρμογές και ειδοποιήσεις"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Ευαίσθητες ειδοποιήσεις στην οθόνη κλειδώματος"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Εμφάνιση ευαίσθητου περιεχομένου όταν ο απόρρητος χώρος είναι ξεκλειδωμένος"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Δημιουργήστε έναν Λογαριασμό Google για να διατηρήσετε ιδιωτικά τα δεδομένα σας"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Στην επόμενη οθόνη μπορείτε να συνδεθείτε σε έναν λογαριασμό για χρήση με τον απόρρητο χώρο σας"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Δημιουργήστε έναν αποκλειστικό λογαριασμό ώστε τα δεδομένα να μην εμφανίζονται εκτός του απόρρητου χώρου, όπως:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Συγχρονισμένες φωτογρ., αρχεία, μηνύμ .ηλ. ταχυδρ., επαφές, συμβ. ημερολ. και άλλα δεδομ."</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Ιστορικό λήψης εφαρμογών και προτάσεις"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Ιστορ. περιήγ., σελιδοδείκτες και αποθηκ. κωδικοί πρόσβασης"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Προτεινόμενο περιεχόμενο σχετικά με τη δραστηριότητά σας σε εφαρμογές του απόρρητου χώρου"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Το κατάλαβα"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Μπορείτε να προσθέσετε έως <xliff:g id="COUNT">%d</xliff:g> δακτυλικά αποτυπώματα"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Έχετε προσθέσει τον μέγιστο αριθμό δακτυλικών αποτυπωμάτων"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Δεν είναι δυνατή η προσθήκη περισσότερων δακτυλικών αποτυπωμάτων"</string>
@@ -1379,7 +1368,7 @@
     <string name="storage_menu_migrate" msgid="2196088149560070193">"Μετεγκατάσταση δεδομένων"</string>
     <string name="storage_menu_forget" msgid="5154017890033638936">"Διαγραφή"</string>
     <string name="storage_menu_set_up" msgid="4401074025612064744">"Ρύθμιση"</string>
-    <string name="storage_menu_free" msgid="616100170298501673">"Απελευθερώστε χώρο"</string>
+    <string name="storage_menu_free" msgid="616100170298501673">"Αποδεσμεύστε χώρο"</string>
     <string name="storage_menu_manage" msgid="7465522758801346408">"Διαχείριση αποθηκευτικού χώρου"</string>
     <string name="storage_free_up_space_title" msgid="281047807372131975">"Αποδεσμεύστε χώρο"</string>
     <string name="storage_free_up_space_summary" msgid="6650027929735481350">"Μεταβείτε στην εφαρμογή Files για να διαχειριστείτε και να αποδεσμεύσετε αποθηκευτικό χώρο"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Χρήση της εφαρμογής <xliff:g id="NEW_APP">%s</xliff:g> για τη διαχείριση των συνδέσεων δικτύου σας;"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Πρόσφατα αιτήματα τοποθεσίας"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Τοποθεσία για προφίλ εργασίας"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Άδειες τοποθεσίας εφαρμογών"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Η τοποθεσία είναι ανενεργή"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# από {total} εφαρμογές έχει πρόσβαση στην τοποθεσία σας.}other{# από {total} εφαρμογές έχουν πρόσβαση στην τοποθεσία σας.}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Επαναφορά"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Επιλέξτε πλήκτρο τροποποίησης"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Επιλέξτε ένα νέο κλειδί για <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Προεπιλογή"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Ομιλία"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Ταχύτητα δείκτη"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Χειριστήριο παιχνιδιού"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Γενικά"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Οθόνη"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Χρώμα και κίνηση"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Χρωματική αντίθεση"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Η υψηλότερη αντίθεση επιτρέπει στο κείμενο, τα κουμπιά και τα εικονίδια να ξεχωρίζουν περισσότερο. Επιλέξτε την αντίθεση που προτιμάτε."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Ορισμένες εφαρμογές μπορεί να μην υποστηρίζουν όλες τις ρυθμίσεις χρώματος και αντίθεσης κειμένου"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Προσαρμόστε την εμφάνιση των χρωμάτων και του κειμένου σε σχέση με το χρώμα φόντου της οθόνης σας"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Προεπισκόπηση"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ημέρες πριν"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Συνέχεια;"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Αναφορά επαγγελμ. ταξιδιού"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Για περισσότερη βοήθεια, επικοινωνήστε \nμαζί μου ή με τη Helen. Αυτή η αναφορά θα είναι"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Έξοδα πελάτη"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Κάντε την οθόνη πιο σκοτεινή"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Στοιχεία ελέγχου αλληλεπίδρασης"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Στοιχεία ελέγχου χρονισμού"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Μη διαφανές"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Κείμενο υψηλής αντίθεσης"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Αλλαγή χρώματος του κειμένου σε μαύρο ή λευκό. Μεγιστοποιεί την αντίθεση με το φόντο."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Μεγιστοποίηση αντίθεσης κειμένου"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Αλλάξτε το χρώμα του κειμένου σε μαύρο ή λευκό για να αυξήσετε την αντίθεση σε σχέση με το φόντο."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Αυτόματη ενημέρωση μεγέθυνσης οθόν."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ενημέρωση μεγέθυνσης οθόνης στις μεταβάσεις εφαρμ."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Τερματ. κλήσης με κουμπί λειτουργίας"</string>
@@ -4201,7 +4185,7 @@
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Εμφάνιση συμβάντων εργασίας στο προσωπικό ημερολόγιο"</string>
     <string name="managed_profile_settings_footer" msgid="996500759305118103">"Όταν οι εφαρμογές εργασίας είναι απενεργοποιημένες, τίθενται σε παύση, δεν μπορούν να σας στείλουν ειδοποιήσεις και δεν μπορείτε να αποκτήσετε πρόσβαση σε αυτές."</string>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Διαχείριση αποθηκευτικού χώρου"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Η Διαχείριση αποθηκευτικού χώρου βοηθά στην απελευθέρωση αποθηκευτικού χώρου καταργώντας από τη συσκευή σας φωτογραφίες και βίντεο για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας."</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Η Διαχείριση αποθηκευτικού χώρου βοηθά στην αποδέσμευση αποθηκευτικού χώρου καταργώντας από τη συσκευή σας φωτογραφίες και βίντεο για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Κατάργηση φωτογραφιών και βίντεο"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Διαχείριση αποθηκευτικού χώρου"</string>
     <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Χρήση Διαχειριστή αποθηκευτικού χώρου."</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Ακύρωση"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Αντίθεση"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Τυπική"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Προεπιλογή"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Μέτρια"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Υψηλή"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Αυτή η εφαρμογή μπορεί να ανοίξει μόνο σε ένα παράθυρο"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index ceb4aec..32ceb15 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Use <xliff:g id="NEW_APP">%s</xliff:g> to manage your network connections?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Recent location requests"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"App location permissions"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# of {total} apps has access to location}other{# of {total} apps have access to location}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Reset"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Choose modifier key"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 9ac89f5..18fe40a 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -915,10 +915,8 @@
     <string name="wifi_settings_wep_networks_summary_blocked_by_carrier" msgid="6085673947156094523">"Your carrier doesn\'t allow you to connect to this network because it uses an older security protocol that’s less secure"</string>
     <string name="wifi_settings_wep_networks_button_allow" msgid="2807926329019873706">"Allow WEP"</string>
     <string name="wifi_settings_ssid_block_button_close" msgid="3013886895576949908">"Close"</string>
-    <!-- no translation found for wifi_settings_wep_networks_disconnect_title (2158070405309246888) -->
-    <skip />
-    <!-- no translation found for wifi_settings_wep_networks_disconnect_summary (643132352152685538) -->
-    <skip />
+    <string name="wifi_settings_wep_networks_disconnect_title" msgid="2158070405309246888">"Disconnect from <xliff:g id="NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="643132352152685538">"You\'re connected to a WEP network. If you block these networks, you\'ll be disconnected."</string>
     <string name="wifi_show_advanced" msgid="2969378109942071741">"Advanced options"</string>
     <string name="wifi_advanced_toggle_description" msgid="7299179796727934885">"Drop down list Advanced Options"</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="3615140699129928913">"expand"</string>
@@ -1542,6 +1540,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Use <xliff:g id="NEW_APP">%s</xliff:g> to manage your network connections?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Recent location requests"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"App location permissions"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# of {total} apps has access to location}other{# of {total} apps have access to location}}"</string>
@@ -1875,14 +1875,11 @@
     <string name="show_ime" msgid="4334255501724746849">"Use on-screen keyboard"</string>
     <string name="show_ime_summary" msgid="7293345791727205975">"Keep it on screen while physical keyboard is active"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"Bounce keys"</string>
-    <!-- no translation found for bounce_keys_summary (7347050868868080302) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7347050868868080302">"The keyboard ignores quickly repeated presses of the same key within <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
     <string name="slow_keys" msgid="2891452895499690837">"Slow keys"</string>
-    <!-- no translation found for slow_keys_summary (1784371292745423292) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="1784371292745423292">"Adjusts the time it takes for a key press to activate to <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"Sticky keys"</string>
-    <!-- no translation found for sticky_keys_summary (1844953803625480623) -->
-    <skip />
+    <string name="sticky_keys_summary" msgid="1844953803625480623">"Press one key at a time for shortcuts instead of holding keys down together"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Keyboard shortcuts"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Show list of shortcuts"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Work profile keyboards &amp; tools"</string>
@@ -1936,7 +1933,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Reset"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Choose modifier key"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
@@ -1992,8 +1995,7 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customize this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"Screen reader"</string>
-    <!-- no translation found for keyboard_category_title (6841712758039893220) -->
-    <skip />
+    <string name="keyboard_category_title" msgid="6841712758039893220">"Physical keyboard options"</string>
     <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
     <string name="general_category_title" msgid="6298579528716834157">"General"</string>
@@ -2243,12 +2245,10 @@
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Hold volume keys"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Triple tap screen"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Edit accessibility shortcuts"</string>
-    <!-- no translation found for accessibility_shortcut_edit_screen_prompt (5966054283114856682) -->
-    <skip />
+    <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"Choose your shortcut for %1$s"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Continue"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"Hearing devices"</string>
-    <!-- no translation found for accessibility_hearingaid_intro (6686620444104350629) -->
-    <skip />
+    <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"Set up and manage ASHA and LE Audio hearing aids, cochlear implants, and other amplification devices"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="7438018718889849521">"No hearing devices connected"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Add hearing aids"</string>
     <string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"Pair hearing aids"</string>
@@ -2266,8 +2266,7 @@
     <string name="accessibility_hac_mode_title" msgid="2037950424429555652">"Hearing aid compatibility"</string>
     <string name="accessibility_hac_mode_summary" msgid="5198760061256669067">"Improves compatibility with telecoils and reduces unwanted noise"</string>
     <string name="accessibility_hearing_device_about_title" msgid="7883758309646288250">"About hearing devices"</string>
-    <!-- no translation found for accessibility_hearing_device_footer_summary (256061045064940818) -->
-    <skip />
+    <string name="accessibility_hearing_device_footer_summary" msgid="256061045064940818">"To find other hearing devices that aren’t supported by ASHA or LE Audio, tap "<b>"Pair new device"</b>" &gt; "<b>"See more devices"</b></string>
     <string name="accessibility_hearing_device_pairing_page_title" msgid="6608901091770850295">"Pair hearing device"</string>
     <string name="accessibility_hearing_device_pairing_intro" msgid="7022201665808166517">"You can pair ASHA and LE Audio hearing devices on this page. Make sure your hearing device is turned on and ready to pair."</string>
     <string name="accessibility_found_hearing_devices" msgid="637407580358386553">"Available hearing devices"</string>
@@ -4917,12 +4916,9 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"Helps identify the relative position of nearby devices that have UWB"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Turn off Airplane mode to use UWB"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"UWB is unavailable in the current location"</string>
-    <!-- no translation found for thread_network_settings_title (4212301030523859220) -->
-    <skip />
-    <!-- no translation found for thread_network_settings_summary (8065599651021748339) -->
-    <skip />
-    <!-- no translation found for thread_network_settings_summary_airplane_mode (7207252895832446979) -->
-    <skip />
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"Thread"</string>
+    <string name="thread_network_settings_summary" msgid="8065599651021748339">"Connect to compatible devices using Thread for a seamless smart home experience"</string>
+    <string name="thread_network_settings_summary_airplane_mode" msgid="7207252895832446979">"Turn off airplane mode to use Thread"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"Camera access"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"Microphone access"</string>
     <string name="perm_toggle_description" msgid="5754629581767319022">"For apps and services"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4144ee0..813f4b5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Use <xliff:g id="NEW_APP">%s</xliff:g> to manage your network connections?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Recent location requests"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"App location permissions"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# of {total} apps has access to location}other{# of {total} apps have access to location}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Reset"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Choose modifier key"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3b9e025..091ff00 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Use <xliff:g id="NEW_APP">%s</xliff:g> to manage your network connections?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Recent location requests"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"App location permissions"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# of {total} apps has access to location}other{# of {total} apps have access to location}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Reset"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Choose modifier key"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choose a new key for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 64063d0..20ad68c 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -915,10 +915,8 @@
     <string name="wifi_settings_wep_networks_summary_blocked_by_carrier" msgid="6085673947156094523">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎Your carrier doesn\'t allow you to connect to this network because it uses an older security protocol that’s less secure‎‏‎‎‏‎"</string>
     <string name="wifi_settings_wep_networks_button_allow" msgid="2807926329019873706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎Allow WEP‎‏‎‎‏‎"</string>
     <string name="wifi_settings_ssid_block_button_close" msgid="3013886895576949908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎Close‎‏‎‎‏‎"</string>
-    <!-- no translation found for wifi_settings_wep_networks_disconnect_title (2158070405309246888) -->
-    <skip />
-    <!-- no translation found for wifi_settings_wep_networks_disconnect_summary (643132352152685538) -->
-    <skip />
+    <string name="wifi_settings_wep_networks_disconnect_title" msgid="2158070405309246888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎Disconnect from ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_wep_networks_disconnect_summary" msgid="643132352152685538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎You\'re connected to a WEP network. If you block these networks, you\'ll be disconnected.‎‏‎‎‏‎"</string>
     <string name="wifi_show_advanced" msgid="2969378109942071741">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎Advanced options‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_toggle_description" msgid="7299179796727934885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎Drop down list Advanced Options‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="3615140699129928913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎expand‎‏‎‎‏‎"</string>
@@ -1542,6 +1540,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎Use ‎‏‎‎‏‏‎<xliff:g id="NEW_APP">%s</xliff:g>‎‏‎‎‏‏‏‎ to manage your network connections?‎‏‎‎‏‎"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎Recent location requests‎‏‎‎‏‎"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎Location for work profile‎‏‎‎‏‎"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎App location permissions‎‏‎‎‏‎"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎Location is off‎‏‎‎‏‎"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎# of ‎‏‎‎‏‏‎{total}‎‏‎‎‏‏‏‎ apps has access to location‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎# of ‎‏‎‎‏‏‎{total}‎‏‎‎‏‏‏‎ apps have access to location‎‏‎‎‏‎}}"</string>
@@ -1875,14 +1875,11 @@
     <string name="show_ime" msgid="4334255501724746849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎Use on-screen keyboard‎‏‎‎‏‎"</string>
     <string name="show_ime_summary" msgid="7293345791727205975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎Keep it on screen while physical keyboard is active‎‏‎‎‏‎"</string>
     <string name="bounce_keys" msgid="7419450970351743904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎Bounce keys‎‏‎‎‏‎"</string>
-    <!-- no translation found for bounce_keys_summary (7347050868868080302) -->
-    <skip />
+    <string name="bounce_keys_summary" msgid="7347050868868080302">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎The keyboard ignores quickly repeated presses of the same key within ‎‏‎‎‏‏‎<xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms‎‏‎‎‏‎"</string>
     <string name="slow_keys" msgid="2891452895499690837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎Slow keys‎‏‎‎‏‎"</string>
-    <!-- no translation found for slow_keys_summary (1784371292745423292) -->
-    <skip />
+    <string name="slow_keys_summary" msgid="1784371292745423292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎Adjusts the time it takes for a key press to activate to ‎‏‎‎‏‏‎<xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g>‎‏‎‎‏‏‏‎ ms‎‏‎‎‏‎"</string>
     <string name="sticky_keys" msgid="7317317044898161747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎Sticky keys‎‏‎‎‏‎"</string>
-    <!-- no translation found for sticky_keys_summary (1844953803625480623) -->
-    <skip />
+    <string name="sticky_keys_summary" msgid="1844953803625480623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎Press one key at a time for shortcuts instead of holding keys down together‎‏‎‎‏‎"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎Keyboard shortcuts‎‏‎‎‏‎"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎Show list of shortcuts‎‏‎‎‏‎"</string>
     <string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎Work profile keyboards &amp; tools‎‏‎‎‏‎"</string>
@@ -1936,7 +1933,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎Reset‎‏‎‎‏‎"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎Choose modifier key‎‏‎‎‏‎"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎Choose a new key for ‎‏‎‎‏‏‎<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎:‎‏‎‎‏‎"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎Default‎‏‎‎‏‎"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎Speech‎‏‎‎‏‎"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎Pointer speed‎‏‎‎‏‎"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎Game Controller‎‏‎‎‏‎"</string>
@@ -1992,8 +1995,7 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎You can customize this device to fit your needs. These accessibility features can be changed later in Settings.‎‏‎‎‏‎"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎Change font size‎‏‎‎‏‎"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎Screen reader‎‏‎‎‏‎"</string>
-    <!-- no translation found for keyboard_category_title (6841712758039893220) -->
-    <skip />
+    <string name="keyboard_category_title" msgid="6841712758039893220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎Physical keyboard options‎‏‎‎‏‎"</string>
     <string name="captions_category_title" msgid="574490148949400274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎Captions‎‏‎‎‏‎"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎Audio‎‏‎‎‏‎"</string>
     <string name="general_category_title" msgid="6298579528716834157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎General‎‏‎‎‏‎"</string>
@@ -2243,12 +2245,10 @@
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎Hold volume keys‎‏‎‎‏‎"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎Triple tap screen‎‏‎‎‏‎"</string>
     <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎Edit accessibility shortcuts‎‏‎‎‏‎"</string>
-    <!-- no translation found for accessibility_shortcut_edit_screen_prompt (5966054283114856682) -->
-    <skip />
+    <string name="accessibility_shortcut_edit_screen_prompt" msgid="5966054283114856682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎Choose your shortcut for %1$s‎‏‎‎‏‎"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎Continue‎‏‎‎‏‎"</string>
     <string name="accessibility_hearingaid_title" msgid="1263619711863375614">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎Hearing devices‎‏‎‎‏‎"</string>
-    <!-- no translation found for accessibility_hearingaid_intro (6686620444104350629) -->
-    <skip />
+    <string name="accessibility_hearingaid_intro" msgid="6686620444104350629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎Set up and manage ASHA and LE Audio hearing aids, cochlear implants, and other amplification devices‎‏‎‎‏‎"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="7438018718889849521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎No hearing devices connected‎‏‎‎‏‎"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎Add hearing aids‎‏‎‎‏‎"</string>
     <string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎Pair hearing aids‎‏‎‎‏‎"</string>
@@ -2266,8 +2266,7 @@
     <string name="accessibility_hac_mode_title" msgid="2037950424429555652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎Hearing aid compatibility‎‏‎‎‏‎"</string>
     <string name="accessibility_hac_mode_summary" msgid="5198760061256669067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎Improves compatibility with telecoils and reduces unwanted noise‎‏‎‎‏‎"</string>
     <string name="accessibility_hearing_device_about_title" msgid="7883758309646288250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎About hearing devices‎‏‎‎‏‎"</string>
-    <!-- no translation found for accessibility_hearing_device_footer_summary (256061045064940818) -->
-    <skip />
+    <string name="accessibility_hearing_device_footer_summary" msgid="256061045064940818">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎To find other hearing devices that aren’t supported by ASHA or LE Audio, tap ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Pair new device‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ &gt; ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎See more devices‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="accessibility_hearing_device_pairing_page_title" msgid="6608901091770850295">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎Pair hearing device‎‏‎‎‏‎"</string>
     <string name="accessibility_hearing_device_pairing_intro" msgid="7022201665808166517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎You can pair ASHA and LE Audio hearing devices on this page. Make sure your hearing device is turned on and ready to pair.‎‏‎‎‏‎"</string>
     <string name="accessibility_found_hearing_devices" msgid="637407580358386553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎Available hearing devices‎‏‎‎‏‎"</string>
@@ -4917,12 +4916,9 @@
     <string name="uwb_settings_summary" msgid="3074271396764672268">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎Helps identify the relative position of nearby devices that have UWB‎‏‎‎‏‎"</string>
     <string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎Turn off airplane mode to use UWB‎‏‎‎‏‎"</string>
     <string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎UWB is unavailable in the current location‎‏‎‎‏‎"</string>
-    <!-- no translation found for thread_network_settings_title (4212301030523859220) -->
-    <skip />
-    <!-- no translation found for thread_network_settings_summary (8065599651021748339) -->
-    <skip />
-    <!-- no translation found for thread_network_settings_summary_airplane_mode (7207252895832446979) -->
-    <skip />
+    <string name="thread_network_settings_title" msgid="4212301030523859220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎Thread‎‏‎‎‏‎"</string>
+    <string name="thread_network_settings_summary" msgid="8065599651021748339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎Connect to compatible devices using Thread for a seamless smart home experience‎‏‎‎‏‎"</string>
+    <string name="thread_network_settings_summary_airplane_mode" msgid="7207252895832446979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎Turn off airplane mode to use Thread‎‏‎‎‏‎"</string>
     <string name="camera_toggle_title" msgid="8952668677727244992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎Camera access‎‏‎‎‏‎"</string>
     <string name="mic_toggle_title" msgid="265145278323852547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎Microphone access‎‏‎‎‏‎"</string>
     <string name="perm_toggle_description" msgid="5754629581767319022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎For apps and services‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 63bda37..7b7697c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"¿Deseas usar <xliff:g id="NEW_APP">%s</xliff:g> para administrar tus conexiones de red?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Solicitudes de ubicaciones recientes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ubicación de perfil de trabajo"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permisos de ubicación de apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La ubicación está desactivada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# de {total} apps tiene acceso a la ubicación}other{# de {total} apps tienen acceso a la ubicación}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Restablecer"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Elegir tecla modificadora"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Elige una nueva tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminadas"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de juegos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1ef2f48..7d861fb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Emparejar derecho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Emparejar izquierdo"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Para todos los audífonos disponibles"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Más ajustes de audífonos"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Cambia los ajustes multidispositivo, como los controles de combinación de teclas y telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Para este dispositivo"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Salida de audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Acerca de la salida de audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando espacio privado…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Las notificaciones de las aplicaciones del espacio privado se ocultan si está bloqueado"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Consulta los ajustes del espacio privado para ocultarlo y definir un bloqueo automático"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Las aplicaciones requeridas ya están instaladas en tu espacio privado"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"No se ha podido crear el espacio privado"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Reintentar"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"¿Usar bloqueo de pantalla para desbloquear espacio?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplicaciones y notificaciones"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notificaciones sensibles en la pantalla de bloqueo"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Se muestra contenido sensible cuando el espacio privado está desbloqueado"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Crea una cuenta de Google para proteger la privacidad de tus datos"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"En la siguiente pantalla, podrás iniciar sesión en una cuenta para usarla con tu espacio privado"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Crea una cuenta específica para evitar que aparezcan datos fuera del espacio privado, como:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotos, archivos, correos, contactos, eventos del calendario y otros datos sincronizados"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historial de descarga de aplicaciones y recomendaciones"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historial de navegación, marcadores y contraseñas guardadas"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Contenido sugerido relacionado con tu actividad en las aplicaciones del espacio privado"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Entendido"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Has añadido el número máximo de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No se pueden añadir más huellas digitales"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"¿Usar <xliff:g id="NEW_APP">%s</xliff:g> para administrar tus conexiones de red?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Solicitudes de ubicación recientes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ubicación para el perfil de trabajo"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permisos de ubicación de aplicaciones"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La ubicación está desactivada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# de {total} aplicaciones tiene acceso a la ubicación}other{# de {total} aplicaciones tienen acceso a la ubicación}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Restablecer"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Elige una tecla modificadora"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Elige una nueva tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminado"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocidad del puntero del ratón"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Mandos de videojuegos"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visualización"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Color y movimiento"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contraste de color"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Un mayor contraste hace que el texto, los botones e iconos destaquen más. Elige el contraste que más te guste."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Puede que algunas aplicaciones no admitan todos los ajustes de contraste de color y texto"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajusta el aspecto de los colores y el texto con respecto al color del fondo de pantalla"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Previsualizar"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Hace 2 días"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"¿Seguir?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Informe del viaje de negocios"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Para recibir más ayuda, ponte en contacto \nconmigo o con Helen. Este informe"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Gastos del cliente"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Oscurecer pantalla"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interacción"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Controles de tiempo"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"No transparente"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Cambia el color del texto a blanco o negro para maximizar el contraste con el fondo"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximizar el contraste del texto"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Cambia el color del texto a blanco o negro para aumentar el contraste con el fondo."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Actualizar ampliación automáticamente"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Actualizar ampliación de la pantalla al cambiar aplicaciones"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Colgar con botón de encendido"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Cancelar"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contraste"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Estándar"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Predeterminado"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Medio"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Alto"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Esta aplicación solo puede abrirse en una ventana"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 6131d97..c722c77 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Seo parempoolne"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Seo vasakpoolne"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Kõigi saadaolevate kuuldeseadmete jaoks"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Rohkem kuuldeseadme seadeid"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Muutke seadmeüleseid seadeid, nagu otseteed ja telecoili juhtelemendid"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Selle seadme jaoks"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Heliväljund"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Teave heliväljundi kohta"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Privaatse ruumi seadistamine …"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Kui privaatne ruum on lukustatud, siis on privaatse ruumi rakenduste märguanded peidetud"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Uurige privaatse ruumi seadeid, et privaatne ruum peita ja seadistada automaatne lukustamine"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Nõutavad rakendused on teie privaatsesse ruumi juba installitud"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Privaatset ruumi ei saanud seadistada"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Proovi uuesti"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Kas kasutada privaatse ruumi avamiseks ekraanilukku?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Rakendused ja märguanded"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Tundlikud märguanded lukustuskuval"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Kuva tundlik sisu, kui privaatne ruum on avatud"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"looge Google\'i konto, et oma andmed privaatsena hoida"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Järgmisel ekraanikuval saate sisse logida kontole, mida kasutada oma privaatse ruumiga"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Looge spetsiaalne konto, et aidata peatada andmete kuvamine väljaspool privaatset ruumi, näiteks:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sünkroonitud fotod, failid, meilid, kontaktid, kalendrisündmused ja muud andmed"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Rakenduse allalaadimiste ajalugu ja soovitused"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Sirvimisajalugu, järjehoidjad ja salvestatud paroolid"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Privaatse ruumi rakendustes teie tegevusega seotud soovitatud sisu"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Selge"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Saate lisada kuni <xliff:g id="COUNT">%d</xliff:g> sõrmejälge"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Olete lisanud maksimaalse arvu sõrmejälgi"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Rohkem sõrmejälgi ei saa lisada"</string>
@@ -824,7 +813,7 @@
     <string name="bluetooth_empty_list_bluetooth_off" msgid="7326727272747345476">"Kui Bluetooth on sisse lülitatud, saab seade suhelda teiste lähikonna Bluetooth-seadmetega"</string>
     <string name="bluetooth_empty_list_bluetooth_off_auto_on_available" msgid="5833847615853525971">"Kui Bluetooth on sees, saab seade suhelda teiste lähikonna Bluetooth-seadmetega Funktsioonid, nagu Kiirjagamine, Leia mu seade ja seadme asukoht, kasutavad Bluetoothi."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="786648535600075223">"Kui Bluetooth on sisse lülitatud, saab teie seade suhelda teiste läheduses olevate Bluetooth-seadmetega.\n\nSeadme kasutuskogemuse täiustamiseks saavad rakendused ja teenused endiselt igal ajal otsida läheduses olevaid seadmeid isegi siis, kui Bluetooth on välja lülitatud. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks. Saate seda muuta Bluetoothi skannimise seadetes."</string>
-    <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="5047787966768730069">"Kui Bluetooth on sees, saab seade suhelda teiste lähikonna Bluetooth-seadmetega Funktsioonid, nagu Kiirjagamine, Leia mu seade ja seadme asukoht, kasutavad Bluetoothi.\n\nRakendused ja teenused saavadendiselt igal ajal otsida läheduses olevaid seadmeid isegi siis, kui Bluetooth on välja lülitatud. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks. Saate seda muuta Bluetoothi skannimise seadetes."</string>
+    <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="5047787966768730069">"Kui Bluetooth on sees, saab seade suhelda teiste lähikonna Bluetooth-seadmetega Funktsioonid, nagu Kiirjagamine, Leia mu seade ja seadme asukoht, kasutavad Bluetoothi.\n\nRakendused ja teenused saavad endiselt igal ajal otsida läheduses olevaid seadmeid isegi siis, kui Bluetooth on välja lülitatud. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks. Saate seda muuta Bluetoothi skannimise seadetes."</string>
     <string name="bluetooth_scan_change" msgid="1744636222637390367">"Muutke"</string>
     <string name="device_details_title" msgid="1155622417516195481">"Seadme üksikasjad"</string>
     <string name="bluetooth_device_keyboard_settings_preference_title" msgid="3411693160917620519">"Klaviatuuriseaded"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Kas kasutada võrguühenduste haldamiseks rakendust <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Hiljutised asukohapäringud"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Tööprofiili asukohaluba"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Asukohale juurdepääsu load"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Asukoht on välja lülitatud"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# rakendusel {total}-st on asukohale juurdepääs}other{# rakendusel {total}-st on asukohale juurdepääs}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Lähtesta"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Muuteklahvi valimine"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Valige muuteklahvi <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> jaoks uus klahv:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Vaikeseade"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Kõne"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Kursori kiirus"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Mängukontroller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Üldine"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekraan"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Värvid ja liigutused"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Värvi kontrastsus"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Suurem kontrastsus muudab teksti, nupud ja ikoonid väljapaistvamaks. Valige kontrastsus, mis tundub teie jaoks kõige sobivam."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Mõni rakendus ei pruugi kõiki värvi ja teksti kontrastsuse seadeid toetada"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Kohandage, kuidas värvid ja tekst ekraani taustavärvil välja näevad"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Eelvaade"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 päeva tagasi"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Kas täpsustada?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Ärireisi aruanne"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Lisaabi saamiseks võtke ühendust \nminu või Heleniga. See aruanne"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Kliendi kulud"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekraanikuva muutmine tumedamaks"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktsiooni juhtnupud"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Ajastuse juhtelemendid"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Läbipaistmatu"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Suure kontrastsusega tekst"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Muutke tekst mustaks või valgeks. Maksimeerib kontrasti taustaga."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Teksti kontrastsuse maksimeerimine"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Muutke tekst mustaks või valgeks, et kontrastsust taustaga suurendada."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Ekraanisuurenduse värskendus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ekraanisuurenduse kasutus rakenduste vahetamisel"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Toitenupp lõpetab kõne"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Tühista"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrastsus"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Tavaline"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Vaikeseade"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Keskmine"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Kõrge"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Selle rakenduse saab avada ainult ühes aknas"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d1f7270..5b89afd 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Parekatu eskuineko audifonoa"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Parekatu ezkerreko audifonoa"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Entzumen-gailu erabilgarri guztietarako"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Entzumen-gailuen ezarpen gehiago"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Aldatu gailuarteko ezarpenak, hala nola lasterbideak eta teleharilak kontrolatzeko aukerak"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Gailu honetarako"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio-irteera"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Audio-irteerari buruz"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Eremu pribatua konfiguratzen…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Eremu pribatua blokeatuta badago, hango aplikazioen jakinarazpenak ezkutatzen dira"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Arakatu eremu pribatuko ezarpenak eremu pribatua ezkutatzeko eta blokeo automatikoa konfiguratzeko"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Beharrezko aplikazioak jada instalatuta daude eremu pribatuan"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Ezin izan da konfiguratu eremu pribatu bat"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Saiatu berriro"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Pantailaren blokeoa erabili nahi duzu eremu pribatua desblokeatzeko?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikazioak eta jakinarazpenak"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Kontuzko jakinarazpenak pantaila blokeatuan"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Erakutsi kontuzko edukia eremu pribatua desblokeatuta dagoenean"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Sortu Google-ko kontu bat datuak pribatu mantentzeko"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Hurrengo pantailan, eremu pribatuarekin erabili nahi duzun kontuan saioa hasi ahalko duzu"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Sortu beste kontu bat datuak ez daitezen agertu eremu pribatutik kanpo; adibidez, hauek:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinkronizatutako argazkiak, fitxategiak, mezu elektronikoak, kontaktuak, egutegiko gertaerak eta beste datuak"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Aplikazioen deskargen historia eta gomendioak"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Arakatze-historia, laster-markak eta gordetako pasahitzak"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Eremu pribatuko aplikazioetako jarduerekin lotuta iradokitako edukia"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Ados"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> hartz-marka gehi ditzakezu gehienez"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Iritsi zara onartzen den gehieneko hatz-marka kopurura"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ezin duzu gehitu beste hatz-markarik"</string>
@@ -962,7 +951,7 @@
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5,0 GHz-eko banda hobetsia"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"IParen ezarpenak"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"Pribatutasuna"</string>
-    <string name="wifi_privacy_mac_settings" msgid="3188060664478313363">"MAC"</string>
+    <string name="wifi_privacy_mac_settings" msgid="3188060664478313363">"MACa"</string>
     <string name="wifi_privacy_device_name_settings" msgid="3699130177041345275">"Gailuaren izena"</string>
     <string name="wifi_privacy_send_device_name_toggle_title" msgid="1228107313152880073">"Bidali gailuaren izena"</string>
     <string name="wifi_privacy_send_device_name_toggle_summary" msgid="5995365836332817655">"Partekatu gailuaren izena sarearekin"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"<xliff:g id="NEW_APP">%s</xliff:g> erabili nahi duzu sareko konexioak kudeatzeko?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Azken kokapen-eskaerak"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Laneko profilaren kokapena"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Aplikazioen kokapen-baimenak"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Kokapena desaktibatuta dago"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} aplikaziok kokapena atzi dezake}other{#/{total} aplikaziok kokapena atzi dezakete}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Berrezarri"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Aukeratu tekla aldatzailea"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Aukeratu <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> teklarako beste tekla bat:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Lehenetsia"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Hizketa"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Erakuslearen abiadura"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Bideo-jokoen kontrolagailua"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Orokorrak"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantaila"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Koloreak eta mugimendua"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kolore-kontrastea"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Kontraste handiagoarekin, gehiago nabarmentzen dira testua, botoiak eta ikonoak. Aukeratu gehien gustatzen zaizun kontraste-maila."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Baliteke oraindik aplikazio batzuek ez onartzea kolore- eta testu-kontrasteen ezarpen guztiak"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Doitu koloreek eta testuak zure pantailaren atzeko planoaren aurrean duten itxura"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Aurrebista"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Duela 2 egun"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Jarraipena egin nahi duzu?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Laneko bidaiaren txostena"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Laguntza gehiago lortzeko, jarri \nnirekin edo Helenekin harremanetan. Txosten hau izango da:"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Bezeroaren gastuak"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ilundu pantaila"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interakzioa kontrolatzeko aukerak"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Denbora kontrolatzeko aukerak"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Gardentasunik gabe"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Kontraste handiko testua"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Aldatu testuaren kolorea beltzera edo zurira. Atzeko planoarekiko kontrastea handitzen du."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximizatu testuaren kontrastea"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Aldatu testuaren kolorea beltzera edo zurira atzeko planoarekiko kontrastea areagotzeko."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Eguneratu auto. pantaila-handiagotzea"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Eguneratu handiagotzea aplik. batetik bestera pasatzean."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Amaitu deiak etengailuarekin"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Utzi"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrastea"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Arrunta"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Lehenetsia"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Tartekoa"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Altua"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Leiho bakar batean ireki daiteke aplikazioa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 63533b1..edcfb5a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"جفت کردن گوش راست"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"جفت کردن گوش چپ"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"برای همه دستگاه‌های شنیداری (سمعک) دردسترس"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"تنظیمات بیشتر دستگاه کمک‌شنوایی"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"تنظیمات بین دستگاهی مانند کنترل‌های تله‌کویل و میان‌بر را تغییر دهید"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"برای این دستگاه"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"خروجی صوتی"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"درباره خروجی صوتی"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"درحال راه‌اندازی فضای خصوصی…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"اعلان‌های برنامه‌های فضای خصوصی هنگام قفل بودن فضا پنهان می‌شوند"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"برای پنهان کردن فضای خصوصی و تنظیم قفل خودکار، تنظیمات فضای خصوصی را کاوش کنید"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"برنامه‌های ضروری قبلاً در فضای خصوصی شما نصب شده‌اند"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"فضای خصوصی راه‌اندازی نشد"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"امتحان مجدد"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"از قفل صفحه برای باز کردن قفل فضای خصوصی استفاده شود؟"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"برنامه‌ها و اعلان‌ها"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"اعلان‌های حساس در صفحه قفل"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"وقتی قفل فضای خصوصی باز است، محتوای حساس نمایش داده می‌شود"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"‏برای کمک به خصوصی نگه داشتن داده‌هایتان، «حساب Google» ایجاد کنید"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"در صفحه بعدی می‌توانید وارد حساب شوید تا با آن از فضای خصوصی خود استفاده کنید"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"برای کمک به جلوگیری از نمایش داده‌ها در خارج از فضای خصوصی، حساب اختصاصی ایجاد کنید، برای مثال:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"عکس‌ها، فایل‌ها، ایمیل‌ها، مخاطبین، رویدادهای تقویم، و داده‌های دیگر همگام‌سازی شده است"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"تاریخچه بارگیری برنامه و توصیه‌ها"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"سابقه مرور، نشانک‌ها و گذرواژه‌های ذخیره‌شده"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"محتوای پیشنهادی مرتبط با فعالیتتان در برنامه‌های فضای خصوصی"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"متوجه‌ام"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"می‌توانید حداکثر <xliff:g id="COUNT">%d</xliff:g> اثرانگشت اضافه کنید"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"حداکثر تعداد اثرانگشت را اضافه کرده‌اید"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"نمی‌توانید اثرانگشت‌های بیشتری اضافه کنید"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"برای مدیریت ارتباطات شبکه‌تان از <xliff:g id="NEW_APP">%s</xliff:g> استفاده می‌کنید؟"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"درخواست‌های اخیر موقعیت مکانی"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"محل نمایه کارتان"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"اجازه‌های مکان برنامه"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"مکان خاموش است"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# برنامه از {total} برنامه به مکان دسترسی دارد}one{# برنامه از {total} برنامه به مکان دسترسی دارد}other{# برنامه از {total} برنامه به مکان دسترسی دارد}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"بازنشانی"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"کلید توصیف‌گر را انتخاب کنید"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"کلید جدیدی برای <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> انتخاب کنید:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"پیش‌فرض"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"گفتار"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"سرعت اشاره‌گر"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"دسته کنترل بازی"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"کلی"</string>
     <string name="display_category_title" msgid="6638191682294461408">"نمایشگر"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"رنگ و حرکت"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"کنتراست رنگ"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"کنتراست بیشتر باعث می‌شود متن، دکمه‌ها، و نمادها بیشتر برجسته شوند. کنتراستی را انتخاب کنید که به‌نظرتان بهترین است."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"ممکن است برخی‌از برنامه‌ها از همه تنظیمات کنتراست رنگ و متن پشتیبانی نکنند"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"رنگ‌ها و متن را در برابر رنگ پس‌زمینه صفحه‌نمایشتان تنظیم کنید"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"پیش‌نمایش"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"هلن و آدام"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"۲ روز پیش"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"پیگیری می‌کنید؟"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"گزارش سفر کاری"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"برای کمک بیشتر، لطفاً با \nمن یا هلن تماس بگیرید. این گزارش ایجاد خواهد شد"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"هزینه‌های کارخواه"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"تیره‌تر کردن صفحه"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"کنترل‌های تعامل"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"کنترل‌های زمان‌بندی"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"غیرشفاف"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"نوشتار با کنتراست بالا"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"رنگ نوشتار را به سیاه یا سفید تغییر می‌دهد. تضاد با پس‌زمینه را به‌حداکثر می‌رساند."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"بیشینه‌سازی کنتراست متن"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"برای افزایش کنتراست با پس‌زمینه، رنگ متن را به سیاه یا سفید تغییر دهید."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"به‌روزرسانی خودکار درشت‌‌نمایی صفحه"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"به‌روزرسانی درشت‌‌نمایی صفحه در انتقال‌های برنامه"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"قطع تماس با دکمه روشن/خاموش"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"لغو"</string>
     <string name="contrast_title" msgid="6885768151336508075">"تضاد"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"استاندارد"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"پیش‌فرض"</string>
     <string name="contrast_medium" msgid="384414510709285811">"متوسط"</string>
     <string name="contrast_high" msgid="3988567609694797696">"بالا"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"این برنامه فقط در ۱ پنجره می‌تواند باز شود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 49e3deb..0db33d9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Liitä oikea korva"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Liitä vasen korva"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Kaikille saatavilla oleville kuulolaitteille"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Lisää kuulolaiteasetuksia"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Muuta laitteidenvälisiä asetuksia, kuten pikanäppäimiä ja induktiivisia ohjaimia"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Tälle laitteelle"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audion toistotapa"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Tietoa audion toistotavasta"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Yksityistä tilaa otetaan käyttöön…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Ilmoitukset yksityisen tilan sovelluksista ovat piilotettuina, kun se on lukittu"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Tutki yksityisen tilan asetuksia, joilla voit piilottaa tilan ja ottaa automaattisen lukituksen käyttöön"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Vaaditut sovellukset on jo asennettu yksityiseen tilaan"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Yksityisen tilan käyttöönotto epäonnistui"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Yritä uudelleen"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Käytetäänkö avaamiseen näytön lukitusta?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Sovellukset ja ilmoitukset"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Arkaluontoiset ilmoitukset lukitusnäytöllä"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Näytä arkaluontoinen sisältö, kun yksityisen tilan lukitus on avattuna"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Luo Google-tili, jotta voit pitää datasi yksityisenä"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Seuraavalla näytöllä voit kirjautua sisään tilille, jota voit käyttää yksityisessä tilassa"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Luo oma tili, jotta voit lopettaa datan näkymisen yksityisen tilan ulkopuolella, esimerkiksi:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synkronoidut kuvat, tiedostot, sähköpostit, yhteystiedot, kalenteritapahtumat ja muu data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Sovellusten lataushistoria ja suositukset"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Selaushistoria, kirjanmerkit ja tallennetut salasanat"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Toimintaasi perustuva ehdotettu sisältö yksityisen tilan sovelluksissa"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Voit lisätä korkeintaan <xliff:g id="COUNT">%d</xliff:g> sormenjälkeä"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Et voi lisätä useampia sormenjälkiä."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Enempää sormenjälkiä ei voi lisätä."</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Hallinnoidaanko verkkoyhteyksiä sovelluksella <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Viimeisimmät sijaintipyynnöt"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Työprofiilin sijainti"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Sovellusten sijaintiluvat"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Sijainti ei ole käytössä"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} sovelluksella on pääsyoikeus sijaintiin}other{#/{total} sovelluksella on pääsyoikeus sijaintiin}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Nollaa"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Valitse muokkausnäppäin"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Valitse uusi näppäin (<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>):"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Oletus"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Puhe"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Osoittimen nopeus"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Peliohjaimet"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Yleiset"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Näyttö"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Väri ja liike"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Värikontrasti"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Korkeampi kontrasti tekee tekstistä, painikkeita ja kuvakkeista näkyvämpiä. Valitse haluamasi kontrasti."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Jotkin sovellukset eivät välttämättä tue kaikkia väri‑ ja tekstikontrastin asetuksia"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Muuta värien ja tekstin näkyvyyttä puhelimen taustaväriä vasten"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Esikatselu"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helena, Aatu"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 päivää sitten"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Kysyttävää?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Yritysmatkan raportti"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Jos tarvitset lisäapua, ota yhteyttä \nminuun tai Helenaan. Tämän raportin aihe on"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Asiakkaan kulut"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Tummenna näyttöä"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Käytönhallinta"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Ajoitussäätimet"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Läpinäkymätön"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Suurikontrastinen teksti"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Muuta tekstin väri mustaksi tai valkoiseksi. Maksimoi kontrastin taustan kanssa."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Korkein tekstikontrasti"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Muuta tekstin väri mustaksi tai valkoiseksi lisätäksesi kontrastia taustan kanssa."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Päivitä näytön suurennus automaatt."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Päivitä näytön suurennus sovellussiirtymissä"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Puhelun katkaisu virtapainikkeella"</string>
@@ -3823,7 +3807,7 @@
     <string name="filter_instant_apps" msgid="2292108467020380068">"Pikasovellukset"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"Poistettu käytöstä"</string>
     <string name="advanced_apps" msgid="7643010673326578815">"Lisäasetukset"</string>
-    <string name="app_permissions" msgid="8666537659217653626">"Lupien ylläpito"</string>
+    <string name="app_permissions" msgid="8666537659217653626">"Lupienhallinta"</string>
     <string name="app_data_sharing_updates_title" msgid="1694297952320402788">"Sijainnin datan jakamisen päivitykset"</string>
     <string name="app_data_sharing_updates_summary" msgid="4465929918457739443">"Tarkista sovellukset, jotka ovat muuttaneet tapaa, jolla ne voivat jakaa sijaintitietoja"</string>
     <string name="tap_to_wake" msgid="3313433536261440068">"Herätä napauttamalla"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Peru"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrasti"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Tavallinen"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Oletus"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Keskitaso"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Suuri"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Tämän sovelluksen voi avata vain yhdessä ikkunassa"</string>
diff --git a/res/values-fr-feminine/strings.xml b/res/values-fr-feminine/strings.xml
new file mode 100644
index 0000000..d3f7c6a
--- /dev/null
+++ b/res/values-fr-feminine/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeuse.}one{Plus que # étapes pour être développeuse.}other{Plus que # étapes pour être développeuse.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais développeuse !"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeuse."</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connectée ?"</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Vous n\'êtes pas autorisée à modifier la langue de l\'appareil."</string>
+    <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connectée"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Cela limitera la consommation de données et l\'utilisation de la batterie, mais vous devrez synchroniser manuellement chaque compte pour récupérer les infos récentes. Et en cas de changement, vous n\'en serez pas avertie."</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connectée à un VPN permanent. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé et le mode permanent sera désactivé."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connectée à un VPN. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil VPN auquel rester connectée en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connectée à ce VPN."</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invitée (Vous)"</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connectée en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
+    <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentrée"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connectée à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-masculine/strings.xml b/res/values-fr-masculine/strings.xml
new file mode 100644
index 0000000..fc6e172
--- /dev/null
+++ b/res/values-fr-masculine/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeur.}one{Plus que # étapes pour être développeur.}other{Plus que # étapes pour être développeur.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais développeur !"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeur."</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connecté ?"</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Vous n\'êtes pas autorisé à modifier la langue de l\'appareil."</string>
+    <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connecté"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Cela limitera la consommation de données et l\'utilisation de la batterie, mais vous devrez synchroniser manuellement chaque compte pour récupérer les infos récentes. Et en cas de changement, vous n\'en serez pas averti."</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connecté à un VPN permanent. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé et le mode permanent sera désactivé."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connecté à un VPN. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invité (Vous)"</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connecté en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
+    <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentré"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-neuter/strings.xml b/res/values-fr-neuter/strings.xml
new file mode 100644
index 0000000..7fca6a9
--- /dev/null
+++ b/res/values-fr-neuter/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Plus que # étape pour être développeur·euse.}one{Plus que # étapes pour être développeur·euse.}other{Plus que # étapes pour être développeur·euse.}}"</string>
+    <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais développeur·euse !"</string>
+    <string name="show_dev_already" msgid="7041756429707644630">"Inutile, vous êtes déjà développeur·euse."</string>
+    <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Rester connecté·e ?"</string>
+    <string name="language_empty_list_user_restricted" msgid="8050367405839231863">"Vous n\'êtes pas autorisé·e à modifier la langue de l\'appareil."</string>
+    <string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connecté·e"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Cela limitera la consommation de données et l\'utilisation de la batterie, mais vous devrez synchroniser manuellement chaque compte pour récupérer les infos récentes. Et en cas de changement, vous n\'en serez pas averti·e."</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connecté·e à un VPN permanent. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé et le mode permanent sera désactivé."</string>
+    <string name="vpn_replace_vpn_message" msgid="1094297700371463386">"Vous êtes déjà connecté·e à un VPN. Si vous vous connectez à un autre VPN, le VPN actuel sera remplacé."</string>
+    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil VPN auquel rester connecté·e en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté·e à ce VPN."</string>
+    <string name="guest_category_title" msgid="5562663588315329152">"Invité·e (Vous)"</string>
+    <string name="users_summary" msgid="8473589474976307510">"Connecté·e en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
+    <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour garder votre concentration"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Un appareil Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté·e à <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> auparavant."</string>
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8097cef..49a41e6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Assoc. oreille droite"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Assoc. oreille gauche"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Pour tous les appareils auditifs accessibles"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Plus de paramètres de l\'appareil auditif"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Modifiez les paramètres multiappareils, comme les raccourcis et les commandes du phonocapteur"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Pour cet appareil"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Sortie audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"À propos de la sortie audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configuration de l\'Espace privé en cours…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Les notifications des applications de l\'Espace privé sont masquées lorsqu\'il est verrouillé"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Explorer les paramètres de l\'Espace privé pour le masquer et pour configurer le verrouillage automatique"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Les applications requises sont déjà installées dans votre Espace privé"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Impossible de configurer un Espace privé"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Réessayer"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Utiliser le verrouillage de l\'écran pour déverrouiller l\'Espace privé?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Applications et notifications"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notifications confidentielles sur l\'écran de verrouillage"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Afficher le contenu confidentiel lorsque l\'Espace privé est déverrouillé"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Créez un compte Google pour préserver la confidentialité de vos données"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Sur l\'écran suivant, vous pouvez vous connecter à un compte à utiliser avec votre Espace privé"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Créez un compte dédié pour éviter que des données n\'apparaissent en dehors de l\'Espace privé, comme :"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Photos, fichiers, courriels, contacts, événements d\'agenda et autres données synchronisés"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historique des téléchargements d\'applis et recommandations"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historique de navigation, favoris et mots de passe enregis."</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Contenu suggéré relativement à votre activité dans les applications de l\'Espace privé"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter des empreintes digitales"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> pour gérer vos connexions réseau?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Demandes de localisation récentes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Position pour profil profess."</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autor. localisation de l\'appli"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Le signalement de position est désactivé"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# application sur {total} a accès à la position}one{# application sur {total} a accès à la position}other{# applications sur {total} ont accès à la position}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Réinitialiser"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Choisir la touche de modification"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choisir une nouvelle touche pour <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> :"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Par défaut"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Parole"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Vitesse du pointeur"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Manette de jeu"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Général"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Affichage"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Couleur et mouvement"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contraste des couleurs"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Un contraste plus élevé fait ressortir davantage le texte, les boutons et les icônes. Choisissez le contraste qui vous convient le mieux."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Certaines applications peuvent ne pas prendre en charge tous les paramètres de contraste de couleur et de texte"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajustez l\'apparence des couleurs et du texte par rapport à la couleur de l\'arrière-plan de votre écran"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Aperçu"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Hélène, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Il y a 2 jours"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Faire un suivi?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Rapport sur le voyage d\'aff."</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Pour obtenir de l\'assistance supplémentaire, veuillez communiquer avec \nmoi ou avec Hélène. Ce rapport sera"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Dépenses du client"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Assombrir l\'écran"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Commandes d\'interaction"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Commandes du minutage"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Opaque"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texte de contraste élevé"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Changez la couleur du texte en noir ou en blanc. Cela aide à maximiser le contraste avec l\'arrière-plan."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximiser le contraste du texte"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Modifiez la couleur du texte en noir ou en blanc pour augmenter le contraste avec l\'arrière-plan."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Mettre à jour la loupe si transition entre applis"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Interrupteur pour raccrocher"</string>
@@ -3905,7 +3889,7 @@
     <string name="usb_summary_UVC_power" msgid="226810354412154061">"Caméra Web et alimentation"</string>
     <string name="background_check_pref" msgid="5304564658578987535">"Vérification en arrière-plan"</string>
     <string name="assist_access_context_title" msgid="5201495523514096201">"Utiliser le texte affiché à l\'écran"</string>
-    <string name="assist_access_context_summary" msgid="6951814413185646275">"Autoriser l\'application d\'assistance à accéder au contenu affiché à l\'écran sous forme de texte"</string>
+    <string name="assist_access_context_summary" msgid="6951814413185646275">"Autorisez l\'application d\'assistance à accéder au contenu affiché à l\'écran sous forme de texte"</string>
     <string name="assist_access_screenshot_title" msgid="4395902231753643633">"Utiliser la saisie d\'écran"</string>
     <string name="assist_access_screenshot_summary" msgid="5276593070956201863">"Autorisez l\'application d\'assistance à accéder au contenu affiché à l\'écran sous forme d\'image"</string>
     <string name="assist_flash_title" msgid="5449512572885550108">"Faire clignoter l\'écran"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Annuler"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contraste"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Par défaut"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Moyen"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Élevé"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Cette application ne peut être ouverte que dans une seule fenêtre."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7da1166..ec418fc 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Associer le droit"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Associer le gauche"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Pour tous les appareils auditifs disponibles"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Plus de paramètres concernant les appareils auditifs"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Modifier les paramètres de l\'appareil, tels que les commandes liées aux raccourcis et au phonocapteur."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Pour cet appareil"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Sortie audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"À propos de la sortie audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configuration de l\'espace privé…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Les notifications provenant des applis de l\'espace privé sont masquées lorsque celui-ci est verrouillé"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Rendez-vous dans les paramètres d\'espace privé pour masquer l\'espace privé et configurer le verrouillage automatique"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Certaines applis indispensables sont déjà installées dans votre espace privé"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Impossible de configurer un espace privé"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Réessayer"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Utiliser le verrouillage de l\'écran pour déverrouiller l\'espace privé ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Applis et notifications"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notifications sensibles sur l\'écran de verrouillage"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Afficher le contenu sensible lorsque l\'espace privé est déverrouillé"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Créez un compte Google pour préserver la confidentialité de vos données"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"À la page suivante, vous pourrez vous connecter à un compte grâce auquel vous accéderez à votre espace privé"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"En créant un compte dédié, vous empêchez vos données d\'apparaître en dehors de votre espace privé, notamment : "</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Photos, fichiers, e-mails, contacts, événements d\'agenda synchronisés, et autres données."</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historique des applis téléchargées et recommandations"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historique de navigation, favoris et mots de passe enregistrés"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Suggestions de contenu en fonction de votre activité sur les applis de l\'espace privé"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal autorisé d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter d\'autres empreintes digitales"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> pour gérer vos connexions réseau ?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Demandes de localisation récentes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Position du profil pro"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Accès des applis à la position"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La localisation est désactivée"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# appli sur {total} a accès à la position}one{# appli sur {total} a accès à la position}other{# applis sur {total} ont accès à la position}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Réinitialiser"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Choisir une touche de modification"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Choisir une nouvelle touche pour <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> :"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Par défaut"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voix"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Vitesse du pointeur"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Manette de jeu"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Général"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Affichage"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Couleur et mouvement"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contraste des couleurs"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Un contraste plus élevé fait ressortir le texte, les boutons et les icônes. Choisissez le contraste en fonction de vos préférences."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Certaines applis sont susceptibles de ne pas prendre en charge tous les paramètres relatifs au contraste du texte et des couleurs"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajustez la manière dont les couleurs ainsi que le texte s\'affichent sur l\'arrière-plan de votre écran"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Aperçu"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Il y a 2 jours"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Suivre ?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Rapport du déplacement professionnel"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Pour plus d\'aide, veuillez contacter \nHelen ou moi-même. Ce rapport sera"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Dépenses du client"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Assombrir l\'écran"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Commandes d\'interaction"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Contrôle du temps d\'appui"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Opaque"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texte avec contraste élevé"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Mettre le texte en noir ou blanc pour accentuer le contraste avec le fond."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximiser le contraste du texte"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Mettez le texte en noir ou blanc pour accentuer le contraste avec l\'arrière-plan."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Mise à jour auto de la loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Mettre à jour la loupe si transition entre applis"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Bouton Marche/Arrêt pour raccrocher"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Annuler"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contraste"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Par défaut"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Moyen"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Élevé"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Cette appli ne peut être ouverte que dans 1 fenêtre"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 9e32815..fced833 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Vincular dereito"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Vincular esquerdo"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Para todos os dispositivos auditivos dispoñibles"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Máis opcións de configuración de dispositivos auditivos"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Cambia a configuración multidispositivo, como os controis dos atallos e da telebobina"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Para este dispositivo"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Acerca da saída de audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando espazo privado…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Cando o espazo privado está bloqueado, ocúltanse as notificacións das súas aplicacións"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Revisa a configuración do espazo privado para ocultalo e definir o bloqueo automático"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"As aplicacións requiridas xa están instaladas no espazo privado"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Non se puido configurar ningún espazo privado"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Tentar de novo"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Usar bloqueo pant. para desbloquear espazo priv.?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplicacións e notificacións"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notificacións confidenciais na pantalla de bloqueo"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Mostra contido confidencial cando o espazo privado está desbloqueado"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Crea unha Conta de Google para axudar a manter a privacidade dos teus datos"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na seguinte pantalla podes iniciar sesión nunha conta para usala co teu espazo privado"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Crea unha conta específica para axudar a evitar que os datos aparezan fóra do teu espazo privado, como:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotos, ficheiros, correos, contactos, eventos do calendario e outros datos sincronizados"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Recomendacións e historial de descarga de aplicacións"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historial de navegación, marcadores e contrasinais gardados"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Contido suxerido relacionado coa túa actividade nas aplicacións do espazo privado"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Entendido"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Podes engadir ata <xliff:g id="COUNT">%d</xliff:g> impresións dixitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Engadiches o número máximo de impresións dixitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Non se poden engadir máis impresións dixitais"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Queres utilizar <xliff:g id="NEW_APP">%s</xliff:g> para xestionar as túas conexións de rede?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Solicitudes de localización recentes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Localización do perfil de traballo"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permisos de localización das aplicacións"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A localización está desactivada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# de {total} aplicacións ten acceso á localización}other{# de {total} aplicacións teñen acceso á localización}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Restablecer"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Escoller unha tecla modificadora"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolle unha nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predeterminado"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocidade do punteiro"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Mando do xogo"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Xeral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Cor e movemento"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contraste de cor"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Se sobes o contraste, destacarán máis os textos, os botóns e as iconas. Elixe o que mellor che cadre."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"É posible que algunhas aplicacións non admitan todas as opcións de configuración de contraste de cor e texto"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Axusta como se ven as cores e o texto sobre a cor de fondo da túa pantalla"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Vista previa"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Hai 2 días"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Seguimento?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Informe de viaxe de negocios"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Para ter asistencia adicional, ponte en contacto \ncomigo ou con Helen. O informe vai ser"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Gastos do cliente"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer pantalla"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controis de interacción"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Controis de tempo"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Non transparente"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texto de alto contraste"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Cambia a cor do texto a negro ou branco. Maximiza o contraste co fondo."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximizar o contraste do texto"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Cambia a cor do texto a negro ou branco para aumentar o contraste co fondo."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Actualizar aumento automaticamente"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Actualizar aumento pantalla en transicións de apps"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botón de acendido para colgar"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Cancelar"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contraste"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Nivel estándar"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Valor predeterminado"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Nivel medio"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Nivel alto"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Esta aplicación só se pode abrir en 1 ventá"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 15d4106..1dcc22a 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"જમણા કાનનું જોડો"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ડાબા કાનનું જોડો"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"બધા ઉપલબ્ધ શ્રવણ ડિવાઇસ માટે"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"સાંભળવામાં મદદ આપતા ડિવાઇસ સંબંધિત વધુ સેટિંગ"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"શૉર્ટકટ અને ટેલીકોઇલ નિયંત્રણો જેવા ક્રૉસ-ડિવાઇસના સેટિંગમાં ફેરફાર કરો"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"આ ડિવાઇસ માટે"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ઑડિયો આઉટપુટ"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ઑડિયો આઉટપુટ વિશે"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"ખાનગી સ્પેસનું સેટઅપ કરી રહ્યાં છીએ…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"જ્યારે ખાનગી સ્પેસ લૉક કરવામાં આવી હોય, ત્યારે તમારી ખાનગી સ્પેસમાંની ઍપના નોટિફિકેશન છુપાવવામાં આવે છે"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"ખાનગી સ્પેસ છુપાવવા અને ઑટોમૅટિક રીતે લૉક કરવાનું સેટઅપ કરવા માટે, ખાનગી સ્પેસના સેટિંગની શોધખોળ કરો"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"તમારી ખાનગી સ્પેસમાં જરૂરી ઍપ પહેલાંથી જ ઇન્સ્ટૉલ કરવામાં આવી છે"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"કોઈ ખાનગી સ્પેસનું સેટઅપ કરી શકાતું નથી"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ફરી પ્રયાસ કરો"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ખાનગી સ્પેસને અનલૉક કરવા સ્ક્રીન લૉકનો ઉપયોગ કરીએ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"ઍપ અને નોટિફિકેશન"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"લૉક સ્ક્રીન પર સંવેદનશીલ નોટિફિકેશન"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"જ્યારે ખાનગી સ્પેસ અનલૉક કરેલી હોય ત્યારે સંવેદનશીલ કન્ટેન્ટ બતાવો"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"તમારો ડેટા ખાનગી રાખવામાં સહાયતા માટે, કોઈ Google એકાઉન્ટ બનાવો"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"આગલી સ્ક્રીન પર, તમારી ખાનગી સ્પેસ સાથે ઉપયોગ કરવા માટે, તમે કોઈ એકાઉન્ટમાં સાઇન ઇન કરી શકો છો"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"તમારી ખાનગી સ્પેસની બહાર ડેટા દેખાવાનું રોકવામાં સહાયતા માટે, કોઈ ખાસ એકાઉન્ટ બનાવો, જેમ કે:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"ફોટા, ફાઇલો, ઇમેઇલ, સંપર્કો, કૅલેન્ડર ઇવેન્ટ અને સિંક કરેલો અન્ય ડેટા"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ઍપનો ડાઉનલોડ ઇતિહાસ અને સુઝાવો"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"બ્રાઉઝિંગ ઇતિહાસ, બુકમાર્ક અને સાચવેલા પાસવર્ડ"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ખાનગી સ્પેસ ઍપમાં તમારી ઍક્ટિવિટીથી સંબંધિત સૂચવેલું કન્ટેન્ટ"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"સમજાઈ ગયું"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"તમે <xliff:g id="COUNT">%d</xliff:g> જેટલી ફિંગરપ્રિન્ટ ઉમેરી શકો છો"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"તમે મહત્તમ ફિંગરપ્રિન્ટ્સ ઉમેર્યા છે"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"વધુ ફિંગરપ્રિન્ટ્સ ઉમેરી શકતાં નથી"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"તમારા નેટવર્ક કનેક્શન્સનું સંચાલન કરવા માટે <xliff:g id="NEW_APP">%s</xliff:g> નો ઉપયોગ કરો?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"તાજેતરની સ્થાન વિનંતિ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ઑફિસની પ્રોફાઇલ માટે સ્થાન"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ઍપ માટે લોકેશનની પરવાનગીઓ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"સ્થાન બંધ છે"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total}માંથી # ઍપ લોકેશનનો ઍક્સેસ ધરાવે છે}one{{total}માંથી # ઍપ લોકેશનનો ઍક્સેસ ધરાવે છે}other{{total}માંથી # ઍપ લોકેશનનો ઍક્સેસ ધરાવે છે}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"રીસેટ કરો"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"મૉડિફાયર કી પસંદ કરો"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> માટે નવી કી પસંદ કરો:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ડિફૉલ્ટ"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"સ્પીચ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"પૉઇન્ટરની ગતિ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"રમત નિયંત્રક"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"સામાન્ય"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ડિસ્પ્લે"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"રંગ અને મોશન"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"કલર કૉન્ટ્રાસ્ટ"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"વધુ ઉચ્ચ કૉન્ટ્રાસ્ટ ટેક્સ્ટ, બટન અને આઇકનને વધુ સ્પષ્ટ રીતે જોઈ શકાવા યોગ્ય બનાવે છે. તમારા માટે શ્રેષ્ઠતમ દેખાતો કૉન્ટ્રાસ્ટ પસંદ કરો."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"અમુક ઍપ કદાચ રંગ અને ટેક્સ્ટના કૉન્ટ્રાસ્ટ સંબંધિત બધા સેટિંગને સપોર્ટ ન કરે, તેવું બની શકે છે"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"તમારી સ્ક્રીનના બૅકગ્રાઉન્ડ રંગ મુજબ રંગો અને ટેક્સ્ટની ગોઠવણ કરો"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"પ્રીવ્યૂ કરો"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"હેલન, ઍડમ"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 દિવસ અગાઉ"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ફૉલોઅપ કરીએ કે?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"વ્યવસાય ટ્રિપ રિપોર્ટ"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"હજી વધુ સહાય માટે, કૃપા કરીને \nમારો કે હેલનનો સંપર્ક કરો. આ રિપોર્ટ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"ક્લાયન્ટ સંબંધી ખર્ચા"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"સ્ક્રીનને વધુ ઘેરી બનાવો"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ક્રિયાપ્રતિક્રિયાના નિયંત્રણો"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"સમયના નિયંત્રણો"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"અપારદર્શક"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ઉચ્ચ કોન્ટ્રાસ્ટ ટેક્સ્ટ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"ટેક્સ્ટનો રંગ બદલીને કાળો અથવા સફેદ કરો. આને કારણે બૅકગ્રાઉન્ડ અનુસાર કોન્ટ્રાસ્ટ વધી જાય છે."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"ટેક્સ્ટનો કૉન્ટ્રાસ્ટ મહત્તમ કરો"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"બૅકગ્રાઉન્ડ સાથેના કૉન્ટ્રાસ્ટમાં વધારો કરવા માટે, ટેક્સ્ટનો રંગ બદલીને કાળો કે સફેદ કરો."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"સ્ક્રીન મોટી કરવાનું ઑટોમૅટિક અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
@@ -4681,7 +4665,7 @@
     <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"તમારું સક્રિય સિમ કાર્ડ પસંદ કરો અથવા એકવારમાં 2 સિમ કાર્ડનો ઉપયોગ કરો"</string>
     <string name="choose_sim_title" msgid="66509047151583877">"ઉપયોગ કરવા માટે સિમ કાર્ડ પસંદ કરો"</string>
     <string name="choose_sim_text" msgid="8992163497852069924">"{count,plural, =1{આ ડિવાઇસ પર 1 સિમ કાર્ડ ઉપલબ્ધ છે, પરંતુ એક સમયે માત્ર એક સિમ કાર્ડનો જ ઉપયોગ કરી શકાય છે}=2{આ ડિવાઇસ પર 2 સિમ કાર્ડ ઉપલબ્ધ છે, પરંતુ એક સમયે માત્ર એક સિમ કાર્ડનો જ ઉપયોગ કરી શકાય છે}one{આ ડિવાઇસ પર # સિમ કાર્ડ ઉપલબ્ધ છે, પરંતુ એક સમયે માત્ર એક સિમ કાર્ડનો જ ઉપયોગ કરી શકાય છે}other{આ ડિવાઇસ પર # સિમ કાર્ડ ઉપલબ્ધ છે, પરંતુ એક સમયે માત્ર એક સિમ કાર્ડનો જ ઉપયોગ કરી શકાય છે}}"</string>
-    <string name="choose_sim_activating" msgid="6485547671356386998">"<xliff:g id="ELLIPSIS">…</xliff:g> ચાલુ કરી રહ્યાં છીએ"</string>
+    <string name="choose_sim_activating" msgid="6485547671356386998">"ચાલુ કરી રહ્યાં છીએ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="choose_sim_could_not_activate" msgid="866488735834045525">"અત્યારે આ સિમ કાર્ડ ચાલુ કરી શકાયું નથી"</string>
     <string name="switch_sim_dialog_title" msgid="5407316878973237773">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>નો ઉપયોગ કરીએ?"</string>
     <string name="switch_sim_dialog_text" msgid="7530186862171635464">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>નો ઉપયોગ મોબાઇલ ડેટા, કૉલ અને SMS માટે કરવામાં આવશે."</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"રદ કરો"</string>
     <string name="contrast_title" msgid="6885768151336508075">"કોન્ટ્રાસ્ટ"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"સ્ટૅન્ડર્ડ"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ડિફૉલ્ટ"</string>
     <string name="contrast_medium" msgid="384414510709285811">"મધ્યમ"</string>
     <string name="contrast_high" msgid="3988567609694797696">"વધુ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"આ ઍપ માત્ર 1 વિન્ડોમાં ખોલી શકાય છે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0bb8df2..f6a37f6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"दाईं मशीन को जोड़ें"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"बाईं मशीन को जोड़ें"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"कान की सभी उपलब्ध मशीनों के लिए"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"कान की मशीन के लिए, ज़्यादा सेटिंग"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"क्रॉस-डिवाइस की सेटिंग बदलें. जैसे, शॉर्टकट और टेलीकॉइल कंट्रोल"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"इस डिवाइस के लिए"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ऑडियो आउटपुट"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ऑडियो आउटपुट की जानकारी"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"प्राइवेट स्पेस सेट अप किया जा रहा है…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"प्राइवेट स्पेस वाले ऐप्लिकेशन लॉक होने पर, इनकी सूचनाएं छिपी हुई रहती हैं"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"प्राइवेट स्पेस को छिपाने और अपने-आप लॉक होने की सुविधा सेट अप करने के लिए, प्राइवेट स्पेस की सेटिंग देखें"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"कुछ सिस्टम ऐप्लिकेशन, पहले से ही आपके प्राइवेट स्पेस में इंस्टॉल हैं"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"प्राइवेट स्पेस को सेट अप नहीं किया जा सका"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"फिर से कोशिश करें"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"स्क्रीन लॉक से प्राइवेट स्पेस को अनलॉक करें?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"ऐप्लिकेशन और सूचनाएं"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"लॉक स्क्रीन पर संवेदनशील सूचनाएं"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"प्राइवेट स्पेस अनलॉक होने पर संवेदनशील कॉन्टेंट दिखाएं"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"अपने डेटा को निजी बनाए रखने के लिए, Google खाता बनाएं"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"अगली स्क्रीन पर, प्राइवेट स्पेस का इस्तेमाल करने के लिए, किसी खाते से साइन इन किया जा सकता है"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"डेटा को प्राइवेट स्पेस से बाहर दिखाने से रोकने के लिए, खास तौर पर खाता बनाएं. जैसे:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"सिंक किए गए फ़ोटो, फ़ाइलें, ईमेल, संपर्क, कैलेंडर इवेंट, और अन्य डेटा"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ऐप्लिकेशन को डाउनलोड करने का इतिहास और सुझाव"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ब्राउज़िंग इतिहास, बुकमार्क, और सेव किए गए पासवर्ड"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"प्राइवेट स्पेस वाले ऐप्लिकेशन में, आपकी गतिविधि के हिसाब से सुझाया गया कॉन्टेंट"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"ठीक है"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ज़्यादा से ज़्यादा <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट जोड़े जा सकते हैं"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"और ज़्यादा फ़िंगरप्रिंट नहीं जोड़े जा सकते"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"आपके नेटवर्क कनेक्शन प्रबंधित करने के लिए <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"हाल में किए गए जगह के अनुरोध"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"वर्क प्रोफ़ाइल की जगह"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ऐप्लिकेशन के लिए जगह की जानकारी की अनुमतियां"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"जगह की जानकारी बंद है"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} में से # ऐप्लिकेशन के पास, जगह की जानकारी का ऐक्सेस है}one{{total} में से # ऐप्लिकेशन के पास, जगह की जानकारी का ऐक्सेस है}other{{total} में से # ऐप्लिकेशन के पास, जगह की जानकारी का ऐक्सेस है}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"रीसेट करें"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"कार्रवाई बदलने वाली कुंजी चुनें"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> के लिए, कोई नई कुंजी चुनें:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डिफ़ॉल्ट"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"बोली"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"पॉइंटर स्पीड"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"गेमनियंत्रक"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"सामान्य"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिसप्ले"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"रंग और मोशन"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"कलर कंट्रास्ट"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ज़्यादा कंट्रास्ट की मदद से, टेक्स्ट, बटन, और आइकॉन सबसे अलग दिखते हैं. अपने लिए सबसे बेहतरीन कंट्रास्ट चुनें."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"ऐसा हो सकता है कि कुछ ऐप्लिकेशन में, सभी रंग और टेक्स्ट के कंट्रास्ट की सेटिंग काम न करें"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"रंग और टेक्स्ट को स्क्रीन के बैकग्राउंड कलर के हिसाब से बदलें"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"झलक देखें"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"हेलेन, एडम"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"दो दिन पहले"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"फ़ॉलो अप करें?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"कारोबार यात्रा की रिपोर्ट"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"ज़्यादा मदद पाने के लिए, कृपया \nमुझसे या हेलेन से संपर्क करें. इस रिपोर्ट को"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"क्लाइंट से जुड़े खर्चे"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रीन की चमक को कम करें"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"इंटरैक्शन कंट्रोल"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"समय से जुड़े कंट्रोल"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"पारदर्शी नहीं है"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ज़्यादा कंट्रास्ट वाला टेक्स्ट"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"टेक्स्ट का रंग बदलकर काला या सफ़ेद करें. इससे बैकग्राउंड के मुताबिक कंट्रास्ट बढ़ जाता है."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"टेक्स्ट के कंट्रास्ट को बढ़ाएं"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"बैकग्राउंड के मुताबिक कंट्रास्ट को बढ़ाने के लिए, टेक्स्ट का रंग बदलकर काला या सफ़ेद करें."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"स्क्रीन को बड़ा करने की सुविधा को अपने आप अपडेट करें"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ऐप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पावर बटन से कॉल काटना"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"रहने दें"</string>
     <string name="contrast_title" msgid="6885768151336508075">"कंट्रास्ट"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"स्टैंडर्ड"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"डिफ़ॉल्ट"</string>
     <string name="contrast_medium" msgid="384414510709285811">"सामान्य"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ज़्यादा"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"इस ऐप्लिकेशन को सिर्फ़ एक विंडो में खोला जा सकता है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3c8b832..f3fd3c2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Upari desno uho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Upari lijevo uho"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Za sve dostupne slušne uređaje"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Više postavki slušnih pomagala"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Izmijenite postavke za više uređaja kao što su kontrole prečaca i telezavojnica"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Za ovaj uređaj"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audioizlaz"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O audioizlazu"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"U tijeku je postavljanje privatnog prostora…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Obavijesti aplikacija u privatnom prostoru sakrivene su kada je on zaključan"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Istražite postavke privatnog prostora da biste sakrili privatni prostor i postavili automatsko zaključavanje"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Zatražene aplikacije već su instalirane u vašem privatnom prostoru"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Postavljanje privatnog prostora nije uspjelo"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Pokušajte ponovo"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Koristiti zaključavanje zaslona za otključavanje?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikacije i obavijesti"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Osjetljive obavijesti na zaključanom zaslonu"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Prikaži osjetljivi sadržaj kad je privatni prostor otključan"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Izradite Google račun kako biste zaštitili privatnost svojih podataka"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na sljedećem zaslonu možete se prijaviti na račun koji želite upotrebljavati sa svojim privatnim prostorom"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Izradite namjenski račun kako biste spriječili prikazivanje podataka izvan privatnog prostora, npr.:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinkronizirane fotografije, datoteke, e-poruke, kontakti, događaji iz kalendara i drugo"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Povijest preuzimanja aplikacija i preporuke"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Povijest pregledavanja, oznake i spremljene zaporke"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Predloženi sadržaj povezan s vašom aktivnošću u aplikacijama privatnog prostora"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Shvaćam"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Maksimalni broj otisaka prstiju koji možete dodati: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nije moguće dodati više otisaka prstiju"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Želite li upotrebljavati aplikaciju <xliff:g id="NEW_APP">%s</xliff:g> za upravljanje mrežnim vezama?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedavni zahtjevi za lokaciju"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za poslovni profil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Dopuštenja za pristup lokaciji"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokacija je isključena"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# od {total} aplikacije ima pristup lokaciji}one{# od {total} aplikacije imaju pristup lokaciji}few{# od {total} aplikacije imaju pristup lokaciji}other{# od {total} aplikacija imaju pristup lokaciji}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Poništi"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Odaberi modifikatorsku tipku"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Odaberite novu tipku za <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Zadano"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Upravljač igrama"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Općenito"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Boja i pokret"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontrast boja"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Veći kontrast omogućuje da se tekst, gumbi i ikone bolje istaknu. Odaberite kontrast koji vam najbolje izgleda."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Neke aplikacije možda ne podržavaju sve postavke kontrasta boja i teksta"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Prilagodite kako boje i tekst izgledaju u odnosu na boju pozadine zaslona"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Pregled"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Prije dva dana"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Dodatni upit?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Izvješće o poslovnom putu"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Za dodatnu pomoć obratite se \nmeni ili Helen. Ovo izvješće bit će"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Troškovi klijenta"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjenje zaslona"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrole interakcije"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Kontrole tajminga"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Neprozirno"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst s visokim kontrastom"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Mijenja boju teksta u crnu ili bijelu. Maksimizira kontrast s pozadinom."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Povećajte kontrast teksta"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Promijenite boju teksta u crnu ili bijelu kako bi se povećao kontrast u odnosu na pozadinu."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Autom. ažuriranje uvećanja zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ažuriranje uvećanja zaslona pri izmjeni aplikacija"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tipka za uklj. prekida poziv"</string>
@@ -5124,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Odustani"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standardni"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Zadano"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Srednji"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Visoki"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ova se aplikacija može otvoriti samo u jednom prozoru"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 88459a6..bd6a988 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Jobb fül párosítása"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Bal fül párosítása"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Minden rendelkezésre álló hallókészüléknél"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"További hallókészülék-beállítások"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Módosíthatja a többeszközös beállításokat (pl. gyorsparancsok és telecoil-vezérlők)."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Ennél az eszköznél"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Hangkimenet"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"A hangkimenetről"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"A privát terület beállítása…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"A magánterületen lévő alkalmazásoktól érkező értesítések rejtve maradnak, amikor le van zárva a magánterület"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"A magánterületet érintő beállítások felfedezésével elrejtheti a magánterületet, és beállíthatja az automatikus zárolást"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"A szükséges alkalmazások már telepítve vannak a magánterületén"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Nem sikerült a magánterület beállítása"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Újra"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"A privát terület feloldása képernyőzárral?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Alkalmazások és értesítések"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Bizalmas értesítések a lezárási képernyőn"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Bizalmas tartalmak megjelenítése, ha a magánterület zárolása fel van oldva"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Google-fiók létrehozásával könnyebben gondoskodhat adatai privát jellegének megőrzéséről"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"A következő képernyőn bejelentkezhet a magánterülettel használni kívánt fiókba"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Hozzon létre külön fiókot annak megakadályozásához, hogy az adatok a magánterületen kívül is megjelenjenek, például:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Szinkronizált fotók, fájlok, e-mailek, névjegyek, naptáresemények és egyéb adatok"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Alkalmazásletöltési előzmények és ajánlások"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Böngészési előzmények, könyvjelzők és mentett jelszavak"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Javasolt tartalmak a magánterület alkalmazásaiban végzett tevékenységei alapján"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Értem"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Legfeljebb <xliff:g id="COUNT">%d</xliff:g> ujjlenyomatot adhat hozzá"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Elérte a hozzáadható ujjlenyomatok maximális számát"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nem lehet több ujjlenyomatot hozzáadni"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Szeretné a(z) <xliff:g id="NEW_APP">%s</xliff:g> alkalmazást használni a hálózati kapcsolatok kezelésére?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Legutóbbi helylekérdezések"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"A munkahelyi profil helye"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Appok helyelérési engedélyei"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A helyadatok ki vannak kapcsolva"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total}/# alkalmazás hozzáfér a helyadatokhoz}other{{total}/# alkalmazás hozzáfér a helyadatokhoz}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Alaphelyzet"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Módosító billentyű választása"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Válasszon új billentyűt a(z) <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> számára:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Alapértelmezett"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Beszéd"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Mutató sebessége"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Játékvezérlő"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Általános"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Megjelenítés"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Szín és mozgás"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Színkontraszt"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"A magasabb kontrasztnak köszönhetően könnyebben kivehetők a szövegek, a gombok és az ikonok. Válassza ki az Önnek megfelelő kontrasztot."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Előfordulhat, hogy egyes alkalmazások nem támogatják a szín- és szövegkontraszttal kapcsolatos összes beállítást."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Módosíthatja, hogy a színek és a szövegek hogyan jelenjenek meg a képernyő háttérszínéhez képest."</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Előnézet"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 napja"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"További kérdés?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Üzleti út jelentése"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Kérem, további segítségért forduljon \nhozzám vagy Helenhez. Ez a jelentés"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Ügyfélkiadások"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Képernyő sötétítése"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interakcióvezérlők"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Időzítési vezérlők"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Nem átlátszó"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Nagy kontrasztú szöveg"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"A szöveg színének módosítása feketére vagy fehérre, hogy maximálisan elkülönüljön a háttértől."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Szövegkontraszt maximalizálása"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Feketére vagy fehérre módosíthatja a szöveg színét, hogy nagyobb legyen a kontraszt a háttérhez képest."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Képernyőnagyítás automatikus frissítése"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Nagyítás frissítése az alkalmazások közti átmeneteknél"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"A bekapcs. gomb megszakítja a hívást"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Mégse"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontraszt"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Normál"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Alapértelmezett"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Közepes"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Nagy"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ez az alkalmazás csak egy ablakban nyitható meg"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5566870..89431d6 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Զուգակցել աջ ականջը"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Զուգակցել ձախ ականջը"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Բոլոր հասանելի լսողական սարքերի համար"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Լսողական սարքերի այլ կարգավորումներ"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Փոխեք միաժամանակ մի քանի սարքի միացման կարգավորումները, օրինակ՝ դյուրանցումը, և հեռակոճի պարամետրերը"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Այս սարքի համար"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Աուդիո ելք"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Աուդիո ելքի մասին"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Անձնական տարածքի կարգավորում…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Մասնավոր տարածքում հավելվածներից ծանուցումները թաքցված են, երբ այն կողպված է"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Ստուգեք մասնավոր տարածքի կարգավորումները՝ այն թաքցնելու և ավտոմատ կողպումը կարգավորելու համար"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Պահանջվող հավելվածներն արդեն տեղադրված են ձեր մասնավոր տարածքում"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Չհաջողվեց մասնավոր տարածք կարգավորել"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Նորից փորձել"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Օգտագործե՞լ էկրանի կողպում անձնական տարածքի համար"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Հավելվածներ և ծանուցումներ"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Զգայուն ծանուցումներ կողպէկրանի վրա"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Ցույց տալ զգայուն բովանդակություն, երբ մասնավոր տարածքն ապակողպված է"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Ստեղծեք Google հաշիվ՝ ձեր տվյալներն ապահով պահելու համար"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Հաջորդ էկրանին դուք կարող եք մտնել հաշիվ՝ ձեր մասնավոր տարածքի հետ օգտագործելու համար"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Ստեղծեք առանձին հաշիվ, որպեսզի խուսափեք մասնավոր տարածքից դուրս տվյալների արտահոսքից, օրինակ՝"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Համաժամացված նկարներ, ֆայլեր, նամակներ, կոնտակտներ, օրացույցի միջոցառումներ և այլ տվյալներ"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Հավելվածների ներբեռնման պատմություն և առաջարկներ"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Այցելությունների պատմություն, էջանիշներ և պահված գաղտնաբառեր"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Մասնավոր տարածքի հավելվածներում ձեր գործողություններին առնչվող առաջարկվող բովանդակություն"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Պարզ է"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Կարող եք ավելացնել առավելագույնը <xliff:g id="COUNT">%d</xliff:g> մատնահետք"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Դուք ավելացրել եք մատնահետքերի առավելագույն թույլատրելի քանակը"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Հնարավոր չէ ավելացնել այլ մատնահետքեր"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g> ծրագիրը՝ ձեր ցանցային կապերը կառավարելու համար:"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Տեղորոշման վերջին հարցումները"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Տեղ աշխատանքային պրոֆիլի համար"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Տեղորոշման թույլտվություններ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Տեղորոշումն անջատված է"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Տեղադրության տվյալները հասանելի են # հավելվածի՝ {total}-ից}one{Տեղադրության տվյալները հասանելի են # հավելվածի՝ {total}-ից}other{Տեղադրության տվյալները հասանելի են # հավելվածի՝ {total}-ից}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Վերականգնել"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Ընտրեք կերպափոխիչ ստեղնը"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Ընտրել նոր ստեղն <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ստեղնի փոխարեն՝"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Կանխադրված"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Խոսք"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Նշորդի արագությունը"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Խաղերի կարգավորիչ"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Ընդհանուր"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Էկրան"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Գույն և շարժում"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Գույների կոնտրաստ"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Բարձր կոնտրաստն ավելի է առանձնացնում տեքստը, կոճակները և պատկերակները։ Ընտրեք ձեզ հարմարավետ կոնտրաստ։"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Որոշ հավելվածներ հնարավոր է՝ չաջակցեն գույների և տեքստի կոնտրաստի կարգավորումները"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Հարմարեցրեք գույների և տեքստի տեսքը ձեր էկրանի ֆոնի գույնին"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Նախադիտում"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Հելեն, Ադամ"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 օր առաջ"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Հիշեցնե՞լ"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Բիզնես ուղևորության հաշվետվություն"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Լրացուցիչ օգնության համար դիմեք \nինձ կամ Հելենին։ Այս հաղորդումը"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Հաճախորդի ծախսեր"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Էկրանի մգացում"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Կառավարման տարրեր"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Ժամանակի կարգավորումներ"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Ոչ թափանցիկ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Բարձր կոնտրաստի տեքստ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Փոխեք տեքստի գույնը սևի կամ սպիտակի, որպեսզի ֆոնի հետ կոնտրասն առավելագույնի հասցվի։"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Ավելացրեք տեքստի կոնտրաստը"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Փոխեք տեքստի գույնը սևի կամ սպիտակի, որպեսզի ֆոնի հետ կոնտրաստն ավելանա։"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Ավտոմատ թարմացնել էկրանի խոշորությունը"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Թարմացնել էկրանի խոշորությունը ծրագրի տարանցումների վրա"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Սնուցման կոճակը ավարտում է զանգը"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Չեղարկել"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Կոնտրաստ"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Սովորական"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Կանխադրված"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Միջին"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Բարձր"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Այս հավելվածը հնարավոր է բացել միայն մեկ պատուհանում"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b0e2e8d..2f7fd85 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1553,6 +1553,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> untuk mengelola koneksi jaringan?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Permintaan lokasi terbaru"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokasi untuk profil kerja"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Izin akses lokasi aplikasi"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokasi nonaktif"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# dari {total} aplikasi memiliki akses ke lokasi}other{# dari {total} aplikasi memiliki akses ke lokasi}}"</string>
@@ -1947,7 +1949,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Reset"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Pilih tombol pengubah"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pilih tombol baru untuk <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Ucapan"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Kecepatan kursor"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Pengendali Game"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5991419..e116dbb 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Para hægra eyra"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Para vinstra eyra"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Fyrir öll heyrnartæki sem eru í boði"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Fleiri stillingar heyrnartækis"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Breyttu stillingum á milli tækja, s.s. stýringum flýtileiða og tónmöskvaspólu."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Fyrir þetta tæki"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Hljóðúttak"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Um hljóðúttak"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Setur upp einkarými…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Tilkynningar frá forritum í leynirými eru faldar þegar rýmið er læst"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Skoðaðu stillingar leynirýmis til að fela það og setja upp sjálfvirka læsingu"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Áskilin forrit eru þegar sett upp í leynirýminu"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Ekki tókst að setja upp leynirými"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Reyna aftur"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Nota skjálás til að taka einkarýmið úr lás?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Forrit og tilkynnignar"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Viðkvæmar tilkynningar á lásskjá"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Sýna viðkvæmt efni þegar leynirými er ólæst"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Stofnaðu Google-reikning til að hjálpa til við að halda gögnunum þínum lokuðum"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Á næstu síðu geturðu skráð þig inn á reikninginn sem þú vilt nota fyrir leynirýmið"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Stofnaðu þar til gerðan reikning til að hjálpa til við að koma í veg fyrir að gögnin þín birtist utan leynirýmis, s.s:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Samstilltar myndir, skrár, tölvupóstar, tengiliðir, dagatalsviðburðir og önnur gögn"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Niðurhalsferill og tillögur forrita"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Vafraferill, bókamerki og vistuð aðgangsorð"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Tillögur að efni sem tengist virkni þinni í forritum í leynirýminu"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Ég skil"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Þú getur bætt við allt að <xliff:g id="COUNT">%d</xliff:g> fingraförum"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Þú hefur bætt við hámarksfjölda fingrafara"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ekki er hægt að bæta fleiri fingraförum við"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Nota <xliff:g id="NEW_APP">%s</xliff:g> til að stjórna nettengingunum þínum?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nýlegar staðsetningarbeiðnir"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Staðsetning vinnusniðs"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Staðsetningarheimildir forrits"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Slökkt á staðsetningu"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# af {total} forritum hefur aðgang að staðsetningu}one{# af {total} forritum hefur aðgang að staðsetningu}other{# af {total} forritum hafa aðgang að staðsetningu}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Endurstilla"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Velja breytilykil"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Veldu nýjan lykil fyrir <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Sjálfgefið"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Tal"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Hraði bendils"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Leikjafjarstýring"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Almennt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skjár"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Litur og hreyfing"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Birtuskil lita"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Aukin birtuskil gera texta, hnappa og tákn enn greinilegri. Veldu þau birtuskil sem henta þér best."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Sum forrit styðja hugsanlega ekki allar stillingar fyrir birtustig lita og texta"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Stilltu hvernig litir og textar birtast á bakgrunnslit skjásins"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Forskoða"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Fyrir 2 dögum"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Fylgja eftir?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Skýrsla um vinnuferð"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Hafðu samband við \nmig eða Helen ef þú þarft á frekari aðstoð að halda. Þessi skýrsla verður"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Kostnaður viðskiptavinar"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Dekkja skjáinn"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Gagnvirknistýringar"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Tímastýringar"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Ógagnsætt"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texti með miklum birtuskilum"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Breyta textalit í svartan eða hvítan. Dregur fram birtuskil í bakgrunni."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Hámarkaðu birtuskil texta"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Breyttu lit á texta í svartan eða hvítan til að auka birtuskil miðað við bakgrunninn."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Uppfæra skjástækkun sjálfkrafa"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Uppfæra skjástækkun þegar skipt er milli forrita"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Aflrofi lýkur símtali"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Hætta við"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Birtuskil"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Staðlað"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Sjálfgefið"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Miðlungs"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Mikið"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Aðeins er hægt að opna þetta forrit í 1 glugga"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 055c4d2..c35df07 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Accoppia orecchio destro"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Accoppia orecchio destro"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Per tutte le protesi uditive disponibili"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Altre impostazioni delle protesi uditive"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Modifica le impostazioni cross-device, come scorciatoie e controlli telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Per questo dispositivo"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Uscita audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informazioni su uscita audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurazione dello spazio privato in corso…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Le notifiche delle app nello spazio privato vengono nascoste quando quest\'ultimo è bloccato"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Esplora le impostazioni dello spazio privato per nasconderlo e configurare il blocco automatico"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Le app obbligatorie sono già installate nel tuo spazio privato"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Impossibile configurare uno spazio privato"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Riprova"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Usare blocco schermo per sbloccare spazio privato?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"App e notifiche"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notifiche sensibili sulla schermata di blocco"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Mostra contenuti sensibili quando lo spazio privato è sbloccato"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Crea un Account Google per mantenere privati i tuoi dati"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Nella schermata successiva puoi accedere a un account da usare con lo spazio privato"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Crea un account dedicato per impedire la visualizzazione dei dati al di fuori dello spazio privato, ad esempio:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Foto, file, contatti email, eventi nel calendario e altri dati sincronizzati"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Cronologia dei download delle app e consigli"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Cronologia di navigazione, preferiti e password salvate"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Contenuti suggeriti in base alla tua attività nelle app dello spazio privato"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Ok"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> impronte digitali"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Hai aggiunto il numero massimo di impronte digitali"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossibile aggiungere ulteriori impronte digitali"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> per gestire le connessioni di rete?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Richieste di posizione recenti"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Posizione per profilo di lavoro"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autorizzazioni per la posizione"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La geolocalizzazione non è attiva"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# app su {total} ha accesso alla posizione}other{# app su {total} hanno accesso alla posizione}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Reimposta"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Scegli un tasto di modifica"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Scegli un nuovo tasto per <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predefinito"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voce"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocità del puntatore"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controller di gioco"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Generali"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visualizzazione"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Colore e movimento"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contrasto di colore"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Un contrasto più elevato rende testi, pulsanti e icone più distinguibili. Scegli il contrasto più adatto a te."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Alcune app potrebbero non supportare tutte le impostazioni di contrasto di colore e del testo"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Regola l\'aspetto dei colori e del testo rispetto al colore dello sfondo del tuo schermo"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Anteprima"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 giorni fa"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Ricontattare?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Report della trasferta"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Per ulteriore assistenza, contatta \nme o Helen. Questo report sarà"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Spese del cliente"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Scurisci lo schermo"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controlli di interazione"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Controlli basati sul tempo"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Non trasparente"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Testo ad alto contrasto"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Cambia il colore del testo in bianco o nero. Massimizza il contrasto con lo sfondo."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Massimizza il contrasto del testo"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Cambia il colore del testo in bianco o nero per aumentare il contrasto con lo sfondo."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Aggiorn. autom. ingrandim. schermo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Aggiorna ingrandimento schermo per transizioni app"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Chiudi chiamata con tasto accensione"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Annulla"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contrasto"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Valore predefinito"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Medio"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Alto"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Questa app può essere aperta soltanto in 1 finestra"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 83c2a44..dedee13 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"התאמה באוזן ימין"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"התאמה באוזן שמאל"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"לכל מכשירי השמיעה הזמינים"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"הגדרות נוספות של מכשיר השמיעה"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"‏שינוי הגדרות שמקושרות למכשיר אחר כמו אמצעי בקרה לקיצורי דרך ו-Telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"למכשיר הזה"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"פלט אודיו"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"מידע על פלט האודיו"</string>
@@ -588,25 +586,17 @@
     <string name="no_device_lock_cancel" msgid="4412602160321228863">"ביטול"</string>
     <string name="private_space_cancel_label" msgid="379259667396956886">"ביטול"</string>
     <string name="private_space_setup_button_label" msgid="2094882154623560585">"הגדרה"</string>
-    <!-- no translation found for private_space_setup_title (2272968244329821450) -->
-    <skip />
-    <!-- no translation found for private_space_hide_apps_summary (4418722947376042418) -->
-    <skip />
-    <!-- no translation found for private_space_setup_sub_header (5454598292017819146) -->
-    <skip />
-    <!-- no translation found for private_space_separate_account_text (4492251315012955548) -->
-    <skip />
-    <!-- no translation found for private_space_protected_lock_text (9123250938334372735) -->
-    <skip />
-    <!-- no translation found for private_space_install_apps_text (5693139160766464498) -->
-    <skip />
+    <string name="private_space_setup_title" msgid="2272968244329821450">"המרחב הפרטי"</string>
+    <string name="private_space_hide_apps_summary" msgid="4418722947376042418">"‏הסתרה או נעילה של אפליקציות פרטיות במרחב נפרד. שימוש בחשבון Google ייעודי לאבטחה נוספת."</string>
+    <string name="private_space_setup_sub_header" msgid="5454598292017819146">"הגדרת המרחב הפרטי שלך"</string>
+    <string name="private_space_separate_account_text" msgid="4492251315012955548">"‏"<b>"בחירת חשבון Google לשימוש במרחב הפרטי"</b>\n"שימוש בחשבון ייעודי עוזר למנוע הופעה של קבצים, תמונות ואימיילים מסונכרנים מחוץ למרחב הפרטי"</string>
+    <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"הגדרת נעילה"</b>\n"אפשר לנעול את המרחב הפרטי כדי למנוע מאנשים אחרים לפתוח אותו"</string>
+    <string name="private_space_install_apps_text" msgid="5693139160766464498">"‏"<b>"התקנת אפליקציות"</b>\n"למרחב הפרטי שלך יש חנות Play משלו כך שאפשר להתקין אפליקציות בקלות."</string>
     <string name="private_space_apps_permission_text" msgid="7030946025253366172">"אפליקציות במרחב הפרטי לא יופיעו בניהול ההרשאות, במרכז הבקרה להגדרות הפרטיות ובהגדרות אחרות כשהמרחב הפרטי נעול.\n\nלא ניתן להעביר את המרחב הפרטי למכשיר חדש. עליך להגדיר מרחב פרטי אחר אם ברצונך להשתמש בו במכשיר אחר.\n\nכל מי שיחבר את המכשיר שלך למחשב או יתקין אפליקציות מזיקות במכשיר שלך יוכל לגשת למרחב הפרטי שלך."</string>
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"הגדרת המרחב הפרטי מתבצעת…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ההתראות מהאפליקציות במרחב הפרטי מוסתרות כשהוא נעול"</string>
-    <!-- no translation found for private_space_explore_settings_title (1448128245941571654) -->
-    <skip />
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_explore_settings_title" msgid="1448128245941571654">"אפשר לבדוק את ההגדרות של המרחב הפרטי כדי להסתיר את המרחב הפרטי ולהגדיר נעילה אוטומטית"</string>
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"האפליקציות הנדרשות כבר מותקנות במרחב הפרטי שלך"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"לא ניתן להגדיר מרחב פרטי"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ניסיון נוסף"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"להשתמש בנעילת המסך כדי לבטל את נעילת המרחב הפרטי?"</string>
@@ -629,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"אפליקציות והתראות"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"התראות רגישות במסך הנעילה"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"הצגת תוכן רגיש כשהמרחב הפרטי פתוח"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"‏מומלץ ליצור חשבון Google כדי לשמור על פרטיות הנתונים"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"במסך הבא אפשר להיכנס לחשבון שישמש למרחב הפרטי"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"כדאי ליצור חשבון ייעודי כדי שנתונים לא יופיעו מחוץ למרחב הפרטי, למשל:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"תמונות מסונכרנות, קבצים, אימיילים, אנשי קשר, אירועים ביומן ונתונים אחרים"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"היסטוריית ההורדות של אפליקציות והמלצות"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"היסטוריית הגלישה, סימניות וסיסמאות שמורות"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"תוכן מוצע שקשור לפעילות שלך באפליקציות המרחב הפרטי"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"הבנתי"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"אפשר להוסיף עד <xliff:g id="COUNT">%d</xliff:g> טביעות אצבע"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"הוספת את המספר המרבי של טביעות אצבע."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"לא ניתן להוסיף עוד טביעות אצבע"</string>
@@ -969,14 +951,10 @@
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"‏עדיפות לתדר 5.0 GHz"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"‏הגדרות IP"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"פרטיות"</string>
-    <!-- no translation found for wifi_privacy_mac_settings (3188060664478313363) -->
-    <skip />
-    <!-- no translation found for wifi_privacy_device_name_settings (3699130177041345275) -->
-    <skip />
-    <!-- no translation found for wifi_privacy_send_device_name_toggle_title (1228107313152880073) -->
-    <skip />
-    <!-- no translation found for wifi_privacy_send_device_name_toggle_summary (5995365836332817655) -->
-    <skip />
+    <string name="wifi_privacy_mac_settings" msgid="3188060664478313363">"MAC"</string>
+    <string name="wifi_privacy_device_name_settings" msgid="3699130177041345275">"שם המכשיר"</string>
+    <string name="wifi_privacy_send_device_name_toggle_title" msgid="1228107313152880073">"שליחת שם המכשיר"</string>
+    <string name="wifi_privacy_send_device_name_toggle_summary" msgid="5995365836332817655">"שיתוף שם המכשיר הזה ברשת"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"מינוי"</string>
     <string name="wifi_subscription_summary" msgid="18802471063384598">"הצגה או שינוי של מינוי"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"‏כתובת MAC אקראית"</string>
@@ -1564,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"האם להשתמש ב-<xliff:g id="NEW_APP">%s</xliff:g> כדי לנהל את חיבורי הרשת שלך?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"בקשות של מיקומים אחרונים"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"מיקום עבור פרופיל עבודה"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"הרשאות מיקום של אפליקציות"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"תכונת המיקום כבויה"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{לאחת (#) מתוך {total} אפליקציות יש גישה למיקום}one{ל-# מתוך {total} אפליקציות יש גישה למיקום}two{ל-# מתוך {total} אפליקציות יש גישה למיקום}other{ל-# מתוך {total} אפליקציות יש גישה למיקום}}"</string>
@@ -1958,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"איפוס"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"בחירת מקש צירוף"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"יש לבחור מפתח חדש עבור <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ברירת מחדל"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"דיבור"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"מהירות המצביע"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"בקר משחק"</string>
@@ -2021,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"הגדרות כלליות"</string>
     <string name="display_category_title" msgid="6638191682294461408">"תצוגה"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"צבע ותנועה"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"ניגודיות של צבעים"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ניגודיות גבוהה יותר מבליטה את הטקסט, הלחצנים והסמלים. כדאי לבחור את הניגודיות שמתאימה לך."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"חלק מהאפליקציות לא תומכות בכל הגדרות הצבע והניגודיות של הטקסט"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"אפשר להתאים את מראה הצבעים והטקסט לצבע הרקע של המסך"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"תצוגה מקדימה"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ציפורה, פנחס"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"לפני יומיים"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"להמשיך בטיפול?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"דוח על נסיעת העסקים"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"לסיוע נוסף, אפשר לפנות אליי\nאו לציפורה הדוח הזה יהיה"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"הוצאות הלקוח"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"הכהיית המסך"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"פקדי אינטראקציה"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"הגדרות תזמון"</string>
@@ -2179,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"לא שקוף"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"טקסט בניגודיות גבוהה"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"שינוי צבע הטקסט לשחור או לבן. ניגודיות מקסימלית לצבע הרקע."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"הגדלת הניגודיות של הטקסט למקסימום"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ניתן לשנות את צבע הטקסט לשחור או לבן כדי להגביר את הניגודיות עם הרקע."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"עדכון אוטומטי של הגדלת מסך"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"עדכון הגדלת מסך במעבר בין אפליקציות"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"לחצן ההפעלה מסיים שיחה"</string>
@@ -2304,8 +2277,7 @@
     <!-- no translation found for accessibility_hearing_device_footer_summary (256061045064940818) -->
     <skip />
     <string name="accessibility_hearing_device_pairing_page_title" msgid="6608901091770850295">"התאמה של מכשיר השמיעה"</string>
-    <!-- no translation found for accessibility_hearing_device_pairing_intro (7022201665808166517) -->
-    <skip />
+    <string name="accessibility_hearing_device_pairing_intro" msgid="7022201665808166517">"‏בעמוד הזה אפשר להתאים מכשירי שמיעה של ASHA ו-LE Audio. צריך לוודא שמכשיר השמיעה מופעל ומוכן להתאמה."</string>
     <string name="accessibility_found_hearing_devices" msgid="637407580358386553">"מכשירי שמיעה זמינים"</string>
     <string name="accessibility_found_all_devices" msgid="7817834722148556520">"לא רואה את מכשיר השמיעה שלך?"</string>
     <string name="accessibility_list_all_devices_title" msgid="161495343959211216">"הצגת מכשירים נוספים"</string>
@@ -5136,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ביטול"</string>
     <string name="contrast_title" msgid="6885768151336508075">"ניגודיות"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"רגילה"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ברירת המחדל"</string>
     <string name="contrast_medium" msgid="384414510709285811">"בינונית"</string>
     <string name="contrast_high" msgid="3988567609694797696">"גבוהה"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ניתן לפתוח את האפליקציה הזו רק בחלון אחד"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 15bb7f4..7ac5be9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ネットワーク接続の管理に<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか？"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"最近の位置情報リクエスト"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"仕事用プロファイルで位置情報を使用"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"アプリへの位置情報の利用許可"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"位置情報は OFF です"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} 個中 # 個のアプリに位置情報へのアクセスを許可しています}other{{total} 個中 # 個のアプリに位置情報へのアクセスを許可しています}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"リセット"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"修飾キーを選択"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> の新しいキーを選択してください"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"デフォルト"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"読み上げ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ポインタの速度"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ゲーム用コントローラ"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index ed6a29f..230a618 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"დააწყვილეთ მარჯვენა დინამიკი"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"მარცხენა დინამიკის დაკავშირება"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"სმენის ყველა ხელმისაწვდომი აპარატისთვის"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"სმენის აპარატის სხვა პარამეტრები"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"შეცვალეთ ისეთი მოწყობილობათაშორისი პარამეტრები, როგორიცაა მალსახმობები და ტელეკოილის კონტროლები"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ამ მოწყობილობისთვის"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"გამომავალი აუდიო"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"აუდიოს გამოსატანის შესახებ"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"მიმდინარეობს პირადი სივრცის დაყენება…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"კერძო სივრცის აპების შეტყობინებები დამალულია, როცა ის ჩაკეტილია"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"გაეცანით კერძო სივრცის პარამეტრებს ავტომატური ჩაკეტვის დასაყენებლად და კერძო სივრცის დასამალად"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"მოთხოვნილი აპები უკვე დაინსტალირებულია თქვენს კერძო სივრცეში"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"კერძო სივრცის დაყენება ვერ მოხერხდა"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ხელახლა ცდა"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"გსურთ ეკრანის დაბლოკვის გამოყენება პირადი სივრცის განსაბლოკად?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"აპები და შეტყობინებები"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"სენსიტიური შეტყობინებები ჩაკეტილ ეკრანზე"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"სენსიტიური კონტენტის ჩვენება, როდესაც კერძო სივრცე განბლოკილია"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"შექმენით Google ანგარიში თქვენი მონაცემების კონფიდენციალურობის შენარჩუნებისთვის"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"შემდეგ ეკრანზე შეგიძლიათ შეხვიდეთ ანგარიშში, რათა გამოიყენოთ ის თქვენს კერძო სივრცესთან ერთად"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"შექმენით სპეციალური ანგარიში, რომელიც დაგეხმარებათ შეაჩეროთ თქვენი კერძო სივრცის გარეთ შემდეგი მონაცემების გამოჩენა:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"სინქრონიზებული ფოტოები, ელფოსტები, კონტაქტები, კალენდარის მოვლენები და სხვა ინფორმაცია"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"აპლიკაციების ჩამოტვირთვების ისტორია და რეკომენდაციები"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"დათვალიერების ისტორია, სანიშნეები და შენახული პაროლები"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"კერძო სივრცის აპლიკაციებში თქვენი აქტივობის შესაბამისი შემოთავაზებული კონტენტი"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"გასაგებია"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"შეგიძლიათ დაამატოთ მაქსიმუმ <xliff:g id="COUNT">%d</xliff:g> თითის ანაბეჭდი"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"თქვენ უკვე დაამატეთ თითის ანაბეჭდების მაქსიმალური რაოდენობა"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"მეტი თითის ანაბეჭდის დამატება ვერ ხერხდება"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"გსურთ ქსელის კავშირების სამართავად <xliff:g id="NEW_APP">%s</xliff:g>-ის გამოყენება?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"მდებარეობის ბოლო მოთხოვნები"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ადგილმდებარეობა სამუშაო პროფილისათვის"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"აპის მდებარეობის ნებართვები"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"მდებარეობა გამორთულია"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{მდებარეობაზე წვდომა აქვს {total}-დან # აპს}other{მდებარეობაზე წვდომა აქვს {total}-დან # აპს}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"გადაყენება"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"აირჩიეთ მოდიფიკატორი კლავიში"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"აირჩიეთ ახალი კლავიში <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-ისთვის:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ნაგულისხმევი"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"მეტყველება"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"მანიშნებლის სიჩქარე"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"თამაშის მეთვალყურე"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"ზოგადი"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ეკრანი"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ფერი და მოძრაობა"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"ფერთა კონტრასტი"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"მაღალი კონტრასტი ტექსტს, ღილაკებსა და ხატულებს მეტად გამოკვეთს. აირჩიეთ თქვენთვის საუკეთესო კონტრასტი."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"ზოგიერთ აპს არ აქვს ყველა ფერისა და ტექსტის კონტრასტის პარამეტრების მხარდაჭერა"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"დაარეგულირეთ ფერები და ტექსტი თქვენი ეკრანის ფონის ფერთან მიმართებაში"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"გადახედვა"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ჰელენ, ადამ"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 დღის წინ"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"გსურთ გაგრძელება?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"საქმიანი ვიზიტის ანგარიში"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"დამატებითი დახმარებისთვის მოგვმართეთ \nმე ან ჰელენს. ეს ანგარიში იქნება"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"კლიენტის ხარჯები"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ეკრანის მუქი რეჟიმის ჩართვა"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ინტერაქციის მართვის საშუალებები"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"დროის მართვა"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"გაუმჭვირვალე"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"მაღალკონტრასტიანი ტექსტი"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"ტექსტის ფერის შავით ან თეთრით შეცვლა. აძლიერებს კონტრასტს ფონთან."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"ტექსტის კონტრასტის მაქსიმიზაცია"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"შეცვალეთ ტექსტის ფერი შავზე ან თეთრზე ფონის კონტრასტის გაზრდისთვის."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"ეკრანის მასშტაბის ავტომატური განახლება"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ეკრანის მასშტაბის განახლება ერთი აპიდან მეორეზე გადასვლისას"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ზარი შეწყდება ჩართვის ღილაკზე დაჭერით"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"გაუქმება"</string>
     <string name="contrast_title" msgid="6885768151336508075">"კონტრასტი"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"სტანდარტული"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ნაგულისხმევი"</string>
     <string name="contrast_medium" msgid="384414510709285811">"საშუალო"</string>
     <string name="contrast_high" msgid="3988567609694797696">"მაღალი"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ამ აპის გახსნა შესაძლებელია მხოლოდ 1 ფანჯარაში"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2a61506..e67553e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Оң құлақты жұптау"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Сол құлақты жұптау"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Барлық қолжетімді есту құрылғысына қатысты"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Есту құрылғысының тағы басқа параметрлері"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Белгіше, индукциялық катушка басқару элементтері сияқты аралық құрылғы параметрлерін өзгерту"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Осы құрылғыға қатысты"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио шығысы"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Аудио шығысы туралы"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Жеке бөлме реттеліп жатыр…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Құпия кеңістік құлыптаулы кезде, ондағы қолданбалардан келетін хабарландырулар жасырылады"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Құпия кеңістікті жасырып, автоматты құлыптау функциясын орнату үшін құпия кеңістік параметрлерін көріңіз"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Қажетті қолданбалар құпия кеңістікке орнатылып қойған"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Құпия кеңістікті реттеу мүмкін болмады"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Қайталау"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Жеке бөлмеңіздің құлпы экран құлпымен ашылсын ба?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Қолданбалар мен хабарландырулар"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Құлып экранындағы құпия хабарландырулар"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Құпия кеңістік құлпы ашылған кезде шетін контентті көрсету."</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Деректерді құпия ұстауға көмектесетін Google аккаунтын жасау"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Келесі экранда құпия кеңістікті пайдалану үшін аккаунтыңызға кіре аласыз."</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Деректердің құпия кеңістіктен шығып кетуінің алдын алу үшін арнайы аккаунт жасаңыз, мысалы:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синхрондалған фотосуреттер, файлдар, электрондық хаттар, контактілер, күнтізбедегі іс-шаралар және тағы басқа деректер"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Қолданба жүктеп алу тарихы және ұсыныстар"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Браузерді қолдану тарихы, бетбелгілер және сақталған құпия сөздер"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Құпия кеңістік қолданбаларындағы әрекетке қатысты ұсынылған контент"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Түсінікті"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> саусақ ізіне дейін қосуға болады"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Саусақ іздерінің максималды саны енгізілді"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Қосымша саусақ іздері енгізілмейді"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Желілік байланыстарды басқару үшін <xliff:g id="NEW_APP">%s</xliff:g> қолданбасын пайдалану керек пе?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Соңғы орынды анықтау сұраулары"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Жұмыс профиліндегі локация"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Қолданбалардың локацияны пайдалануы"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Локация өшірулі"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} қолданба локацияны пайдалана алады.}other{#/{total} қолданба локацияны пайдалана алады.}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Қайта орнату"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Өзгерткіш перне таңдау"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> жаңа пернесін таңдау:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Әдепкі"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Сөз"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Меңзер жылдамдығы"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Ойын бақылаушы"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Жалпы"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Түс және қозғалыс"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Түс конрасты"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Жоғары контраст мәтінді, түймелерді және белгішелерді ерекшелейді. Өзіңізге ұнайтын контрасты таңдаңыз."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Кейбір қолданбалар барлық түс және мәтін контрасты параметрін қолдамауы мүмкін."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Түстер мен мәтінді экран фонына сәйкестендіріп реттеу"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Алғы көрініс"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелен, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 күн бұрын"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Жазыласыз ба?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Іссапар туралы есеп"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Қосымша көмек алу үшін \nмаған немесе Хеленге хабарласыңыз. Бұл есеп"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Клиент шығындары"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Экранды қараңғылау"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Басқару элементтері"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Уақытты басқару элементтері"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Мөлдір емес"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Жоғары контрасты мәтін"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Мәтін түсін қараға немесе аққа өзгертеді. Фонмен арадағы контрасты арттырады."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Мәтін контрастын арттыру"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Мәтін түсін қараға немесе аққа өзгертеді. Фонмен арадағы контрасты арттырады."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Экранды ұлғайтуды авто жаңарту"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Қолданба ауысуларындағы экран ұлғайту функциясын жаңарту"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Қуат түймесі арқылы қоңырауды үзу"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Бас тарту"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контраст"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандартты режим"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Әдепкі"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Орташа"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Жоғары"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Бұл қолданбаны тек 1 терезеден ашуға болады."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 6b73313..22cc9b4 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"ផ្គូផ្គងឧបករណ៍ជំនួយការស្ដាប់ខាងស្ដាំ"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ផ្គូផ្គងឧបករណ៍ជំនួយការស្ដាប់ខាងឆ្វេង"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"សម្រាប់ឧបករណ៍ស្ដាប់ដែលមានទាំងអស់"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"ការកំណត់ឧបករណ៍ជំនួយការស្ដាប់ច្រើនទៀត"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"ផ្លាស់ប្ដូរការកំណត់ឆ្លងកាត់ឧបករណ៍ដូចជា ការគ្រប់គ្រងផ្លូវកាត់ និងមុខងារកែលម្អការស្ដាប់ជាដើម"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"សម្រាប់​ឧបករណ៍​នេះ"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ឧបករណ៍បញ្ចេញសំឡេង"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"អំពីឧបករណ៍បញ្ចេញសំឡេង"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"កំពុងរៀបចំបន្ទប់ឯកជន…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ការជូនដំណឹងពីកម្មវិធីនៅក្នុងលំហឯកជនត្រូវបានលាក់ នៅពេលលំហនេះត្រូវបានចាក់សោ"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"រុករកការកំណត់លំហឯកជន ដើម្បីលាក់លំហឯកជន និងរៀបចំការចាក់សោស្វ័យប្រវត្តិ"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"កម្មវិធីដែលចាំបាច់ត្រូវបានដំឡើងរួចហើយនៅក្នុងលំហឯកជនរបស់អ្នក"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"មិនអាចរៀបចំលំហឯកជនបានទេ"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ព្យាយាមម្ដងទៀត"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ប្រើមុខងារចាក់សោអេក្រង់ ដើម្បីដោះសោបន្ទប់ឯកជនឬ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"កម្មវិធី និងការជូនដំណឹង"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"ការជូនដំណឹងរសើបលើអេក្រង់ចាក់សោ"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"បង្ហាញខ្លឹមសារ​រសើប ពេលលំហឯកជនត្រូវបានដោះសោ"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"បង្កើតគណនី Google ដើម្បីជួយរក្សាទិន្នន័យរបស់អ្នកឱ្យមានលក្ខណៈឯកជន"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"អ្នកអាចចូលគណនីណាមួយ ដើម្បីប្រើជាមួយលំហឯកជនរបស់អ្នកនៅលើអេក្រង់បន្ទាប់"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"បង្កើតគណនីដាច់ដោយឡែក ដើម្បីជួយបញ្ឈប់ទិន្នន័យមិនឱ្យបង្ហាញនៅខាងក្រៅលំហឯកជន ដូចជា៖"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"រូបថត ឯកសារ អ៊ីមែល ទំនាក់ទំនង ព្រឹត្តិការណ៍ក្នុងប្រតិទិន និងទិន្នន័យដែលបានធ្វើសមកាលកម្មផ្សេងទៀត"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ការណែនាំ និងប្រវត្តិទាញយកកម្មវិធី"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ប្រវត្តិរុករកតាមអ៊ីនធឺណិត ចំណាំ និងពាក្យសម្ងាត់ដែលបានរក្សាទុក"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ខ្លឹមសារដែលបានណែនាំពាក់ព័ន្ធនឹងសកម្មភាពរបស់អ្នកនៅក្នុងកម្មវិធីលំហឯកជន"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"យល់ហើយ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"អ្នកអាចបញ្ចូលស្នាមម្រាមដៃបានត្រឹម <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"អ្នក​បាន​បញ្ចូល​ស្នាម​ម្រាមដៃ​ដល់​ចំនួន​អតិបរមា​ហើយ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"មិន​អាច​បញ្ចូល​ស្នាម​ម្រាមដៃ​បាន​ទៀត​ទេ"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ដើម្បី​គ្រប់គ្រង​ការ​ភ្ជាប់​បណ្ដាញ​របស់​អ្នក?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ទីតាំងសម្រាប់កម្រងព័ត៌មានការងារ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ការអនុញ្ញាតទីតាំងកម្មវិធី"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ទីតាំង​បាន​បិទ"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{កម្មវិធី # នៃ {total} មានសិទ្ធិ​ចូលប្រើ​ទីតាំង}other{កម្មវិធី # នៃ {total} មានសិទ្ធិ​ចូលប្រើ​ទីតាំង}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"កំណត់​ឡើងវិញ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"ជ្រើសរើស​ប៊ូតុងឧបករណ៍កែសម្រួល"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ជ្រើសរើសប៊ូតុងថ្មីសម្រាប់ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>៖"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"លំនាំដើម"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"ការ​និយាយ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ល្បឿន​ព្រួញ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"កម្មវិធី​ពិនិត្យ​ល្បែង"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"ទូទៅ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"បង្ហាញ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ពណ៌ និងចលនា"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"កម្រិតពណ៌"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"កម្រិតពណ៌កាន់តែខ្ពស់ធ្វើឱ្យអក្សរ ប៊ូតុង និងរូបតំណាងកាន់តែលេចធ្លោ។ សូមជ្រើសរើសកម្រិតពណ៌ដែលមើលទៅល្អបំផុតសម្រាប់អ្នក។"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"កម្មវិធីមួយចំនួនប្រហែលជាមិនអាចប្រើការកំណត់កម្រិតពណ៌ និងកម្រិតពណ៌អក្សរទាំងអស់បានទេ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"កែតម្រូវលក្ខណៈពណ៌ និងអក្សរធៀបនឹងពណ៌ផ្ទៃខាងក្រោយរបស់អេក្រង់អ្នក"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"មើលសាកល្បង"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ថ្ងៃមុន"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ទាក់ទងបន្តឬ?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"របាយការណ៍អំពីការធ្វើដំណើរបែបធុរកិច្ច"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"សម្រាប់ជំនួយបន្ថែម សូមទាក់ទងមក\nខ្ញុំផ្ទាល់ ឬ Helen។ របាយការណ៍នេះនឹង"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Client Expenses"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ធ្វើឱ្យអេក្រង់ងងឹតជាងមុន"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ការ​គ្រប់គ្រង​អន្តរកម្ម"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"ការគ្រប់គ្រងការកំណត់ពេល"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"មិនថ្លា"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"អក្សរពន្លឺបញ្ច្រាស​​កម្រិត​​ខ្ពស់"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"ប្ដូរពណ៌អក្សរទៅខ្មៅ ឬស។ បង្កើនពន្លឺបញ្ច្រាសក្នុងកម្រិតខ្ពស់បំផុតដោយប្រើផ្ទៃខាងក្រោយ។"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"បង្កើនកម្រិតពណ៌អក្សរ"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ផ្លាស់ប្ដូរពណ៌អក្សរទៅខ្មៅឬស ដើម្បីបង្កើនកម្រិតពណ៌នៅផ្ទៃខាងក្រោយ។"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"ធ្វើ​បច្ចុប្បន្នភាព​ការ​ពង្រីក​អេក្រង់​ស្វ័យប្រវត្តិ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ធ្វើ​បច្ចុប្បន្ន​ភាព​ការ​ពង្រីក​អេក្រង់​ពេល​មាន​ដំណើរ​ផ្លាស់​ប្ដូរ​កម្មវិធី"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ប៊ូតុងថាមពល​បញ្ចប់​ការ​ហៅ"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"បោះបង់"</string>
     <string name="contrast_title" msgid="6885768151336508075">"កម្រិត​រំលេចពណ៌"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"ស្តង់ដារ"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"លំនាំដើម"</string>
     <string name="contrast_medium" msgid="384414510709285811">"មធ្យម"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ខ្ពស់"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"អាចបើកកម្មវិធីនេះបានតែក្នុងវិនដូ 1 ប៉ុណ្ណោះ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 952d2a5..c2487b2 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"ಬಲಕಿವಿಯ ಶ್ರವಣ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ಎಡಕಿವಿಯ ಶ್ರವಣ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಶ್ರವಣ ಸಾಧನಗಳಿಗೆ"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"ಇನ್ನಷ್ಟು ಹಿಯರಿಂಗ್ ಸಾಧನದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"ಶಾರ್ಟ್‌ಕಟ್ ಮತ್ತು ಟೆಲಿಕಾಲ್ ನಿಯಂತ್ರಣಗಳಂತಹ ಕ್ರಾಸ್-ಸಾಧನದ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ಈ ಸಾಧನಕ್ಕಾಗಿ"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ಆಡಿಯೋ ಔಟ್‌ಪುಟ್"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ಆಡಿಯೋ ಔಟ್‌ಪುಟ್ ಕುರಿತು"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"ಖಾಸಗಿ ಸ್ಪೇಸ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಆ್ಯಪ್‌ಗಳು ಲಾಕ್ ಆಗಿರುವಾಗ ಅದರಲ್ಲಿರುವ ನೋಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಮರೆಮಾಡಲಾಗುತ್ತದೆ"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಮರೆಮಾಡಲು ಮತ್ತು ಸ್ವಯಂಚಾಲಿತ ಲಾಕಿಂಗ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"ಅಗತ್ಯವಿರುವ ಆ್ಯಪ್‌ಗಳನ್ನು ಈಗಾಗಲೇ ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್‌ನಲ್ಲಿ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ಖಾಸಗಿ ಸ್ಪೇಸ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸಬೇಕೇ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ನೋಟಿಫಿಕೇಶನ್‌ಗಳು"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಸೂಕ್ಷ್ಮವಾದ ನೋಟಿಫಿಕೇಶನ್‌ಗಳು"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್‌ಲಾಕ್ ಆಗಿರುವಾಗ ಸೆನ್ಸಿಟಿವ್ ಕಂಟೆಂಟ್ ತೋರಿಸಿ"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಖಾಸಗಿಯಾಗಿಡುವುದಕ್ಕೆ ಸಹಾಯ ಮಾಡಲು Google ಖಾತೆಯನ್ನು ರಚಿಸಿ"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"ಮುಂದಿನ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಮೂಲಕ ಬಳಸಲು ನೀವು ಖಾತೆಗೆ ಸೈನ್ ಇನ್ ಮಾಡಬಹುದು"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್‌ನ ಹೊರಗೆ ಡೇಟಾ ಕಾಣಿಸಿಕೊಳ್ಳುವುದನ್ನು ನಿಲ್ಲಿಸುವುದಕ್ಕೆ ಸಹಾಯ ಮಾಡಲು ಮೀಸಲಿರುವ ಖಾತೆಯನ್ನು ರಚಿಸಿ, ಉದಾಹರಣೆಗೆ:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"ಸಿಂಕ್ ಮಾಡಿದ ಫೋಟೋಗಳು, ಫೈಲ್‌ಗಳು, ಇಮೇಲ್‌ಗಳು, ಸಂಪರ್ಕಗಳು, ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳು ಮತ್ತು ಇತರ ಡೇಟಾ"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ಆ್ಯಪ್ ಡೌನ್‌ಲೋಡ್ ಇತಿಹಾಸ ಮತ್ತು ಶಿಫಾರಸುಗಳು"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ಬ್ರೌಸಿಂಗ್ ಇತಿಹಾಸ, ಬುಕ್‌ಮಾರ್ಕ್‌ ಹಾಗೂ ಸೇವ್‌ ಮಾಡಿದ ಪಾಸ್‌ವರ್ಡ್‌"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಆ್ಯಪ್‌ಗಳಲ್ಲಿ ನಿಮ್ಮ ಚಟುವಟಿಕೆಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ಸೂಚಿಸಲಾದ ಕಂಟೆಂಟ್‌"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"ಅರ್ಥವಾಯಿತು"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ನೀವು ಗರಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ನೀವು ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಿರುವಿರಿ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ಹೆಚ್ಚಿನ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="NEW_APP">%s</xliff:g> ಬಳಸುವುದೇ?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"ಇತ್ತೀಚಿನ ಸ್ಥಳ ವಿನಂತಿಗಳು"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನ ಸ್ಥಳ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ಆ್ಯಪ್ ಸ್ಥಳದ ಅನುಮತಿಗಳು"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ಸ್ಥಳ ಆಫ್‌ ಆಗಿದೆ"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} ರಲ್ಲಿ # ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿವೆ}one{{total} ರಲ್ಲಿ # ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿವೆ}other{{total} ರಲ್ಲಿ # ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿವೆ}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ರೀಸೆಟ್ ಮಾಡಿ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"ಮಾರ್ಪಡಿಸುವ ಕೀ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ಗಾಗಿ ಹೊಸ ಕೀ ಆಯ್ಕೆಮಾಡಿ:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ಡಿಫಾಲ್ಟ್"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"ಧ್ವನಿ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ಪಾಯಿಂಟರ್ ವೇಗ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ಆಟ ನಿಯಂತ್ರಕ"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"ಸಾಮಾನ್ಯ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ಬಣ್ಣ ಮತ್ತು ಚಲನೆ"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"ಕಲರ್ ಕಾಂಟ್ರಾಸ್ಟ್‌‌"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ಹೆಚ್ಚಿನ ಕಾಂಟ್ರಾಸ್ಟ್ ಪಠ್ಯ, ಬಟನ್‌ಗಳು ಮತ್ತು ಐಕಾನ್‌ಗಳನ್ನು ಎದ್ದು ಕಾಣುವಂತೆ ಮಾಡುತ್ತದೆ. ನಿಮಗೆ ಉತ್ತಮವಾಗಿ ಕಾಣುವ ಕಾಂಟ್ರಾಸ್ಟ್ ಅನ್ನು ಆರಿಸಿ."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"ಕೆಲವು ಆ್ಯಪ್‌ಗಳು ಎಲ್ಲಾ ಬಣ್ಣ ಮತ್ತು ಪಠ್ಯದ ಕಾಂಟ್ರಾಸ್ಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬೆಂಬಲಿಸದೇ ಇರಬಹುದು"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ನ ಹಿನ್ನೆಲೆ ಬಣ್ಣಕ್ಕೆ ಹೊಂದಿಕೊಳ್ಳುವಂತೆ ಬಣ್ಣಗಳು ಮತ್ತು ಪಠ್ಯವು ಹೇಗೆ ಕಾಣಬೇಕು ಎಂಬುದನ್ನು ಅಡ್ಜಸ್ಟ್‌ ಮಾಡಿ"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"ಪೂರ್ವವೀಕ್ಷಿಸಿ"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ಹೆಲೆನ್, ಆಡಮ್"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ದಿನಗಳ ಹಿಂದೆ"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ಅನುಸರಿಸುವಿರಾ?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"ವ್ಯಾಪಾರ ಪ್ರವಾಸದ ವರದಿ"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"ಹೆಚ್ಚಿನ ಸಹಾಯಕ್ಕಾಗಿ, \nನನ್ನನ್ನು ಅಥವಾ ಹೆಲೆನ್ ಅವರನ್ನು ಸಂಪರ್ಕಿಸಿ. ಈ ವರದಿ ಹೀಗೆ ಇರಲಿದೆ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"ಕ್ಲೈಂಟ್ ವೆಚ್ಚಗಳು"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಇನ್ನಷ್ಟು ಡಾರ್ಕ್ ಆಗಿಸಿ"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ಸಂವಹನ ನಿಯಂತ್ರಣಗಳು"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"ಸಮಯ ನಿಯಂತ್ರಣಗಳು"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"ಪಾರದರ್ಶಕವಲ್ಲದ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ಹೆಚ್ಚು ಕಾಂಟ್ರಾಸ್ಟ್‌ನ ಪಠ್ಯ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"ಪಠ್ಯದ ಬಣ್ಣವನ್ನು ಕಪ್ಪು ಅಥವಾ ಬಿಳಿ ಬಣ್ಣಕ್ಕೆ ಬದಲಾಯಿಸಿ. ಹಿನ್ನೆಲೆ ಬಣ್ಣದೊಂದಿಗೆ ಕಾಂಟ್ರಾಸ್ಟ್ ಅನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"ಪಠ್ಯದ ಕಾಂಟ್ರಾಸ್ಟ್ ಗರಿಷ್ಠಗೊಳಿಸಿ"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ಹಿನ್ನೆಲೆಯ ಕಾಂಟ್ರಾಸ್ಟ್ ಅನ್ನು ಹೆಚ್ಚಿಸಲು ಪಠ್ಯದ ಬಣ್ಣವನ್ನು ಕಪ್ಪು ಅಥವಾ ಬಿಳಿಗೆ ಬದಲಾಯಿಸಿ."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"ಸ್ವಯಂ ಅಪ್‍ಡೇಟ್ ಸ್ಕ್ರೀನ್‌ ವರ್ಧನೆ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ಅಪ್ಲಿಕೇಶನ್‌ ಪರಿವರ್ತನೆಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್‌ ವರ್ಧಕವನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ಪವರ್ ಬಟನ್ ಕರೆಯನ್ನು ಕೊನೆಗೊಳಿಸುತ್ತದೆ"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ರದ್ದುಮಾಡಿ"</string>
     <string name="contrast_title" msgid="6885768151336508075">"ಕಾಂಟ್ರಾಸ್ಟ್‌‌"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"ಪ್ರಮಾಣಿತ"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ಡೀಫಾಲ್ಟ್"</string>
     <string name="contrast_medium" msgid="384414510709285811">"ಮಧ್ಯಮ"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ಹೆಚ್ಚು"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ಈ ಆ್ಯಪ್ ಅನ್ನು 1 ವಿಂಡೋದಲ್ಲಿ ಮಾತ್ರ ತೆರೆಯಬಹುದು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1315551..78d4ee5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"오른쪽 보청기 페어링"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"왼쪽 보청기 페어링"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"사용 가능한 모든 보청기"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"청각 보조 기기 설정 더보기"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"단축키, 텔레코일 제어와 같은 교차 기기 설정을 변경합니다."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"이 기기에 적용"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"오디오 출력"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"오디오 출력 정보"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"비공개 스페이스 설정 중…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"비공개 스페이스가 잠겨 있으면 비공개 스페이스 앱에서 보내는 알림이 표시되지 않음"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"비공개 스페이스를 숨기고 자동 잠금을 설정하려면 비공개 스페이스 설정을 살펴보세요"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"필수 앱이 이미 비공개 스페이스에 설치되어 있습니다"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"비공개 스페이스를 설정할 수 없음"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"다시 시도"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"화면 잠금을 사용하여 비공개 스페이스를 잠금 해제하시겠습니까?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"앱 및 알림"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"잠금 화면의 민감한 알림"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"비공개 스페이스가 잠금 해제될 때 민감한 콘텐츠를 표시합니다."</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"데이터를 보호하기 위해 Google 계정 만들기"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"다음 화면에서 비공개 스페이스에서 사용할 계정에 로그인할 수 있습니다."</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"비공개 스페이스 외부로 데이터가 표시되지 않도록 전용 계정을 만드세요. (예:"</b>")"</string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"동기화된 사진, 파일, 이메일, 연락처, 캘린더 일정, 기타 데이터"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"앱 다운로드 기록 및 추천"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"방문 기록, 북마크, 저장된 비밀번호"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"비공개 스페이스 앱 내 활동과 관련하여 추천된 콘텐츠"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"확인"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"지문을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"최대 개수의 지문을 추가했습니다."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"지문을 추가할 수 없습니다."</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"<xliff:g id="NEW_APP">%s</xliff:g>을(를) 사용하여 네트워크 연결을 관리하시겠습니까?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"최근 위치 요청"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"직장 프로필 위치"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"앱 위치 정보 액세스 권한"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"위치 서비스 사용 안함"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total}개 중 #개의 앱이 위치에 액세스할 수 있음}other{{total}개 중 #개의 앱이 위치에 액세스할 수 있음}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"초기화"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"특수키 선택"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>의 새 키 선택:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"기본"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"음성"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"포인터 속도"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"게임 컨트롤러"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"일반"</string>
     <string name="display_category_title" msgid="6638191682294461408">"디스플레이"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"색상 및 모션"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"색상 대비"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"고대비를 사용하면 텍스트, 버튼, 아이콘이 더 선명하게 보입니다. 자신에게 가장 괜찮아 보이는 대비를 선택하세요."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"일부 앱에서는 모든 색상 및 텍스트 대조 설정을 지원하지 않습니다."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"화면의 배경 색상과 대조하여 색상과 텍스트를 어떻게 표시할지 조정합니다."</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"미리보기"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"헬렌, 아담"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2일 전"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"후속 조치를 하시겠습니까?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"출장 보고서"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"도움이 더 필요하시면 \n저나 헬렌에게 문의하세요. 이 보고서는"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"클라이언트 비용"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"화면 어둡게"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"상호작용 관리"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"타이밍 제어"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"불투명"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"고대비 텍스트"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"텍스트 색상을 검은색 또는 흰색으로 변경하여 배경과의 대비를 극대화합니다."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"텍스트 대조 극대화"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"배경과의 대비를 높이기 위해 텍스트 색상을 검은색 또는 흰색으로 변경합니다."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"화면 확대 자동 업데이트"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"앱 전환 시 화면 확대 업데이트"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"전원 버튼으로 통화 종료"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"취소"</string>
     <string name="contrast_title" msgid="6885768151336508075">"대비"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"표준"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"기본값"</string>
     <string name="contrast_medium" msgid="384414510709285811">"보통"</string>
     <string name="contrast_high" msgid="3988567609694797696">"높음"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"이 앱은 창 1개에서만 열 수 있습니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 5499851..a3d773c 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Оң кулакты жупташтыруу"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Сол кулакты жупташтыруу"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Бардык жеткиликтүү угуу апараттары үчүн"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Угуу аппаратынын башка параметрлери"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Түзмөктөр аралык параметрлерди, мисалы, ыкчам баскычты жана индукциялык түрмөктүн башкаруу элементтерин өзгөртүңүз"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Ушул түзмөктө гана"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио түзмөк"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Аудио түзмөк жөнүндө"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Жеке чөйрө туураланууда…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Жеке мейкиндиктеги колдонмолордун билдирмелери ал кулпуланганда жашырылат"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Жеке мейкиндик параметрлеринде аны жашырып жана автоматтык кулпулоону тууралоого болот"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Керектүү колдонмолор жеке мейкиндигиңизге орнотулган"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Жеке мейкиндик туураланган жок"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Кайталоо"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Жеке чөйрөнүн кулпусун ачуу үчүн экран кулпусу колдонулсунбу?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Колдонмолор жана билдирмелер"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Купуя билдирмелерди кулпуланган экранда көрсөтүү"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Жеке мейкиндиктин кулпусу ачык болгондо купуя контентти көрсөтүү"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Маалыматыңызды купуя сактоо үчүн Google аккаунтун түзүңүз"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Кийинки экранда жеке мейкиндигиңизде колдонула турган аккаунтка кире аласыз"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Маалыматтар жеке мейкиндиктен тышкары жерде көрүнбөшү үчүн, өзүнчө аккаунтту түзүңүз:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Шайкештирилген сүрөттөр, файлдар, каттар, байланыштар, жылнаамадагы иш-чаралар ж.б."</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Жүктөлүп алынган колдонмолордун таржымалы жана сунуштар"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Көрүлгөн вебсайттар, кыстармалар жана сакталган сырсөздөр"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Жеке мейкиндиктеги колдонмолордо жасаган аракеттериңиздин негизинде сунушталган контент"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Түшүндүм"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> чейин манжа изин кошсоңуз болот"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Кошулган манжа издеринин саны жогорку чегине жетти"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Дагы манжа издерин кошуу мүмкүн эмес"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Тармактык туташууларыңызды башкаруу үчүн <xliff:g id="NEW_APP">%s</xliff:g> колдоносузбу?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Жакында изделген жерлер"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Жумуш профилинин жери"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Жайгашкан жерди көргөн колдонмолор"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Жайгашкан жерди аныктоо өчүрүлгөн"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} ичинен # колдонмо жайгашкан жерди көрө алат}other{{total} ичинен # колдонмо жайгашкан жерди көрө алат}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Кайра коюу"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Өзгөртүүчү баскычты тандаңыз"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> үчүн жаңы ачкыч тандаңыз:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Демейки"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Кеп"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Көрсөткүчтүн ылдамдыгы"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Оюн контроллери"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Жалпы"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Түс жана кыймыл"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Түс контрасты"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Контраст жогору болсо, текст, баскычтар жана сүрөтчөлөр жакшыраак көрүнөт. Өзүңүзгө ылайыктуу контрастты тандаңыз."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Айрым колдонмолордо түс жана тексттин контрасты боюнча айрым параметрлер колдоого алынбашы мүмкүн"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Текстти жана түстөрдү экрандын фонуна жараша тууралаңыз"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Алдын ала көрүү"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелен, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 күн мурун"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Көз саласызбы?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Иш сапар тууралуу отчёт"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Кошумча жардам керек болсо, \nмага же Хеленге кайрылыңыз. Бул отчёт"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Кардардын чыгымдары"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Экранды караңгылатуу"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Башкаруу элементтери"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Убакытты көзөмөлдөө"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Тунук эмес"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Жогорку контрасттагы текст"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Текст жакшыраак көрүнүшү үчүн аны кара же ак түскө өзгөртүңүз."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Тексттин контрастын жогорулатуу"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Текст жакшыраак көрүнүшү үчүн аны кара же ак түскө өзгөртүңүз."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Экрандын чоңойтуусун авто жаңыртуу"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Колдонмо кубулган сайын, экрандын чоңойтуусун жаңыртуу"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Чалууну кубат баскычы бүтүрөт"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Жок"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контраст"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Кадимки"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Демейки"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Орточо"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Жогору"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Бул колдонмону 1 терезеде гана ачууга болот"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 88fe992..d3e6cd9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ໃຊ້ <xliff:g id="NEW_APP">%s</xliff:g> ເພື່ອ​ຈັດ​ການ​ການ​ເຊື່ອມ​ຕໍ່​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ​ບໍ?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"ການຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ສະຖານທີ່ສຳລັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ການອະນຸຍາດສະຖານທີ່ແອັບ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ປິດສະຖານທີ່ແລ້ວ"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# ຈາກທັງໝົດ {total} ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່}other{# ຈາກທັງໝົດ {total} ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ຣີເຊັດ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"ເລືອກປຸ່ມຕົວດັດແປງ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"ເລືອກປຸ່ມໃໝ່ສຳລັບ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ຄ່າເລີ່ມຕົ້ນ"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"ສຽງເວົ້າ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ຄວາມໄວລູກສອນ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ມືເກມ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 657442a..77d288f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Susieti dešinę ausį"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Susieti kairę ausį"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Visuose pasiekiamuose klausos įrenginiuose"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Daugiau klausos įrenginio nustatymų"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Keiskite nustatymus keliuose įrenginiuose, pvz., sparčiųjų klavišų ir indukcinės prijungiamos ritės valdiklius"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Šiame įrenginyje"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Garso išvestis"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Apie garso išvestį"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Nustatoma privati erdvė…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Pranešimai iš privačios erdvės programų slepiami, kai ji užrakinta"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Peržiūrėkite privačios erdvės nustatymus, jei norite paslėpti privačią erdvę ir nustatyti automatinį užrakinimą"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Būtinos programos jau įdiegtos privačioje erdvėje"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Nepavyko nustatyti privačios erdvės"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Bandyti dar kartą"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Naudoti ekrano užraktą privačiai erdvei atrakinti?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Programos ir pranešimai"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Neskelbtini pranešimai užrakinimo ekrane"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Rodyti visuomenę jaudinantį turinį, kai privati erdvė užrakinta"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Kurkite „Google“ paskyrą ir apsaugokite duomenų privatumą"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Kitame ekrane galite prisijungti prie paskyros, kurią norite naudoti su privačia erdve"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Sukurkite specialiai tam skirtą paskyrą, kuri apsaugos, kad duomenys neišeitų iš privačios erdvės, pvz.:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinchronizuotos nuotraukos, failai, el. laiškai, kontaktai, kalendoriaus įvykiai ir kiti duomenys"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Programų atsisiuntimo istorija ir rekomendacijos"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Naršymo istorija, žymės ir išsaugoti slaptažodžiai"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Siūlomas turinys susijęs su jūsų veikla privačios erdvės programose"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Supratau"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Galite pridėti iki <xliff:g id="COUNT">%d</xliff:g> piršto ats."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Pridėjote maksimalų skaičių kontrolinių kodų"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Negalima pridėti daugiau kontrolinių kodų"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Naudoti <xliff:g id="NEW_APP">%s</xliff:g> tinklo ryšiams tvarkyti?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Pastarosios vietovės užklausos"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Darbo profilio vieta"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Programų leidimai pasiekti vietovės duomenis"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Vietovė išjungta"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Vietovę gali pasiekti # programa iš {total}}one{Vietovę gali pasiekti # programa iš {total}}few{Vietovę gali pasiekti # programos iš {total}}many{Vietovę gali pasiekti # programos iš {total}}other{Vietovę gali pasiekti # programų iš {total}}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Nust. iš naujo"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Pasirinkite modifikavimo klavišą"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pasirinkite naują „<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>“ slaptažodį:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Numatytasis"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Kalba"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Žymiklio greitis"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Žaidimų valdiklis"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Bendrieji"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekranas"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Spalva ir judesys"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Spalvų kontrastas"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Naudojant didesnį kontrastą, tekstas, mygtukai ir piktogramos išsiskiria labiau. Pasirinkite jūsų akiai patraukliausią kontrastą."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Kai kuriose programose gali būti palaikomos ne visos spalvos ir teksto kontrasto nustatymai"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Reguliuokite, kaip spalvos ir tekstas atrodo pasirinktos spalvos ekrano fone"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Peržiūra"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helena, Adamas"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Prieš 2 dienas"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Tęsti toliau?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Verslo kelionės ataskaita"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Jei reikia daugiau pagalbos, susisiekite su\nmanimi arba Helena. Ši ataskaita bus"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Kliento išlaidos"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekrano tamsinimas"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Sąveikos valdikliai"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Laiko valdikliai"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Neskaidrus"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Didelio kontrasto tekstas"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Keiskite teksto spalvą į juodą arba baltą. Nustatykite didžiausią kontrastą su fonu."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Padidinti teksto kontrastą"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Keiskite teksto spalvą į juodą arba baltą, didindami kontrastą su fonu."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Automat. atnaujinti ekrano didinimą"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Atnaujinti ekrano didinimą perkeliant programas"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Maitinimo mygt. baig. skamb."</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Atšaukti"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrastas"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Įprastas"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Numatytasis"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Vidutinis"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Aukštas"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Šią programą galima atidaryti tik viename lange"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9dc5b1c..319814f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Savienot pārī labo"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Savienot pārī kreiso"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Visiem pieejamajiem dzirdes aparātiem"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Citi dzirdes aparāta iestatījumi"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Varat mainīt vairākās ierīcēs izmantojamus iestatījumus, piemēram, saīsnes un indukcijas spoles vadīklas."</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Šai ierīcei"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio izeja"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Par audio izvadi"</string>
@@ -588,25 +586,17 @@
     <string name="no_device_lock_cancel" msgid="4412602160321228863">"Atcelt"</string>
     <string name="private_space_cancel_label" msgid="379259667396956886">"Atcelt"</string>
     <string name="private_space_setup_button_label" msgid="2094882154623560585">"Iestatīt"</string>
-    <!-- no translation found for private_space_setup_title (2272968244329821450) -->
-    <skip />
-    <!-- no translation found for private_space_hide_apps_summary (4418722947376042418) -->
-    <skip />
-    <!-- no translation found for private_space_setup_sub_header (5454598292017819146) -->
-    <skip />
-    <!-- no translation found for private_space_separate_account_text (4492251315012955548) -->
-    <skip />
-    <!-- no translation found for private_space_protected_lock_text (9123250938334372735) -->
-    <skip />
-    <!-- no translation found for private_space_install_apps_text (5693139160766464498) -->
-    <skip />
+    <string name="private_space_setup_title" msgid="2272968244329821450">"Privātā telpa"</string>
+    <string name="private_space_hide_apps_summary" msgid="4418722947376042418">"Varat paslēpt vai bloķēt privātās lietotnes atsevišķā vietā. Papildu drošībai varat izmantot atsevišķu Google kontu."</string>
+    <string name="private_space_setup_sub_header" msgid="5454598292017819146">"Iestatiet privāto telpu"</string>
+    <string name="private_space_separate_account_text" msgid="4492251315012955548"><b>"Google konta izvēle privātajai telpai"</b>\n"Ja izmantojat īpašu kontu, tas palīdz gādāt, lai sinhronizētie faili, fotoattēli un e-pasta ziņojumi netiktu rādīti ārpus privātās telpas."</string>
+    <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Bloķēšanas iestatīšana"</b>\n"Varat bloķēt privāto telpu, lai citi nevarētu to atvērt."</string>
+    <string name="private_space_install_apps_text" msgid="5693139160766464498"><b>"Lietotņu instalēšana"</b>\n"Privātajā telpā ir atsevišķa piekļuve Play veikalam, tāpēc varat ērti instalēt lietotnes."</string>
     <string name="private_space_apps_permission_text" msgid="7030946025253366172">"Kamēr privātā telpa būs bloķēta, tajā ievietotās lietotnes netiks rādītas atļauju pārvaldniekā, konfidencialitātes informācijas panelī un citos iestatījumos.\n\nPrivāto telpu nevar pārvietot uz citu ierīci. Ja vēlēsieties to izmantot citā ierīcē, privātā telpa būs jāiestata vēlreiz.\n\nIkviena persona, kas pievienos jūsu ierīci datoram vai instalēs ierīcē kaitīgas lietotnes, iespējams, varēs piekļūt jūsu privātajai telpai."</string>
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Notiek privātās telpas iestatīšana…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Kamēr privātā telpa ir bloķēta, tās lietotņu paziņojumi tiek slēpti"</string>
-    <!-- no translation found for private_space_explore_settings_title (1448128245941571654) -->
-    <skip />
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Izpētiet privātās telpas iestatījumus, kas ļauj paslēpt privāto telpu un iestatīt automātisku bloķēšanu"</string>
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Jūsu privātajā telpā jau ir instalētas nepieciešamās lietotnes"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Nevarēja izveidot privāto telpu"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Mēģināt vēlreiz"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Vai lietot ekrāna bloķēšanu privātās telpas atbloķēšanai?"</string>
@@ -629,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Lietotnes un paziņojumi"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Sensitīvi paziņojumi bloķēšanas ekrānā"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Rādīt sensitīvu saturu, ja privātā telpa ir atbloķēta"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Izveidojiet Google kontu, lai aizsargātu datu konfidencialitāti"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Nākamajā ekrānā varēsiet pierakstīties kontā, ko vēlaties izmantot privātajai telpai."</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Varat izveidot īpašu kontu, lai ierobežotu datu rādīšanu ārpus privātās telpas (tālāk ir sniegti piemēri)"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinhronizētie fotoattēli, faili, e-pasta ziņojumi, kontaktpersonas, pasākumi u. c. dati"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Lietotņu lejupielādes vēsture un ieteikumi"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Pārlūkošanas vēsture, grāmatzīmes un saglabātās paroles"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Satura ieteikumi, kas saistīti ar jūsu darbībām privātās telpas lietotnēs"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Labi"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Varat pievienot līdz <xliff:g id="COUNT">%d</xliff:g> pirkstu nospiedumiem."</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Jūs esat pievienojis maksimālo pirkstu nospiedumu skaitu."</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nevar pievienot citus pirkstu nospiedumus."</string>
@@ -969,14 +951,10 @@
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"Ieteicama 5,0 GHz josla"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"IP iestatījumi"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"Konfidencialitāte"</string>
-    <!-- no translation found for wifi_privacy_mac_settings (3188060664478313363) -->
-    <skip />
-    <!-- no translation found for wifi_privacy_device_name_settings (3699130177041345275) -->
-    <skip />
-    <!-- no translation found for wifi_privacy_send_device_name_toggle_title (1228107313152880073) -->
-    <skip />
-    <!-- no translation found for wifi_privacy_send_device_name_toggle_summary (5995365836332817655) -->
-    <skip />
+    <string name="wifi_privacy_mac_settings" msgid="3188060664478313363">"MAC"</string>
+    <string name="wifi_privacy_device_name_settings" msgid="3699130177041345275">"Ierīces nosaukums"</string>
+    <string name="wifi_privacy_send_device_name_toggle_title" msgid="1228107313152880073">"Nosūtīt ierīces nosaukumu"</string>
+    <string name="wifi_privacy_send_device_name_toggle_summary" msgid="5995365836332817655">"Kopīgot šīs ierīces nosaukumu ar tīklu"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"Abonements"</string>
     <string name="wifi_subscription_summary" msgid="18802471063384598">"Skatīt vai mainīt abonementu"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"Nejauši atlasīta MAC adr."</string>
@@ -1263,10 +1241,8 @@
     <string name="dark_ui_text" msgid="4392646155331126666">"Tumšajā motīvā tiek izmantots melns fons noteiktos ekrānos, lai paildzinātu akumulatora darbību. Turklāt jūs varat iestatīt, kad ieslēgt un izslēgt tumšo motīvu."</string>
     <string name="dark_ui_bedtime_footer_summary" msgid="5576501833145170581">"Tumšā motīva pamatā pašlaik ir jūsu gulēšanas režīma grafiks."</string>
     <string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Gulēšanas režīma iestatījumi"</string>
-    <!-- no translation found for even_dimmer_display_title (8589063452814896327) -->
-    <skip />
-    <!-- no translation found for even_dimmer_display_summary (120301078873242172) -->
-    <skip />
+    <string name="even_dimmer_display_title" msgid="8589063452814896327">"Aptumšot papildus"</string>
+    <string name="even_dimmer_display_summary" msgid="120301078873242172">"Varat atļaut aptumšot ierīci vairāk nekā parasti."</string>
     <string name="screen_timeout" msgid="7709947617767439410">"Ekrāna noildze"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
     <string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"Nav iestatīts"</string>
@@ -1566,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Vai tīkla savienojumu pārvaldībai izmantot lietotni <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Neseni vietu pieprasījumi"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Darba profila atrašanās vieta"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Lietotņu atraš. vietu atļaujas"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Atrašanās vieta ir izslēgta"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# lietotnei no {total} ir piekļuve atrašanās vietai}zero{# lietotnēm no {total} ir piekļuve atrašanās vietai}one{# lietotnei no {total} ir piekļuve atrašanās vietai}other{# lietotnēm no {total} ir piekļuve atrašanās vietai}}"</string>
@@ -1960,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Atiestatīt"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Modificētājtaustiņa izvēle"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Izvēlieties jaunu taustiņu — <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Noklusējums"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Runa"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Rādītāja ātrums"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Spēļu vadība"</string>
@@ -2023,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Vispārīgi"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Attēlojums"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Krāsa un kustība"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Krāsu kontrasts"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Lielākā kontrastā teksts, pogas un ikonas skaidrāk izceļas. Izvēlieties kontrastu, kas, jūsuprāt, izskatās vislabāk."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Iespējams, dažās lietotnēs netiks atbalstīti visi krāsu un teksta kontrasta iestatījumi."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Varat pielāgot, kā jāizskatās krāsām un tekstam salīdzinājumā ar ekrāna fona krāsu."</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Priekšskatījums"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helēna, Ādams"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Pirms 2 dienām"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Vai atgādināt?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Pārskats par komandējumu"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Ja vajadzīga turpmāka palīdzība, lūdzu, \nsazinieties ar mani vai Helēnu. Šis pārskats būs"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Klientu izdevumi"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekrāna aptumšošana"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Mijiedarbības vadīklas"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Laika vadīklas"</string>
@@ -2181,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Necaurspīdīga"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Liela kontrasta teksts"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Mainīt teksta krāsu uz melnu vai baltu, lai palielinātu kontrastu ar fonu."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimāls teksta kontrasts"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Varat mainīt teksta krāsu uz melnu vai baltu, lai palielinātu kontrastu ar fonu."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Ekrāna palielinājuma autom. atjaun."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Atjaunināt ekrāna palielinājumu lietotņu pārejās"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Barošanas poga beidz zvanu"</string>
@@ -2279,8 +2250,7 @@
     <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"Velciet augšup ar diviem pirkstiem no apakšdaļas"</string>
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Turēt nospiestas skaļuma pogas"</string>
     <string name="accessibility_shortcut_type_triple_tap" msgid="7717524216825494543">"Trīsreiz pieskarieties ekrānam"</string>
-    <!-- no translation found for accessibility_shortcut_edit_screen_title (4494142067760961499) -->
-    <skip />
+    <string name="accessibility_shortcut_edit_screen_title" msgid="4494142067760961499">"Pieejamības saīšņu rediģēšana"</string>
     <!-- no translation found for accessibility_shortcut_edit_screen_prompt (5966054283114856682) -->
     <skip />
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="3367260988024430722">"Turpināt"</string>
@@ -2307,8 +2277,7 @@
     <!-- no translation found for accessibility_hearing_device_footer_summary (256061045064940818) -->
     <skip />
     <string name="accessibility_hearing_device_pairing_page_title" msgid="6608901091770850295">"Savienošana pārī"</string>
-    <!-- no translation found for accessibility_hearing_device_pairing_intro (7022201665808166517) -->
-    <skip />
+    <string name="accessibility_hearing_device_pairing_intro" msgid="7022201665808166517">"Šajā lapā varat veidot savienojumus pārī ar ASHA un LE Audio dzirdes aparātiem. Dzirdes aparātam jābūt ieslēgtam un gatavam izveidot savienojumu pārī."</string>
     <string name="accessibility_found_hearing_devices" msgid="637407580358386553">"Pieejamie dzirdes aparāti"</string>
     <string name="accessibility_found_all_devices" msgid="7817834722148556520">"Vai neredzat savu dzirdes aparātu?"</string>
     <string name="accessibility_list_all_devices_title" msgid="161495343959211216">"Skatiet citas ierīces"</string>
@@ -4709,14 +4678,10 @@
     <string name="erasing_sim" msgid="4237180547590463930">"Notiek eSIM kartes dzēšana…"</string>
     <string name="erase_sim_fail_title" msgid="1445700500168357303">"Nevar izdzēst eSIM karti"</string>
     <string name="erase_sim_fail_text" msgid="6898841004987411547">"Radās problēma, un šī eSIM karte netika dzēsta.\n\nRestartējiet ierīci un mēģiniet vēlreiz."</string>
-    <!-- no translation found for wifi_warning_dialog_title (7328515476966592390) -->
-    <skip />
-    <!-- no translation found for wifi_warning_dialog_text (6584060137703953174) -->
-    <skip />
-    <!-- no translation found for wifi_warning_continue_button (8171574741789688214) -->
-    <skip />
-    <!-- no translation found for wifi_warning_return_button (6226063181583906340) -->
-    <skip />
+    <string name="wifi_warning_dialog_title" msgid="7328515476966592390">"Pirms dzēšanas izveidojiet Wi-Fi savienojumu"</string>
+    <string name="wifi_warning_dialog_text" msgid="6584060137703953174">"Tādējādi vēlāk varēsiet ērtāk atkal izmantot eSIM, nesazinoties ar mobilo sakaru operatoru."</string>
+    <string name="wifi_warning_continue_button" msgid="8171574741789688214">"Tomēr izdzēst"</string>
+    <string name="wifi_warning_return_button" msgid="6226063181583906340">"Labi"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Savienojuma izveide ar ierīci"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Lietotne <xliff:g id="APPNAME">%1$s</xliff:g> vēlas izmantot pagaidu Wi‑Fi tīklu, lai izveidotu savienojumu ar jūsu ierīci."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nav atrasta neviena ierīce. Ierīcēm ir jābūt ieslēgtām un pieejamām savienojuma izveidei."</string>
@@ -5143,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Atcelt"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrasts"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standarta"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Noklusējums"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Vidējs"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Augsts"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Šo lietotni var atvērt tikai vienā logā"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 66e6cce..3157fae 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Спари го десното уво"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Спари го левото уво"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"За сите достапни слушни апарати"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Повеќе поставки на слушен апарат"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Променете ги поставките на повеќе уреди, како што се контролите на кратенките и телекалемите"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"За овој уред"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудиоизлез"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"За аудио-излезот"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Се поставува „Приватен простор“…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Известувањата од апликациите во „Приватниот простор“ се скриени кога е заклучен"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Истражете ги поставките за „Приватен простор“ за да го скриете „Приватниот простор“ и да поставите автоматско заклучување"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Задолжителните апликации се веќе инсталирани во вашиот „Приватен простор“"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Не можеше да се постави „Приватен простор“"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Обиди се пак"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Да се користи закл. екран за откл. „Прив. прост.“?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Апликации и известувања"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Чувствителни известувања на заклучениот екран"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Прикажување на чувствителните содржини кога „Приватниот простор“ е отклучен"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Создајте сметка на Google за да ви помогне да ја зачувате приватноста на вашите податоци"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"На следниот екран, може да се најавите на сметка за да ја користите со вашиот „Приватен простор“"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Создајте посебна сметка за да спречите податоците да излезат од „Приватниот простор“, како:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синхронизирани фотографии, датотеки, е-пораки, контакти, настани во календарот и друго"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Историја на преземање апликации и препораки"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Историја на прелистување, обележувачи и зачувани лозинки"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Предложени содржини поврзани со вашата активност во апликациите во „Приватниот простор“"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Сфатив"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Може да додадете до <xliff:g id="COUNT">%d</xliff:g> отпечатоци"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Додадовте максимален број на отпечатоци"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Не може да се додадат повеќе отпечатоци"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Да се користи <xliff:g id="NEW_APP">%s</xliff:g> за управување на вашите мрежни врски?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Последни барања за локација"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Локација за работен профил"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Дозволи за локација за апликации"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Локацијата е исклучена"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# од {total} апликации има пристап до локацијата}one{# од {total} апликации имаат пристап до локацијата}other{# од {total} апликации имаат пристап до локацијата}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Ресетирај"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Изберете го копчето модификатор"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Изберете ново копче за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Стандардно"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Говор"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Брзина на покажувач"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Контролор на игра"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Општи"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Боја и движење"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Контраст на бои"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Повисокиот контраст прави текстот, копчињата и иконите да се истакнуваат повеќе. Изберете го контрастот што ви изгледа најдобро."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Некои апликации можеби не ги поддржуваат сите поставки за контраст на бои и текст"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Приспособете како да изгледаат боите и текстот во однос на бојата на заднината на вашиот екран"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Преглед"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелен, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Пред 2 дена"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Ќе проверите?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Извештај за бизнис патувањето"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"За дополнителна помош, контактирајте со \nмене или Хелен. Извештајов ќе биде"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Трошоци на клиентот"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемнете го екранот"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Контроли за интеракција"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Контроли за тајминг"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Непровидно"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Текст со висок контраст"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Променете ја бојата на текстот во црна или бела. Го максимизира контрастот со заднината."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Максимиз. го контрастот на текстот"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Променете ја бојата на текстот во црна или бела за да го зголемите контрастот со заднината."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Автоматско ажурирање на зголемување на екран"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ажурирај зголемување екран при премини меѓу аплик."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Прекини повик со копче за вклучување"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Откажи"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контраст"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандарден"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Стандардно"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Среден"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Висок"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Апликацијава може да се отвори само во еден прозорец"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a4d9c18..a2f9edb 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷനുകൾ നിയന്ത്രിക്കാൻ <xliff:g id="NEW_APP">%s</xliff:g> ആണോ ഉപയോഗിക്കുന്നത്?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"പുതിയ ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ഔദ്യോഗിക പ്രൊഫൈലിനായുള്ള ലൊക്കേഷൻ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ആപ്പ് ലൊക്കേഷൻ അനുമതികൾ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ലൊക്കേഷൻ ഓഫാണ്"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} ആപ്പുകളിൽ # എണ്ണത്തിന് ലൊക്കേഷനിലേക്ക് ആക്‌സ‌സ് ഉണ്ട്}other{{total} ആപ്പുകളിൽ # എണ്ണത്തിന് ലൊക്കേഷനിലേക്ക് ആക്‌സ‌സ് ഉണ്ട്}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"റീസെറ്റ് ചെയ്യൂ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"മോഡിഫയർ കീ തിരഞ്ഞെടുക്കുക"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> എന്നതിനായി പുതിയ കീ തിരഞ്ഞെടുക്കൂ:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ഡിഫോൾട്ട്"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"സംഭാഷണം"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"പോയിന്റർ വേഗത"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ഗെയിം കൺട്രോളർ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b3ab556..3db5520 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Баруун чих хослуулах"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Зүүн чих хослуулах"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Сонсголын бүх боломжтой төхөөрөмжид"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Сонсголын төхөөрөмжийн бусад тохиргоо"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Товчлол болон цахилгааны ороомог зэрэг төхөөрөмж хоорондын тохиргоог өөрчилнө үү"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Энэ төхөөрөмжид"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио гаралт"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Аудио оролтын тухай"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Хувийн орон зайг тохируулж байна…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Үүнийг түгжсэн үед хаалттай орон зайн аппуудын мэдэгдлийг нуудаг"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Хаалттай орон зайг нууж, автоматаар түгжихийг тохируулахын тулд хаалттай орон зайн тохиргоог судална уу"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Шаардлагатай аппуудыг таны хаалттай орон зайд аль хэдийн суулгасан"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Хаалттай орон зайг тохируулж чадсангүй"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Дахин оролдох"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Хувийн орон зайн түгжээг тайлахад дэлгэцийн түгжээг ашиглах уу?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Апп болон мэдэгдлүүд"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Түгжээтэй дэлгэц дээрх эмзэг мэдэгдлүүд"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Хаалттай орон зайн түгжээг тайлсан үед эмзэг контент харуулна уу"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Өгөгдлөө хувийн байлгахад туслахын тулд Google Бүртгэл үүсгэх"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Дараагийн дэлгэц дээр та хаалттай орон зайтайгаа ашиглах бүртгэлд нэвтрэх боломжтой"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Өгөгдлийг хаалттай орон зайнаас гадуур гарч ирэхийг зогсооход туслахын тулд зориулалтын бүртгэл үүсгэнэ үү. Жишээлбэл:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синк хийсэн зураг, файл, имэйл, харилцагч, календарийн үйл явдал болон бусад өгөгдөл"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Аппын таталтын түүх болон зөвлөмжүүд"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Хөтчийн түүх, хавчуурга болон хадгалсан нууц үгнүүд"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Таны хаалттай орон зайн аппуудын үйл ажиллагаатай холбоотой санал болгосон контент"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Ойлголоо"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Та <xliff:g id="COUNT">%d</xliff:g> хүртэлх хурууны хээ нэмж болно"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Таны зөвшөөрөгдсөн хурууны хээний тоо гүйцсэн байна"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Өөр хурууны хээ нэмэх боломжгүй байна"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Сүлжээний холболтуудыг удирдахад <xliff:g id="NEW_APP">%s</xliff:g>-г ашиглах уу?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Саяхны байршлын хүсэлтүүд"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ажлын профайлын байршил"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Аппын байршлын зөвшөөрлүүд"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Байршил унтраалттай байна"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} аппын # нь байршилд хандах боломжтой}other{{total} аппын # нь байршилд хандах боломжтой}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Шинэчлэх"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Тохируулагч товч сонгох"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>-н шинэ товч сонгоно уу:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Өгөгдмөл"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Яриа"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Заагчийн хурд"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Тоглоом Контроллер"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Ерөнхий"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дэлгэц"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Өнгө болон хөдөлгөөн"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Өнгөний ялгарал"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Илүү өндөр ялгарал нь текст, товчлуур болон дүрс тэмдгийг илүү ялгаруулдаг. Танд хамгийн сайн тохирох ялгарлыг сонгоно уу."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Зарим апп бүх өнгө болон текстийн ялгарлын тохиргоог дэмжихгүй байж магадгүй"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Таны дэлгэцийн дэвсгэр өнгөний эсрэг өнгөнүүдийг болон текст хэрхэн харагдахыг тохируулна уу"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Урьдчилан үзэх"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелен, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 хоногийн өмнө"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Араас нь лавлах уу?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Бизнесийн аяллын тайлан"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Цааш нь тусламж авах бол \nнадтай эсвэл Хелентэй холбогдоно уу. Энэ тайлан нь дараах байх болно"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Клиентийн зардал"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Дэлгэцийг бараан болгох"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Харилцан үйлдлийн хяналт"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Цагийн тохиргооны хяналт"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Тунгалаг бус"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Өндөр ялгаралтай текст"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Текстийн өнгийг хар эсвэл цагаан болгож өөрчилнө үү. Дэвсгэрийн нягтралыг дээд зэргээр нэмэгдүүлнэ."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Текстийн ялгарлыг нэмэгдүүлэх"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Дэвсгэрээс ялгарах байдлыг нэмэгдүүлэхийн тулд текстийн өнгийг хар эсвэл цагаан болгож өөрчилнө үү."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Дэлгэц томруулахыг автоматаар шинэчлэх"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Апп шилжилт дээр дэлгэц томруулахыг шинэчлэх"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Асаах товч дуудлагыг тасална"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Цуцлах"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Ялгарал"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандарт"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Өгөгдмөл"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Дунд зэрэг"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Өндөр"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Энэ аппыг зөвхөн 1 цонхонд нээх боломжтой"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 26bc13c..cc0eb31 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"उजवा कान पेअर करा"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"डावा कान पेअर करा"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"उपलब्ध असणाऱ्या ऐकण्याच्या सर्व डिव्हाइससाठी"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"श्रवणयंत्रासंबंधित आणखी सेटिंग्ज"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"शॉर्टकट आणि टेलीकॉइल नियंत्रणे यांसारखी क्रॉस-डिव्हाइस सेटिंग्ज बदला"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"या डिव्‍हाइससाठी"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ऑडिओ आउटपुट"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ऑडिओ आउटपुटबद्दल"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"खाजगी स्पेस सेट करत आहे…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"खाजगी स्पेस लॉक केलेली असताना त्यामधील ॲप्ससंबंधित सूचना लपवल्या जातात"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"खाजगी स्पेस लपवण्यासाठी आणि आपोआप लॉक होणे सेट करण्यासाठी खाजगी स्पेसशी संबंधित सेटिंग्ज एक्सप्लोर करा"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"आवश्यक असलेली अ‍ॅप्स ही तुमच्या खाजगी स्पेसमध्ये आधीपासून इंस्टॉल केलेली आहेत"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"खाजगी स्पेस सेट करता आली नाही"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"पुन्हा प्रयत्न करा"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"खाजगी स्पेस अनलॉक करण्यासाठी स्क्रीन लॉक वापरायचे?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"अ‍ॅप्स आणि नोटिफिकेशन"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"लॉक स्‍क्रीनवरील संवेदनशील नोटिफिकेशन"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"खाजगी स्पेस अनलॉक केलेली असताना संवेदनशील आशय दाखवा"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"तुमचा डेटा खाजगी ठेवण्यात मदत व्हावी यासाठी एक Google खाते तयार करा"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"पुढील स्क्रीनवर तुम्ही तुमच्या खाजगी स्पेससोबत वापरण्यासाठी खात्यामध्ये साइन इन करू शकता"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"खाजगी स्पेसच्या बाहेर डेटा दिसण्यापासून थांबवण्यात मदत करण्यासाठी समर्पित खाते तयार करा, जसे की:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"सिंक केलेले फोटो, फाइल, ईमेल, संपर्क, कॅलेंडर इव्हेंट आणि इतर डेटा"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ॲप डाउनलोड इतिहास आणि शिफारशी"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ब्राउझिंग इतिहास, बुकमार्क आणि सेव्ह केलेले पासवर्ड"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"खाजगी स्पेसच्या ॲप्समधील तुमच्या अ‍ॅक्टिव्हिटीशी संबंधित सुचवलेला आशय"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"समजले"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"तुम्ही <xliff:g id="COUNT">%d</xliff:g> पर्यंत फिंगरप्रिंट जोडू शकता"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"तुम्ही जास्तीत जास्त फिंगरप्रिंट जोडले आहेत"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"आणखी फिंगरप्रिंट जोडू शकत नाही"</string>
@@ -822,9 +811,9 @@
     <string name="bluetooth_device_context_disconnect" msgid="4464167389972513232">"‍डिस्कनेक्ट करा"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"पेअर करा आणि कनेक्ट करा"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="7326727272747345476">"ब्लूटूथ सुरू केल्यावर, डिव्हाइस हे जवळील ब्लूटूथ डिव्‍हाइसशी संवाद साधेल"</string>
-    <string name="bluetooth_empty_list_bluetooth_off_auto_on_available" msgid="5833847615853525971">"ब्लूटूथ सुरू केले असते तेव्हा, तुमचे डिव्हाइस जवळपासच्या इतर ब्लूटूथ डिव्हाइसशी संवाद साधू शकते. Quick Share, Find My Device यांसारखी वैशिष्ट्ये आणि डिव्हाइसचे स्थान ब्लूटूथ वापरतात."</string>
+    <string name="bluetooth_empty_list_bluetooth_off_auto_on_available" msgid="5833847615853525971">"ब्लूटूथ सुरू असताना, तुमचे डिव्हाइस जवळपासच्या इतर ब्लूटूथ डिव्हाइसशी संवाद साधू शकते. क्विक शेअर, Find My Device यांसारखी वैशिष्ट्ये आणि डिव्हाइसचे स्थान ब्लूटूथ वापरतात."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="786648535600075223">"ब्‍लूटूथ सुरू असते, तेव्हा तुमचे डिव्‍हाइस इतर जवळपासच्‍या ब्‍लूटूथ डिव्‍हाइसशी संवाद साधू शकते.\n\nडिव्‍हाइसच्या अनुभवामध्ये सुधारणा करण्‍यासाठी, ब्‍लूटूथ बंद असतानादेखील, अ‍ॅप्स आणि सेवा जवळपासची डिव्‍हाइस कधीही स्‍कॅन करू शकतात. उदाहरणार्थ, हे स्थानावर आधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी वापरले जाऊ शकते. तुम्‍ही हे ब्लूटूथ स्‍कॅनिंग सेटिंग्‍जमध्‍ये जाऊन बदलू शकता."</string>
-    <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="5047787966768730069">"ब्लूटूथ सुरू केले असते तेव्हा, तुमचे डिव्हाइस जवळपासच्या इतर ब्लूटूथ डिव्हाइसशी संवाद साधू शकते. Quick Share, Find My Device यांसारखी वैशिष्ट्ये आणि डिव्हाइस स्थान ब्लूटूथ वापरतात.\n\nब्लूटूथ बंद असतानादेखील ॲप्स आणि सेवा या कधीही जवळपासच्या डिव्हाइससाठी तरीही स्कॅन करू शकतात. उदाहरणार्थ, स्थानावर आधारित वैशिष्ट्ये आणि सेवा यांमध्ये सुधारणा करण्यासाठी याचा वापर केला जाऊ शकतो. तुम्ही ब्लूटूथ स्कॅन करण्याशी संबंधित सेटिंग्जमध्ये हे बदलू शकता."</string>
+    <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="5047787966768730069">"ब्लूटूथ सुरू असताना, तुमचे डिव्हाइस जवळपासच्या इतर ब्लूटूथ डिव्हाइसशी संवाद साधू शकते. क्विक शेअर, Find My Device यांसारखी वैशिष्ट्ये आणि डिव्हाइसचे स्थान ब्लूटूथ वापरतात.\n\nब्लूटूथ बंद असतानादेखील ॲप्स आणि सेवा या कधीही जवळपासच्या डिव्हाइससाठी तरीही स्कॅन करू शकतात. उदाहरणार्थ, स्थानावर आधारित वैशिष्ट्ये आणि सेवा यांमध्ये सुधारणा करण्यासाठी याचा वापर केला जाऊ शकतो. तुम्ही ब्लूटूथ स्कॅन करण्याशी संबंधित सेटिंग्जमध्ये हे बदलू शकता."</string>
     <string name="bluetooth_scan_change" msgid="1744636222637390367">"बदला"</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिव्हाइस तपशील"</string>
     <string name="bluetooth_device_keyboard_settings_preference_title" msgid="3411693160917620519">"कीबोर्ड सेटिंग्ज"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"तुमची नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"अलीकडील स्थान विनंत्या"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"कार्य प्रोफाइलसाठी स्थान"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ॲपसाठी स्थानाच्या परवानग्या"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"स्‍थान बंद आहे"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} पैकी # अ‍ॅपला स्थानाचा अ‍ॅक्सेस आहे}other{{total} पैकी # अ‍ॅप्सना स्थानाचा अ‍ॅक्सेस आहे}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"रीसेट करा"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"मॉडिफायर की निवडा"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> साठी नवीन की निवडा:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डीफॉल्ट"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"भाषण"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"पॉइंटर वेग"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"गेम नियंत्रक"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"सर्वसाधारण"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिस्प्ले"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"रंग आणि मोशन"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"रंग कॉंट्रास्ट"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"उच्च कॉंट्रास्ट असेल, तर मजकूर, बटणे आणि आयकन आणखी ठळकपणे दिसतात. तुम्हाला सर्वोत्तम वाटणारा कॉंट्रास्ट निवडा."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"काही ॲप्स ही रंग आणि मजकूर यांच्या कॉंट्रास्टसंबंधित सर्व सेटिंग्जना कदाचित सपोर्ट करणार नाहीत"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"तुमच्या स्क्रीनच्या बॅकग्राउंडच्या रंगाविरुद्ध, रंग आणि मजकूर कसे दिसतील हे अ‍ॅडजस्ट करा"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"पूर्वावलोकन"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"हेलन, ॲडम"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"२ दिवसांपूर्वी"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"फॉलोअप घ्यायचाय?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"व्यवसाय सहलीचा अहवाल"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"पुढील साहाय्यासाठी, कृपया \nमाझ्याशी किंवा हेलनशी संपर्क साधा. हा अहवाल असा असेल"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"क्लायंटसंबंधित खर्च"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रीन आणखी गडद करा"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"संवाद नियंत्रणे"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"वेळ नियंत्रणे"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"पारदर्शक नाही"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"उच्च कॉंट्रास्ट मजकूर"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"मजकुराचा रंग काळा किंवा पांढरा यावर बदला. बॅकग्राउंड वापरून काँट्रास्ट वाढवते."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"मजकुराचा काँट्रास्ट वाढवा"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"बॅकग्राउंडसह काँट्रास्ट वाढवण्यासाठी मजकुराचा रंग बदलून काळा किंवा पांढरा करा."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"स्क्रीन विस्तृतीकरण स्वयं अद्ययावत करा"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"अ‍ॅप संक्रमणांवर स्क्रीन विस्तृतीकरण अद्ययावत करा"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पॉवर बटण कॉल समाप्त करते"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"रद्द करा"</string>
     <string name="contrast_title" msgid="6885768151336508075">"कॉंट्रास्ट"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"साधारण"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"डीफॉल्ट"</string>
     <string name="contrast_medium" msgid="384414510709285811">"मध्यम"</string>
     <string name="contrast_high" msgid="3988567609694797696">"उच्च"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"हे अ‍ॅप फक्त एका विंडोमध्ये उघडले जाऊ शकते"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index db7232a..917d034 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Gandingkan telinga kanan"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Gandingkan telinga kiri"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Untuk semua peranti pendengaran yang tersedia"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Lagi tetapan peranti pendengaran"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Ubah tetapan silang peranti seperti pintasan dan kawalan telegegelung"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Untuk peranti ini"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Output audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Perihal output audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Menyediakan ruang peribadi…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Pemberitahuan daripada apl ruang peribadi disembunyikan apabila ruang peribadi dikunci"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Terokai tetapan ruang privasi untuk menyembunyikan ruang privasi dan menyediakan penguncian automatik"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Apl yang diperlukan telah dipasang dalam ruang privasi anda"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Tidak dapat menyediakan ruang peribadi"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Cuba Lagi"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Gunakan kunci skrin untuk membuka kunci ruang peribadi?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apl dan pemberitahuan"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Pemberitahuan sensitif pada skrin kunci"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Tunjukkan kandungan sensitif apabila ruang privasi tidak berkunci"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Buat Google Account untuk membantu kami memastikan data anda dirahsiakan"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Anda boleh log masuk ke akaun untuk digunakan dengan ruang peribadi anda pada skrin seterusnya"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Buat akaun khusus untuk membantu kami menghentikan data yang dipaparkan di luar ruang privasi, seperti:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Foto, fail, e-mel, kenalan, acara kalendar dan data lain yang disegerakkan"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Sejarah muat turun apl dan syor"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Sejarah penyemakan imbas, penanda halaman dan kata laluan yang disimpan"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Kandungan yang dicadangkan berkaitan dengan aktiviti anda pada apl ruang privasi"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> cap jari"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Anda telah menambahkan bilangan maksimum cap jari"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Tidak boleh menambahkan lagi cap jari"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> untuk mengurus sambungan rangkaian anda?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Permintaan lokasi terbaharu"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokasi untuk profil kerja"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Kebenaran lokasi apl"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokasi dimatikan"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# daripada {total} apl mempunyai akses kepada lokasi}other{# daripada {total} apl mempunyai akses kepada lokasi}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Tetapkan semula"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Pilih kunci pengubah suai"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pilih kunci baharu untuk <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Lalai"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Pertuturan"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Kelajuan penuding"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Pengawal Permainan"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Umum"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Paparan"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Warna dan gerakan"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontras warna"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Kontras yang lebih tinggi menjadikan teks, butang dan ikon lebih menonjol. Pilih kontras yang paling sesuai untuk anda."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Sesetengah apl mungkin tidak menyokong semua tetapan kontras warna dan teks"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Laraskan warna dan teks dengan warna latar skrin anda"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Pratonton"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 hari yang lalu"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Buat susulan?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Laporan lawatan urusan perniagaan"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Untuk mendapatkan bantuan lanjut, sila hubungi \nsaya atau Helen. Laporan ini akan"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Perbelanjaan Klien"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Jadikan skrin lebih gelap"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kawalan interaksi"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Kawalan pemasaan"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Bukan lut sinar"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Teks kontras tinggi"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Menukar warna teks kepada hitam atau putih. Memaksimumkan kontras dengan latar belakang."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimumkan kontras teks"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Ubah warna teks kepada hitam atau putih untuk meningkatkan kontras dengan latar."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Auto kemas kini pembesaran skrin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Kemas kini pembesaran skrin pada peralihan apl"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butang kuasa menamatkan panggilan"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Batal"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontras"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Lalai"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Sederhana"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Tinggi"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Apl ini hanya boleh dibuka dalam 1 tetingkap"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b03df29..d9525e0 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"ညာဘက် ချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ဘယ်ဘက် ချိတ်ဆက်ရန်"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"ရနိုင်သော နားကြားကိရိယာအားလုံးအတွက်"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"နောက်ထပ် နားကြားကိရိယာ ဆင်တင်များ"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"ဖြတ်လမ်းလင့်ခ်၊ သံလိုက်ဖမ်းတိုင် သတ်မှတ်ချက်များကဲ့သို့ စက်များကြားသုံးနိုင်သော ဆက်တင်များကို ပြောင်းနိုင်သည်"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ဤစက်ပစ္စည်းအတွက်"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"အသံထွက်မည့် ကိရိယာ"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"အသံထွက်မည့် ကိရိယာအကြောင်း"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"သီးသန့်နေရာကို စနစ်ထည့်သွင်းနေသည်…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"သီးသန့်နေရာ လော့ခ်ချထားချိန်တွင် ၎င်းရှိအက်ပ်များမှ အကြောင်းကြားချက်များကို ဖျောက်ထားသည်"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"သီးသန့်နေရာကို ဖျောက်ထားပြီး အလိုအလျောက် လော့ခ်ချခြင်းကို စနစ်ထည့်သွင်းရန် သီးသန့်နေရာ ဆက်တင်များကို လေ့လာခြင်း"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"လိုအပ်သော အက်ပ်များကို သင်၏သီးသန့်နေရာတွင် ထည့်သွင်းပြီးဖြစ်သည်"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"သီးသန့်နေရာကို စနစ်ထည့်သွင်း၍မရပါ"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ထပ်စမ်းရန်"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"သီးသန့်နေရာကို ဖွင့်ရန် ဖန်သားပြင်လော့ခ် သုံးမလား။"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"အက်ပ်နှင့် အကြောင်းကြားချက်"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"လော့ခ်မျက်နှာပြင်ရှိ သတိထားရမည့် အကြောင်းကြားချက်"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"သီးသန့်နေရာ ဖွင့်ထားစဉ် သတိထားရမည့် အကြောင်းအရာ ပြပါ"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"သင့်ဒေတာကို သီးသန့်ထားနိုင်ရန် Google Account ပြုလုပ်ပါ"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"နောက်ဖန်သားပြင်တွင် သင့်သီးသန့်နေရာဖြင့် သုံးရန် အကောင့်သို့ လက်မှတ်ထိုးဝင်နိုင်ပါသည်"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"သီးသန့်နေရာအပြင်ဘက်တွင် ဒေတာပေါ်နေခြင်းကို ရပ်တန့်နိုင်ရန် သီးသန့်အကောင့် ပြုလုပ်ပါ။ ဒေတာနမူနာ-"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"စင့်ခ်လုပ်ထားသော ဓာတ်ပုံ၊ ဖိုင်၊ အီးမေးလ်၊ အဆက်အသွယ်၊ ပြက္ခဒိန်အစီအစဉ်နှင့် အခြားဒေတာများ"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"အက်ပ်ဒေါင်းလုဒ်မှတ်တမ်းနှင့် အကြံပြုချက်များ"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ကြည့်ရှုမှုမှတ်တမ်း၊ လိပ်စာနှင့် သိမ်းထားသောစကားဝှက်များ"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"သီးသန့်နေရာ အက်ပ်များရှိ သင့်လုပ်ဆောင်ချက်နှင့် သက်ဆိုင်သော အကြံပြုထားသည့် အကြောင်းအရာ"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"နားလည်ပြီ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"လက်ဗွေ <xliff:g id="COUNT">%d</xliff:g> ခု အထိ ထည့်နိုင်သည်"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"အများဆုံးထည့်နိုင်သည့် လက်ဗွေရာအရေအတွက်အထိ ထည့်သွင်းပြီးဖြစ်သည်"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"နောက်ထပ်လက်ဗွေရာများ ထည့်၍မရတော့ပါ"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"သင်၏ ကွန်ရက် ချိတ်ဆက်မှုများကို စီမံကွပ်ကဲရန် <xliff:g id="NEW_APP">%s</xliff:g>ကို သုံးရမလား?{"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"လတ်တလောတည်နေရာ တောင်းခံမှုများ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"အက်ပ်တည်နေရာ ခွင့်ပြုချက်များ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"တည်နေရာကို ပိတ်ထားသည်"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{အက်ပ် {total} ခုအနက် # ခုက တည်နေရာကို သုံးခွင့်ရှိသည်}other{အက်ပ် {total} ခုအနက် # ခုက တည်နေရာကို သုံးခွင့်ရှိသည်}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ပြန်သတ်မှတ်ရန်"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"မွမ်းမံပေးရေးကီးကို ရွေးပါ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> အတွက် ကီးအသစ်ရွေးပါ-"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"မူရင်း"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"စကားသံ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"မြားရွေ့နှုန်း"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ဂိမ်းထိန်းချုပ်ခြင်း"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"အထွေထွေ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ဖန်သားပြင် ပြသမှု"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"အရောင်နှင့် လှုပ်ရှားမှု"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"အရောင် အလင်းအမှောင်"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ပိုလင်းပါက စာသား၊ ခလုတ်နှင့် သင်္ကေတများ ပိုပေါ်လွင်ပါသည်။ သင့်အတွက် အသင့်တော်ဆုံး အလင်းအမှောင်ကို ရွေးပါ။"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"အက်ပ်အချို့သည် အရောင်နှင့်စာသား အလင်းအမှောင် ဆက်တင်အားလုံးကို ပံ့ပိုးနိုင်မည်မဟုတ်ပါ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"သင့်ဖန်သားပြင် နောက်ခံအရောင်ပေါ်မူတည်၍ အရောင်နှင့် စာသား မြင်ရပုံကို ချိန်ညှိနိုင်သည်"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"အစမ်းကြည့်ရှုခြင်း"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen၊ Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"လွန်ခဲ့သော ၂ ရက်"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"လိုက်ကြည့်မလား။"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"အလုပ်ကိစ္စခရီးစဉ် အစီရင်ခံစာ"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"နောက်ထပ်အကူအညီအတွက် ကျွန်ုပ် (သို့) Helen ထံ\nဆက်သွယ်ပေးပါ။ ဤအစီရင်ခံစာသည်"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"ကလိုင်းယင့် ကုန်ကျစရိတ်များ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ဖန်သားပြင်ကို ပိုမှောင်အောင်လုပ်ခြင်း"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"အပြန်အလှန်ဆက်သွယ်ချက် ထိန်းချုပ်မှုများ"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"အချိန်ကိုက်ခြင်း ထိန်းချုပ်မှုများ"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"ဖောက်ထွင်းမမြင်နိုင်ပါ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"အရောင်ခြားနားချက်မြင့် စာသား"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"စာသားအရောင်ကို အမည်း (သို့) အဖြူ ပြောင်းနိုင်သည်။ အရောင်ခြားနားချက်ကို နောက်ခံဖြင့် အမြင့်ဆုံးပြုလုပ်နိုင်သည်။"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"စာသားကို အလင်းဆုံးထားရန်"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"နောက်ခံပေါ်မူတည်၍ အလင်းအမှောင်ကို တိုးမြှင့်ပြီး စာသားအရောင်ကို အမည်း (သို့) အဖြူ ပြောင်းနိုင်သည်။"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"မျက်နှာပြင်ချဲ့မှု အော်တိုအပ်ဒိတ်"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"အက်ပ် အပြောင်းတွင်မျက်နှာပြင်ချဲ့မှုအပ်ဒိတ်လုပ်ရန်"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ဖွင့်ပိတ်ခလုတ်ဖြင့် ဖုန်းချရန်"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"မလုပ်တော့"</string>
     <string name="contrast_title" msgid="6885768151336508075">"ဆန့်ကျင်ဘက်"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"ပုံမှန်"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"မူရင်း"</string>
     <string name="contrast_medium" msgid="384414510709285811">"အသင့်အတင့်"</string>
     <string name="contrast_high" msgid="3988567609694797696">"များ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ဤအက်ပ်ကို ဝင်းဒိုး ၁ ခုတွင်သာ ဖွင့်နိုင်သည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6e5ac97..6714d28 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Tilkoble høyre øre"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Tilkoble venstre øre"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"For alle tilgjengelige høreenheter"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Flere innstillinger for høreapparater"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Endre innstillingene for alle høreapparatene, for eksempel snarveier og kontroller for telespole"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"For denne enheten"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Utenhet for lyd"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Om lyd"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Konfigurerer det private området …"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Varsler fra apper i det private området er skjult når det er låst"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Utforsk innstillingene for det private området for å skjule området og konfigurere automatisk låsing"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Obligatoriske apper er installert i det private området allerede"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Kunne ikke konfigurere et privat område"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Prøv på nytt"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Vil du låse opp det private området med skjermlås?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apper og varsler"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Sensitive varsler på låseskjermen"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Vis sensitivt innhold når det private området er låst opp"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Opprett en Google-konto for å bidra til å holde dataene dine private"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"På neste skjerm kan du logge på en konto du vil bruke med det private området"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Opprett en separat konto for å bidra til å hindre at data vises utenfor det private området, for eksempel:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synkroniserte bilder, filer, e-poster, kontakter, kalenderaktiviteter og andre data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Anbefalinger og nedlastingslogg for apper"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Nettleserlogg, bokmerker og lagrede passord"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Foreslått innhold relatert til aktiviteten din i apper i det private området"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Greit"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kan legge til opptil <xliff:g id="COUNT">%d</xliff:g> fingeravtrykk"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du har lagt til maksimalt antall fingeravtrykk"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan ikke legge til flere fingeravtrykk"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Vil du bruke <xliff:g id="NEW_APP">%s</xliff:g> til å administrere nettverkstilkoblingene?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nylige posisjonsforespørsler"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Sted for jobbprofil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Apper med posisjonstillatelse"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Posisjon er slått av"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# av {total} apper har tilgang til posisjon}other{# av {total} apper har tilgang til posisjon}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Tilbakestill"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Velg modifikatortast"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Velg en ny tast for <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Tale"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Pekerhastighet"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Spillkontroller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Generelt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skjerm"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Farge og bevegelse"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Fargekontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Høyere kontrast gjør at tekst, knapper og ikoner blir enklere å se. Velg kontrasten som ser best ut for deg."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Noen apper støtter kanskje ikke alle innstillinger for farge og tekstkontrast"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Juster hvordan farger og tekst ser ut mot bakgrunnsfargen på skjermen."</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Forhåndsvisning"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helene, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 dager siden"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Følg opp?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Rapport fra forretningsreise"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"For å få mer hjelp kan du ta kontakt med \nmeg eller Helene. Denne rapporten blir"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Klientutgifter"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gjør skjermen mørkere"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaksjonskontroller"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Tidskontroller"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Ikke-gjennomsiktig"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst med høy kontrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Endre tekstfarge til svart eller hvit. Dette maksimerer kontrasten mot bakgrunnen."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimer tekstkontrasten"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Endre tekstfargen til svart eller hvit for å øke kontrasten mot bakgrunnen."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Automatisk oppdatering av skjermforstørrelsen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Oppdater skjermforstørrelsen ved appbytter"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Legg på med av/på-knappen"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Avbryt"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Standard"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Middels"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Høy"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Denne appen kan bare åpnes i ett vindu"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 88f09d5..06b2de6 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"दायाँ भाग कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"बायाँ भाग कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"उपलब्ध सबै श्रवण यन्त्रसम्बन्धी कन्ट्रोलहरू"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"श्रवण यन्त्रसम्बन्धी थप सेटिङ"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"सर्टकट र टेलिकोइल कन्ट्रोलहरूलगायतका क्रस-डिभाइस सेटिङ बदल्नुहोस्"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"यो डिभाइससम्बन्धी कन्ट्रोलहरू"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"अडियो आउटपुट"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"अडियो आउटपुटका बारेमा"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"निजी स्पेस सेटअप गरिँदै छ…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"निजी स्पेस लक गरिएका बेला निजी स्पेसका एपबाट प्राप्त सूचनाहरू लुकाइन्छन्"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"निजी स्पेस लुकाउन र स्वतः लक गर्ने सुविधा सेटअप गर्न निजी स्पेससम्बन्धी सेटिङका बारेमा जानकारी प्राप्त गर्नुहोस्"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"आवश्यक एपहरू तपाईंको निजी स्पेसमा इन्स्टल गरिसकिएका छन्"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"निजी स्पेस सेटअप गर्न सकिएन"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"फेरि प्रयास गर्नुहोस्"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"निजी स्पेस अनलक गर्न स्क्रिन लक प्रयोग गर्ने हो?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"एप तथा सूचनाहरू"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"लक स्क्रिनमा संवेदनशील सूचनाहरू"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"निजी स्पेस अनलक गरिएका बेला संवेदनशील सामग्री देखाइयोस्"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"आफ्नो डेटा गोप्य राख्न Google खाता बनाउनुहोस्"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"तपाईं अर्को स्क्रिनमा आफूले निजी स्पेसमा प्रयोग गर्न चाहेको खातामा साइन इन गर्न सक्नुहुन्छ"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"निजी स्पेसबाहिर डेटा देखिन नदिन एउटा छुट्टै खाता बनाउनुहोस्, जस्तै:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"सिंक गरिएका फोटो, फाइल, इमेल, कन्ट्याक्ट, पात्रोमा सेट गरिएका कार्यक्रम र अन्य डेटा"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"विगतमा डाउनलोड गरिएका एप र सिफारिसहरू"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ब्राउजिङ हिस्ट्री, बुकमार्क र सेभ गरिएका पासवर्डहरू"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"तपाईंले निजी स्पेसमा भएका एपमा गरेको क्रियाकलापसम्बन्धी सिफारिस गरिएको सामग्री"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"बुझेँ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"तपाईं बढीमा <xliff:g id="COUNT">%d</xliff:g> वटा फिंगरप्रिन्टहरू हाल्न सक्नुहुन्छ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"तपाईंले अधिकतम संख्यामा फिंगरप्रिन्टहरू थप्नुभएको छ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"थप फिंगरप्रिन्टहरू थप्न सकिँदैन"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"तपाईँको सञ्जाल जडानहरू व्यवस्थापन गर्न <xliff:g id="NEW_APP">%s</xliff:g> प्रयोग गर्ने?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"हालका स्थान अनुरोधहरू"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"काम प्रोफाइलका लागि स्थान"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"एपलाई दिइएको लोकेसन प्रयोग गर्ने अनुमति"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"लोकेसन अफ छ"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} मध्ये # एपलाई लोकेसन प्रयोग गर्ने अनुमति दिइएको छ}other{{total} मध्ये # वटा एपलाई लोकेसन प्रयोग गर्ने अनुमति दिइएको छ}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"रिसेट गर्नुहोस्"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"मोडिफायर की छान्नुहोस्"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> को नयाँ की छनौट गर्नुहोस्:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"डिफल्ट"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"बोली"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"पोइन्टरको गति"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"खेल नियन्त्रक"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"सामान्य"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिस्प्ले"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"रङ र मोसन"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"रङको कन्ट्रास्ट"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"तपाईंले उच्च कन्ट्रास्ट छनौट गर्नुभयो भने टेक्स्ट, बटन र आइकनहरू अझ आकर्षक देखिन्छन्। तपाईंका लागि सबैभन्दा उपयुक्त हुने कन्ट्रास्ट छनौट गर्नुहोस्।"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"केही एपमा रङ र टेक्स्टको कन्ट्रास्टसम्बन्धी सबै सेटिङले काम नगर्न सक्छ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"तपाईंको स्क्रिनको ब्याकग्राउन्डको रङमा अन्य रङ र टेक्स्टहरू कस्ता देखिन्छन् भन्ने कुरा मिलाउनुहोस्"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"प्रिभ्यू गर्नुहोस्"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"२ दिनअघि"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"फलो अप गर्ने हो?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"व्यावसायिक यात्रासम्बन्धी रिपोर्ट"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"थप सहायता चाहिएमा कृपया \nमलाई वा Helen लाई सम्पर्क गर्नुहोस्। यो रिपोर्ट"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"क्लाइन्टसँग सम्बन्धित खर्चहरू"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रिन अझ अँध्यारो बनाउनुहोस्"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"अन्तर्क्रियासम्बन्धी सेटिङ"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"समयसम्बन्धी कन्ट्रोल"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"अपारदर्शी"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"हाइ कन्ट्रास्ट टेक्स्ट"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"पाठको रङ बदलेर कालो वा सेतो बनाउनुहोस्। यसले ब्याकग्राउन्डमा कन्ट्रास्टको लेभल अधिकतम बनाउँछ।"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"टेक्स्टको कन्ट्रास्ट सकेसम्म बढाउनुहोस्"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ब्याकग्राउन्डसँग कन्ट्रास्ट बढाउन टेक्स्टको रङ परिवर्तन गरी कालो वा सेतो बनाउनुहोस्।"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"स्क्रिन आवर्धन स्वतः अपडेट गर्नुहोस्"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"एप ट्रान्जिसनहरूमा स्क्रिन आवर्धन अपडेट गर्नुहोस्"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पावर बटन थोच्दा फोन काटियोस्"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"रद्द गर्नुहोस्"</string>
     <string name="contrast_title" msgid="6885768151336508075">"कन्ट्रास्ट"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"डिफल्ट"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"डिफल्ट"</string>
     <string name="contrast_medium" msgid="384414510709285811">"मध्यम"</string>
     <string name="contrast_high" msgid="3988567609694797696">"उच्च"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"यो एप एउटा विन्डोमा मात्र खोल्न मिल्छ"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0ac4f9d..d20cca3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Rechteroor koppelen"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Linkeroor koppelen"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Voor alle beschikbare hoortoestellen"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Meer instellingen voor hoortoestellen"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Wijzig cross-device instellingen, zoals het beheer van snelkoppelingen en telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Voor dit apparaat"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio-uitvoer"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Over audio-uitvoer"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Privéruimte instellen…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Meldingen van apps in het privégedeelte worden verborgen als dit is vergrendeld"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Instellingen om het privégedeelte te verbergen en automatisch te laten vergrendelen"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Vereiste apps zijn al geïnstalleerd in je privégedeelte"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Kan privégedeelte niet instellen"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Opnieuw proberen"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Schermvergrendeling gebruiken voor ontgrendeling van privéruimte?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apps en meldingen"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Gevoelige meldingen op vergrendelscherm"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Toon gevoelige content als het privégedeelte is ontgrendeld"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Een Google-account maken om je gegevens privé te houden"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Op het volgende scherm kun je inloggen bij het account dat je wilt gebruiken voor je privégedeelte"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Maak een apart account zodat gegevens niet buiten je privégedeelte worden getoond, zoals:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Gesynchroniseerde foto\'s, bestanden, e-mails, contacten, agenda-afspraken en andere gegevens"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Downloadgeschiedenis en aanbevelingen voor apps"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Browsegeschiedenis, bookmarks en opgeslagen wachtwoorden"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Aanbevolen content met betrekking tot je activiteit in apps in je privégedeelte"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Je kunt maximaal <xliff:g id="COUNT">%d</xliff:g> vingerafdrukken toevoegen"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Je hebt het maximale aantal vingerafdrukken toegevoegd"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Kan geen extra vingerafdrukken toevoegen"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"<xliff:g id="NEW_APP">%s</xliff:g> gebruiken om je netwerkverbindingen te beheren?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Recente locatieverzoeken"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Locatie voor werkprofiel"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Locatierechten voor apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Locatie staat uit"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# van {total} apps heeft toegang tot de locatie}other{# van {total} apps hebben toegang tot de locatie}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Resetten"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Functietoets kiezen"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Kies een nieuwe toets voor <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standaard"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Spraak"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Snelheid van aanwijzer"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Gamecontroller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Algemeen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Scherm"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Kleur en beweging"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kleurcontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Bij een hoger contrast vallen tekst, knoppen en iconen meer op. Kies het contrast dat je prettig vindt."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Sommige apps ondersteunen misschien niet alle instellingen voor kleur- en tekstcontrast"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Pas aan hoe kleuren en tekst eruitzien tegen de achtergrondkleur van je scherm"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Voorbeeld"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 dagen geleden"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Opvolgen?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Verslag van zakenreis"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Neem voor meer hulp contact op met \nmij of Helen. Dit rapport wordt"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Klantuitgaven"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Scherm donkerder maken"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interactieopties"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Bedienings­elementen voor timing"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Niet-transparant"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst met hoog contrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Wijzig de tekstkleur in zwart of wit. Zo maximaliseer je het contrast met de achtergrond."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Tekstcontrast maximaliseren"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Wijzig de tekstkleur in zwart of wit om het contrast met de achtergrond te verhogen."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Schermvergroting automatisch updaten"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Schermvergroting updaten bij app-overgangen"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Aan/uit-knop beëindigt gesprek"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Annuleren"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standaard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Standaard"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Gemiddeld"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Hoog"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Deze app kan maar in 1 venster worden geopend"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index d3c3dd6..4fde22d 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"ଡାହାଣ କାନକୁ ପେୟାର କର"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ବାମ କାନକୁ ପେୟାର କର"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"ସମସ୍ତ ଉପଲବ୍ଧ ହିଅରିଂ ଡିଭାଇସ ପାଇଁ"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"ଶୁଣିବା ଡିଭାଇସର ଅଧିକ ସେଟିଂସ"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"ସର୍ଟକଟ ଏବଂ ଟେଲିକଏଲ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ପରି କ୍ରସ-ଡିଭାଇସ ସେଟିଂସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ଏହି ଡିଭାଇସ ପାଇଁ"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ଅଡିଓ ଆଉଟପୁଟ"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ଅଡିଓ ଆଉଟପୁଟ ବିଷୟରେ"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"ପ୍ରାଇଭେଟ ସ୍ପେସ ସେଟ ଅପ କରାଯାଉଛି…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ପ୍ରାଇଭେଟ ସ୍ପେସ ଲକ ଥିବା ସମୟରେ ଏହାର ଆପ୍ସରୁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଲୁଚାଯାଇଥାଏ"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଲୁଚାଇବା ଏବଂ ସ୍ୱତଃ ଲକିଂ ସେଟ ଅପ କରିବା ପାଇଁ ପ୍ରାଇଭେଟ ସ୍ପେସ ସେଟିଂସକୁ ଏକ୍ସପ୍ଲୋର କରନ୍ତୁ"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"ପୂର୍ବରୁ ଆବଶ୍ୟକ ଆପ୍ସ ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସରେ ଇନଷ୍ଟଲ କରାଯାଇଛି"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"ଏକ ପ୍ରାଇଭେଟ ସ୍ପେସ ସେଟ ଅପ କରାଯାଇପାରିଲା ନାହିଁ"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ପ୍ରାଇଭେଟ ସ୍ପେସ ଅନଲକ ପାଇଁ ସ୍କ୍ରିନ ଲକ ବ୍ୟବହାର କରିବେ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"ଆପ୍ସ ଏବଂ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"ଲକ ସ୍କ୍ରିନରେ ସମ୍ବେଦନଶୀଳ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଅନଲକ କରାଯାଇଥିବା ସମୟରେ ସମ୍ବେଦନଶୀଳ ବିଷୟବସ୍ତୁ ଦେଖନ୍ତୁ"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"ଆପଣଙ୍କ ଡାଟାକୁ ପ୍ରାଇଭେଟ ରଖିବାରେ ସାହାଯ୍ୟ କରିବାକୁ ଏକ Google ଆକାଉଣ୍ଟ ତିଆରି କରନ୍ତୁ"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"ପରବର୍ତ୍ତୀ ସ୍କ୍ରିନରେ ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସ ସହ ବ୍ୟବହାର କରିବାକୁ ଆପଣ ଏକ ଆକାଉଣ୍ଟରେ ସାଇନ ଇନ କରିପାରିବେ"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"ପ୍ରାଇଭେଟ ସ୍ପେସ ବାହାରେ ଦେଖାଯିବାରୁ ଡାଟାକୁ ପ୍ରତିରୋଧ କରିବାରେ ସାହାଯ୍ୟ କରିବା ପାଇଁ ଏକ ଉତ୍ସର୍ଗୀକୃତ ଆକାଉଣ୍ଟ ତିଆରି କରନ୍ତୁ, ଯେପରି:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"ସିଙ୍କ ହୋଇଥିବା ଫଟୋ, ଫାଇଲ, ଇମେଲ, କଣ୍ଟାକ୍ଟ, କେଲେଣ୍ଡର ଇଭେଣ୍ଟ ଏବଂ ଅନ୍ୟ ଡାଟା"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ଆପ ଡାଉନଲୋଡ ଇତିହାସ ଏବଂ ସୁପାରିଶଗୁଡ଼ିକ"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ବ୍ରାଉଜିଂ ଇତିହାସ, ବୁକମାର୍କ ଏବଂ ସେଭ ହୋଇଥିବା ପାସୱାର୍ଡଗୁଡ଼ିକ"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ପ୍ରାଇଭେଟ ସ୍ପେସ ଆପ୍ସରେ ଆପଣଙ୍କ କାର୍ଯ୍ୟକଳାପ ସମ୍ବନ୍ଧିତ ପ୍ରସ୍ତାବିତ ବିଷୟବସ୍ତୁ"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"ବୁଝିଗଲି"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g> ଟିପଚିହ୍ନ ଯୋଗ କରିପାରିବେ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ଆପଣ ସର୍ବାଧିକ ସଂଖ୍ୟାର ଆଙ୍ଗୁଠି ଚିହ୍ନ ଯୋଡିଛନ୍ତି"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ଆଉ ଅଧିକ ଟିପଚିହ୍ନ ଯୋଡିପାରିବ ନାହିଁ"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ନିଜର ନେଟ୍‌ୱର୍କ ସଂଯୋଗ ପରିଚାଳନା କରିବା ପାଇଁ <xliff:g id="NEW_APP">%s</xliff:g>ର ବ୍ୟବହାର କରିବେ?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"ବର୍ତ୍ତମାନର ଲୋକେସନ୍ ଅନୁରୋଧ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ୱାର୍କ ପ୍ରୋଫାଇଲ୍‌ ପାଇଁ ଲୋକେସନ୍‌"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ଆପର ଲୋକେସନ ଅନୁମତିଗୁଡ଼ିକ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ଲୋକେସନ୍‌ ବନ୍ଦ ଅଛି"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total}ଟିରୁ #ଟି ଆପ୍ସର ଲୋକେସନକୁ ଆକ୍ସେସ ଅଛି}other{{total}ଟିରୁ #ଟି ଆପ୍ସର ଲୋକେସନକୁ ଆକ୍ସେସ ଅଛି}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ରିସେଟ କରନ୍ତୁ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"ମୋଡିଫାୟର କୀ ବାଛନ୍ତୁ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ପାଇଁ ଏକ ନୂଆ କୀ ବାଛନ୍ତୁ:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"ସ୍ପିଚ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ପଏଣ୍ଟର୍‌ର ବେଗ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ଗେମ କଣ୍ଟ୍ରୋଲର"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"ସାଧାରଣ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ଡିସପ୍ଲେ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ରଙ୍ଗ ଏବଂ ମୋସନ"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"ରଙ୍ଗ କଣ୍ଟ୍ରାଷ୍ଟ"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ଉଚ୍ଚ କଣ୍ଟ୍ରାଷ୍ଟ ଟେକ୍ସଟ, ବଟନ ଏବଂ ଆଇକନକୁ ଅଧିକ ସ୍ୱତନ୍ତ୍ର ଭାବେ ଦେଖାଇଥାଏ। ଆପଣଙ୍କ ସଠିକ ହୋଇଥିବା କଣ୍ଟ୍ରାଷ୍ଟ ବାଛନ୍ତୁ।"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"କିଛି ଆପ୍ସ ସମସ୍ତ ରଙ୍ଗ ଏବଂ ଟେକ୍ସଟ କଣ୍ଟ୍ରାଷ୍ଟ ସେଟିଂସକୁ ସମର୍ଥନ କରିନପାରେ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ପୃଷ୍ଠପଟ ରଙ୍ଗ ଅନୁଯାୟୀ ରଙ୍ଗ ଏବଂ ଟେକ୍ସଟ କିପରି ଦେଖାଯିବ ତାହା ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"ପ୍ରିଭ୍ୟୁ"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ହେଲେନ, ଆଦାମ"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ଦିନ ପୂର୍ବେ"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ଫଲୋ ଅପ୍ କରିବେ?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"ବିଜିନେସ ଟ୍ରିପ ରିପୋର୍ଟ"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"ଅଧିକ ସହାୟତା ପାଇଁ ମୋ ସହ କିମ୍ବା ହେଲେନ\nସହ ଯୋଗାଯୋଗ କରନ୍ତୁ। ଏହି ରିପୋର୍ଟଟି ଏସବୁ ହେବ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"କ୍ଲାଏଣ୍ଟର ଖର୍ଚ୍ଚ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ସ୍କ୍ରିନକୁ ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ଇଣ୍ଟରାକସନ୍‌ ନିୟନ୍ତ୍ରଣ"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"ସମୟ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"ନନ୍-ଟ୍ରାନ୍ସପେରେଣ୍ଟ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ଉଚ୍ଚ କଣ୍ଟ୍ରାଷ୍ଟଯୁକ୍ତ ଟେକ୍ସଟ୍‌"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"ଟେକ୍ସଟର ରଙ୍ଗକୁ କଳା କିମ୍ବା ଧଳା ରଙ୍ଗରେ ପରିବର୍ତ୍ତନ କରନ୍ତୁ। ପୃଷ୍ଠପଟ ସହିତ କଣ୍ଟ୍ରାଷ୍ଟ ବଢ଼ାଏ।"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"ଟେକ୍ସଟର କଣ୍ଟ୍ରାଷ୍ଟ ସର୍ବାଧିକ କରନ୍ତୁ"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ପୃଷ୍ଠପଟ ଅନୁସାରେ କଣ୍ଟ୍ରାଷ୍ଟ ବଢ଼ାଇବାକୁ ଟେକ୍ସଟର ରଙ୍ଗ କଳା କିମ୍ବା ଧଳାରେ ପରିବର୍ତ୍ତନ କରନ୍ତୁ।"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"ସ୍କ୍ରିନ୍‌ ମ୍ୟାଗ୍ନିଫାୟର୍‌ ସ୍ୱତଃ ଅପଡେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ଆପ୍‌ ବଦଳିବାବେଳେ ସ୍କ୍ରୀନ୍‌କୁ ବଡ଼ କର"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ପାୱର୍‌ ବଟନ୍‌ କଲ୍‌ ସମାପ୍ତ କରେ"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ବାତିଲ କରନ୍ତୁ"</string>
     <string name="contrast_title" msgid="6885768151336508075">"କଣ୍ଟ୍ରାଷ୍ଟ"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"ଷ୍ଟାଣ୍ଡାର୍ଡ"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ଡିଫଲ୍ଟ"</string>
     <string name="contrast_medium" msgid="384414510709285811">"ମଧ୍ୟମ"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ଅଧିକ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ଏହି ଆପକୁ କେବଳ 1ଟି ୱିଣ୍ଡୋରେ ଖୋଲାଯାଇପାରିବ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 64cf844..184c14f 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"ਸੱਜਾ ਕੰਨ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ਖੱਬਾ ਕੰਨ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"ਸਾਰੇ ਉਪਲਬਧ ਸੁਣਨ ਵਾਲੇ ਡੀਵਾਈਸਾਂ ਲਈ"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"ਹੋਰ ਸੁਣਨ ਵਾਲੇ ਡੀਵਾਈਸ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"ਸ਼ਾਰਟਕੱਟ ਅਤੇ ਟੈਲੀਕੋਇਲ ਕੰਟਰੋਲਾਂ ਵਰਗੀਆਂ ਕ੍ਰਾਸ-ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਬਦਲੋ"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ਇਸ ਡੀਵਾਈਸ ਲਈ"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ਆਡੀਓ ਆਊਟਪੁੱਟ"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ਆਡੀਓ ਆਊਟਪੁੱਟ ਬਾਰੇ"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"ਨਿੱਜੀ ਸਪੇਸ ਦਾ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਦੇ ਲਾਕ ਹੋਣ \'ਤੇ, ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਐਪਾਂ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਲੁਕੀਆਂ ਹੁੰਦੀਆਂ ਹਨ"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਨੂੰ ਲੁਕਾਉਣ ਲਈ ਅਤੇ ਸਵੈਚਲਿਤ ਲਾਕ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ, ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਸੈਟਿੰਗਾਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"ਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਵਿੱਚ ਲੋੜੀਂਦੀਆਂ ਐਪਾਂ ਪਹਿਲਾਂ ਹੀ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹੋਈਆਂ ਹਨ"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਦਾ ਸੈੱਟਅੱਪ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ਕੀ ਨਿੱਜੀ ਸਪੇਸ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਅਣਲਾਕ ਕਰਨਾ ਹੈ?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸੂਚਨਾਵਾਂ"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਅਣਲਾਕ ਹੋਣ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"ਆਪਣੇ ਡਾਟੇ ਨੂੰ ਨਿੱਜੀ ਰੱਖਣ ਵਿੱਚ ਮਦਦ ਲਈ Google ਖਾਤਾ ਬਣਾਓ"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"ਅਗਲੀ ਸਕ੍ਰੀਨ ’ਤੇ, ਤੁਸੀਂ ਆਪਣੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਨਾਲ ਵਰਤਣ ਲਈ ਕਿਸੇ ਖਾਤੇ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"ਡਾਟੇ ਨੂੰ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਤੋਂ ਬਾਹਰ ਦਿਸਣ ਤੋਂ ਰੋਕਣ ਵਿੱਚ ਮਦਦ ਲਈ ਸਮਰਪਿਤ ਖਾਤਾ ਬਣਾਓ, ਜਿਵੇਂ ਕਿ:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"ਸਿੰਕ ਕੀਤੀਆਂ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਈਮੇਲਾਂ, ਸੰਪਰਕ, ਕੈਲੰਡਰ ਇਵੈਂਟ ਅਤੇ ਹੋਰ ਡਾਟਾ"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ਐਪ ਡਾਊਨਲੋਡ ਇਤਿਹਾਸ ਅਤੇ ਸਿਫ਼ਾਰਸ਼ਾਂ"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ਬ੍ਰਾਊਜ਼ਿੰਗ ਇਤਿਹਾਸ, ਬੁੱਕਮਾਰਕ ਅਤੇ ਰੱਖਿਅਤ ਕੀਤੇ ਪਾਸਵਰਡ"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਐਪਾਂ ਵਿੱਚ ਤੁਹਾਡੀ ਸਰਗਰਮੀ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਝਾਈ ਗਈ ਸਮੱਗਰੀ"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"ਸਮਝ ਲਿਆ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ਤੁਸੀਂ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਅਧਿਕਤਮ ਸੰਖਿਆ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"ਹੋਰ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ਕੀ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ <xliff:g id="NEW_APP">%s</xliff:g> ਵਰਤਣਾ ਹੈ?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ਐਪ ਦੀਆਂ ਟਿਕਾਣੇ ਸੰਬੰਧੀ ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ਟਿਕਾਣਾ ਬੰਦ ਹੈ"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} ਵਿੱਚੋਂ # ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ}one{{total} ਵਿੱਚੋਂ # ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ}other{{total} ਵਿੱਚੋਂ # ਐਪਾਂ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"ਸੋਧਕ ਕੁੰਜੀ ਚੁਣੋ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> ਲਈ ਨਵੀਂ ਕੁੰਜੀ ਚੁਣੋ:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"ਬੋਲੀ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ਪੁਆਇੰਟਰ ਸਪੀਡ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ਗੇਮ ਕੰਟ੍ਰੋਲਰ"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"ਸਧਾਰਨ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ਡਿਸਪਲੇ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"ਰੰਗ ਅਤੇ ਮੋਸ਼ਨ"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"ਰੰਗ ਦਾ ਕੰਟ੍ਰਾਸਟ"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ਜ਼ਿਆਦਾ ਕੰਟ੍ਰਾਸਟ ਨਾਲ ਲਿਖਤ, ਬਟਨ ਅਤੇ ਪ੍ਰਤੀਕ ਹੋਰ ਵੀ ਵੱਖਰੇ ਨਜ਼ਰ ਆਉਂਦੇ ਹਨ। ਤੁਹਾਨੂੰ ਸਭ ਤੋਂ ਵਧੀਆ ਦਿਸਣ ਵਾਲਾ ਕੰਟ੍ਰਾਸਟ ਚੁਣੋ।"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"ਸ਼ਾਇਦ ਕੁਝ ਐਪਾਂ ਸਾਰੀਆਂ ਰੰਗ ਅਤੇ ਲਿਖਤ ਦੀਆਂ ਕੰਟ੍ਰਾਸਟ ਸੈਟਿੰਗਾਂ ਦਾ ਸਮਰਥਨ ਨਾ ਕਰਨ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"ਵਿਵਸਥਿਤ ਕਰੋ ਕਿ ਰੰਗ ਅਤੇ ਲਿਖਤ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਦੇ ਬੈਕਗ੍ਰਾਊਂਡ ਰੰਗ ਅੱਗੇ ਕਿਵੇਂ ਲੱਗਦੇ ਹਨ"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"ਪੂਰਵ-ਝਲਕ ਦੇਖੋ"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ਹੈਲਨ, ਐਡਮ"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ਦਿਨ ਪਹਿਲਾਂ"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ਫ਼ਾਲੋ ਅੱਪ ਕਰਨਾ ਹੈ?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"ਕਾਰੋਬਾਰੀ ਯਾਤਰਾ ਦੀ ਰਿਪੋਰਟ"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"ਹੋਰ ਸਹਾਇਤਾ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ \nਮੈਨੂੰ ਜਾਂ ਹੈਲਨ ਨੂੰ ਸੰਪਰਕ ਕਰੋ। ਇਹ ਰਿਪੋਰਟ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"ਕਲਾਇੰਟ ਦੇ ਖਰਚੇ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ਸਕ੍ਰੀਨ ਦਾ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ਅੰਤਰਕਿਰਿਆ ਦੇ ਕੰਟਰੋਲ"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"ਟਾਈਮਿੰਗ ਕੰਟਰੋਲ"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"ਗੈਰ-ਪਾਰਦਰਸ਼ੀ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ਉੱਚ ਕੰਟ੍ਰਾਸਟ ਲਿਖਤ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"ਲਿਖਤ ਦਾ ਰੰਗ ਬਦਲ ਕੇ ਕਾਲਾ ਜਾਂ ਸਫ਼ੈਦ ਕਰੋ। ਇਹ ਬੈਕਗ੍ਰਾਉਂਡ ਦੇ ਨਾਲ ਕੰਟ੍ਰਾਸਟ ਵਧਾ ਦਿੰਦਾ ਹੈ।"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"ਲਿਖਤ ਦੇ ਕੰਟ੍ਰਾਸਟ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"ਬੈਕਗ੍ਰਾਊਂਡ ਦੇ ਨਾਲ ਕੰਟ੍ਰਾਸਟ ਵਧਾਉਣ ਲਈ ਲਿਖਤ ਦਾ ਰੰਗ ਬਦਲ ਕੇ ਕਾਲਾ ਜਾਂ ਸਫ਼ੈਦ ਕਰੋ।"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਸਵੈ-ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ਐਪ ਟ੍ਰਾਂਜਿਸ਼ਨਾਂ ਤੇ ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ਪਾਵਰ ਬਟਨ ਨਾਲ ਕਾਲ ਕੱਟਣਾ"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ਰੱਦ ਕਰੋ"</string>
     <string name="contrast_title" msgid="6885768151336508075">"ਕੰਟ੍ਰਾਸਟ"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"ਮਿਆਰੀ"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
     <string name="contrast_medium" msgid="384414510709285811">"ਦਰਮਿਆਨਾ"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ਜ਼ਿਆਦਾ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ਇਹ ਐਪ ਸਿਰਫ਼ 1 ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e1cab51..ab7513e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Sparuj prawe ucho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Sparuj lewe ucho"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Dla wszystkich dostępnych urządzeń słuchowych"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Więcej ustawień urządzenia słuchowego"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Zmień ustawienia dla wielu urządzeń, takie jak skróty czy opcje cewki telefonicznej"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Dla tego urządzenia"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Wyjście audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O wyjściu audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Konfiguruję obszar prywatny…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Powiadomienia z aplikacji w przestrzeni prywatnej są ukryte, gdy jest ona zablokowana"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"W ustawieniach przestrzeni prywatnej możesz ukryć przestrzeń prywatną i skonfigurować automatyczne blokowanie"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Niektóre aplikacje są już zainstalowane w przestrzeni prywatnej"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Nie udało się skonfigurować przestrzeni prywatnej"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Spróbuj ponownie"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Używać blokady ekranu do odblokowywania obszaru prywatnego?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikacje i powiadomienia"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Powiadomienia poufne na ekranie blokady"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Pokazuj treści poufne, gdy przestrzeń prywatna jest odblokowana"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Utwórz konto Google, aby lepiej chronić prywatność swoich danych"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na następnym ekranie możesz zalogować się na konto, z którego chcesz korzystać w przestrzeni prywatnej"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Utwórz osobne konto, aby zapobiegać wyświetlaniu poza przestrzenią prywatną danych takich jak:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Zsynchronizowane zdjęcia, pliki, e-maile, kontakty, wydarzenia w kalendarzu i inne dane"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historia pobierania aplikacji i rekomendacje"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historia przeglądania, zakładki i zapisane hasła"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Sugerowane treści związane z Twoją aktywnością w aplikacjach w przestrzeni prywatnej"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> odcisków palców"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodano maksymalną liczbę odcisków palców"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nie można dodać więcej odcisków palców"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Używać <xliff:g id="NEW_APP">%s</xliff:g> do zarządzania połączeniami sieciowymi?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Ostatnie prośby o lokalizację"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokalizacja dla profilu służbowego"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Dostęp do lokalizacji"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokalizacja jest wyłączona"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# z {total} aplikacji ma dostęp do lokalizacji}few{# z {total} aplikacji mają dostęp do lokalizacji}many{# z {total} aplikacji ma dostęp do lokalizacji}other{# z {total} aplikacji ma dostęp do lokalizacji}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Resetuj"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Wybierz klawisz modyfikujący"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Wybierz nowy klawisz jako <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Domyślny"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Mowa"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Szybkość wskaźnika"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Kontroler gier"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Ogólne"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Wyświetlacz"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Kolor i ruch"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontrast kolorów"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Wyższy kontrast powoduje większe wyróżnienie tekstu, przycisków i ikon. Wybierz poziom kontrastu, który najbardziej Ci odpowiada."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Niektóre aplikacje mogą nie obsługiwać wszystkich ustawień kontrastu kolorów i tekstu"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Dostosuj wygląd kolorów i tekstu względem tła na ekranie"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Podgląd"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helena, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 dni temu"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Napisać ponownie?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Raport z podróży służbowej"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"W razie potrzeby proszę o kontakt \nze mną lub z Heleną. Ten raport zostanie"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Wydatki klienta"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Przyciemnij ekran"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Zarządzanie interakcjami"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Ustawienia czasowe"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Nieprzezroczyste"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst o dużym kontraście"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Zmień kolor tekstu na czarny lub biały. Spowoduje to ustawienie maksymalnego kontrastu względem tła."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Zmaksymalizuj kontrast tekstu"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Zmień kolor tekstu na czarny lub biały. Spowoduje to zwiększenie kontrastu względem tła."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Automatyczna aktualizacja powiększenia ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Aktualizuj powiększenie ekranu przy zmianie aplikacji"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Przycisk zasilania kończy rozmowę"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Anuluj"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standardowy"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Domyślny"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Średni"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Wysoki"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ta aplikacja może być otwarta tylko w 1 oknie."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9b9a4b0..97b21c1 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Parear lado direito"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Parear lado esquerdo"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Para todos os aparelhos auditivos disponíveis"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Mais configurações para aparelhos auditivos"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Mude as configurações entre dispositivos, como atalhos e controles de telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Para este aparelho"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de áudio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Sobre a saída de áudio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando o espaço particular…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Notificações de apps no espaço privado ficam ocultas quando ele está bloqueado"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Consulte as configurações do espaço privado para ocultá-lo e configurar o bloqueio automático"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Os apps necessários já estão instalados no seu espaço privado"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Não foi possível configurar um espaço privado"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Tentar de novo"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Usar o bloq. de tela p/ abrir o Espaço particular?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apps e notificações"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notificações sensíveis na tela de bloqueio"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Mostrar conteúdo sensível quando o espaço privado estiver desbloqueado"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Crie uma Conta do Google para ajudar a manter a privacidade dos seus dados"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na próxima tela, você pode fazer login em uma conta para usar com seu espaço privado"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Crie uma conta dedicada para ajudar a impedir que os dados apareçam fora do espaço privado, como:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotos, arquivos, e-mails, contatos, eventos da agenda e outros dados estão sincronizados"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Histórico e recomendações de download de apps"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Histórico de navegação, favoritos e senhas salvas"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Conteúdo sugerido relacionado à sua atividade em apps do espaço privado"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Entendi"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> digitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Você adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Não é possível adicionar mais impressões digitais"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Usar <xliff:g id="NEW_APP">%s</xliff:g> para gerenciar suas conexões de rede?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Solicitações recentes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Local do perfil de trabalho"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permissões de acesso ao local"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Localização desativada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# app de {total} tem acesso à localização}one{# app de {total} tem acesso à localização}other{# apps de {total} têm acesso à localização}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Redefinir"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Escolher a tecla modificadora"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Padrão"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Fala"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocidade do cursor"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de jogos"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Exibição"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Cor e movimento"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contraste de cor"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Um contraste mais alto faz com que o texto, os botões e os ícones se destaquem. Escolha o contraste mais adequado para você."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"É possível que alguns apps ainda não tenham suporte a todas as configurações de contraste de cor e texto"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajuste a aparência das cores e do texto em relação à cor do plano de fundo"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Prévia"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"há 2 dias"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Acompanhar?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Relatório de viagem de negócios"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Entre em contato \ncomigo ou com a Helen para receber ajuda. Este relatório será"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Despesas de clientes"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interação"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Controles de marcação de tempo"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Não transparente"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texto em alto contraste"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Mudar a cor do texto para preto ou branco. Maximiza o contraste com o plano de fundo."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximize o contraste do texto"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Mude a cor do texto para preto ou branco para aumentar o contraste com o plano de fundo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Atualiz. ampliação da tela em transições de aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão liga/desliga encerra chamadas"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Cancelar"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contraste"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Padrão"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Padrão"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Médio"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Alto"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Esse app só pode ser aberto em uma única janela"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9c02c13..4ed8eca 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Usar <xliff:g id="NEW_APP">%s</xliff:g> para gerir as ligações de rede?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Pedidos de localização recentes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Local. para perfil de trabalho"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autorizações de localização das apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A localização está desativada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# de {total} apps tem acesso à localização}other{# de {total} apps têm acesso à localização}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Repor"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Escolha uma tecla de modificação"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predefinição"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocidade do ponteiro"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de Jogos"</string>
@@ -3373,7 +3381,7 @@
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação das notificações adaptável"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifique as notificações por relevância automaticamente."</string>
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sobre as notificações adaptáveis"</string>
-    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar ajustes efetuados às notificações e mostrar a opção para fornecer feedback ao sistema"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar ajustes efetuados às notificações e mostrar a opção para dar feedback ao sistema"</string>
     <string name="asst_importance_reset_title" msgid="6191265591976440115">"Repor a importância das notificações"</string>
     <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reponha as definições de importância alteradas pelo utilizador e permita que o assistente de notificações defina prioridades."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9b9a4b0..97b21c1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Parear lado direito"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Parear lado esquerdo"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Para todos os aparelhos auditivos disponíveis"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Mais configurações para aparelhos auditivos"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Mude as configurações entre dispositivos, como atalhos e controles de telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Para este aparelho"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de áudio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Sobre a saída de áudio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando o espaço particular…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Notificações de apps no espaço privado ficam ocultas quando ele está bloqueado"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Consulte as configurações do espaço privado para ocultá-lo e configurar o bloqueio automático"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Os apps necessários já estão instalados no seu espaço privado"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Não foi possível configurar um espaço privado"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Tentar de novo"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Usar o bloq. de tela p/ abrir o Espaço particular?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Apps e notificações"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notificações sensíveis na tela de bloqueio"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Mostrar conteúdo sensível quando o espaço privado estiver desbloqueado"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Crie uma Conta do Google para ajudar a manter a privacidade dos seus dados"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na próxima tela, você pode fazer login em uma conta para usar com seu espaço privado"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Crie uma conta dedicada para ajudar a impedir que os dados apareçam fora do espaço privado, como:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotos, arquivos, e-mails, contatos, eventos da agenda e outros dados estão sincronizados"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Histórico e recomendações de download de apps"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Histórico de navegação, favoritos e senhas salvas"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Conteúdo sugerido relacionado à sua atividade em apps do espaço privado"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Entendi"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> digitais"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Você adicionou o número máximo de impressões digitais"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Não é possível adicionar mais impressões digitais"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Usar <xliff:g id="NEW_APP">%s</xliff:g> para gerenciar suas conexões de rede?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Solicitações recentes"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Local do perfil de trabalho"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permissões de acesso ao local"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Localização desativada"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# app de {total} tem acesso à localização}one{# app de {total} tem acesso à localização}other{# apps de {total} têm acesso à localização}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Redefinir"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Escolher a tecla modificadora"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Escolha uma nova tecla para <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Padrão"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Fala"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Velocidade do cursor"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de jogos"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Exibição"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Cor e movimento"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contraste de cor"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Um contraste mais alto faz com que o texto, os botões e os ícones se destaquem. Escolha o contraste mais adequado para você."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"É possível que alguns apps ainda não tenham suporte a todas as configurações de contraste de cor e texto"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajuste a aparência das cores e do texto em relação à cor do plano de fundo"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Prévia"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"há 2 dias"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Acompanhar?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Relatório de viagem de negócios"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Entre em contato \ncomigo ou com a Helen para receber ajuda. Este relatório será"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Despesas de clientes"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interação"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Controles de marcação de tempo"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Não transparente"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texto em alto contraste"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Mudar a cor do texto para preto ou branco. Maximiza o contraste com o plano de fundo."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximize o contraste do texto"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Mude a cor do texto para preto ou branco para aumentar o contraste com o plano de fundo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Atual. autom. da ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Atualiz. ampliação da tela em transições de aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão liga/desliga encerra chamadas"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Cancelar"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contraste"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Padrão"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Padrão"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Médio"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Alto"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Esse app só pode ser aberto em uma única janela"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 266675f..1319cfc 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Asociază urechea dreaptă"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Asociază urechea stângă"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Pentru toate aparatele auditive disponibile"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Mai multe setări pentru aparate auditive"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Modifică setările pe mai multe dispozitive, de exemplu, comenzile rapide și comenzile pentru bobina cu inducție"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Pentru acest dispozitiv"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Ieșire audio"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Despre ieșirea audio"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Se configurează spațiul privat…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Notificările de la aplicațiile din spațiul privat sunt ascunse atunci când acesta este blocat"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Explorează setările spațiului privat pentru a ascunde spațiul privat și a configura blocarea automată"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Aplicațiile obligatorii au fost deja instalate în spațiul privat"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Nu s-a putut configura un spațiu privat"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Încearcă din nou"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Folosești blocarea ecranului pentru a debloca spațiul privat?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplicații și notificări"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Notificările privind conținutul sensibil de pe ecranul de blocare"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Afișează conținut sensibil atunci când spațiul privat este deblocat"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Creează un Cont Google pentru a-ți păstra datele private"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Pe următorul ecran, poți să te conectezi la un cont pe care să-l folosești cu spațiul privat"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Creează un cont dedicat pentru a împiedica datele să apară în afara spațiului privat, de exemplu:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotografii, fișiere, e-mailuri, agenda, evenimente din calendar și alte date sincronizate"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Istoricul descărcărilor de aplicații și recomandări"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Istoricul de navigare, marcaje și parole salvate"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Conținut sugerat care are legătură cu activitatea ta în aplicațiile din spațiul privat"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Poți să adaugi până la <xliff:g id="COUNT">%d</xliff:g> amprente"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ai adăugat numărul maxim de amprente digitale"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nu se mai pot adăuga amprente digitale"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Folosești <xliff:g id="NEW_APP">%s</xliff:g> pentru a gestiona conexiunile la rețea?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Solicitări recente ale locației"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Locație pt. profil de serviciu"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Permisiuni pentru locație"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Locația este dezactivată"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# din {total} aplicații are acces la locație}few{# din {total} aplicații au acces la locație}other{# din {total} de aplicații au acces la locație}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Resetează"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Alege tasta de modificare"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Alege o nouă tastă pentru <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Prestabilit"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Voce"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Viteza indicatorului"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Controler de joc"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Afișaj"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Culoare și mișcare"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contrastul culorilor"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Contrastul mai înalt scoate în evidență textul, butoanele și pictogramele. Alege contrastul care ți se pare cel mai potrivit."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Este posibil ca unele aplicații să nu accepte toate setările pentru contrastul culorilor și al textului"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ajustează felul în care arată culorile și textul peste culoarea de fundal a ecranului"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Previzualizează"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Elena, Andrei"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Acum 2 zile"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Urmărești?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Raport – călătoria de afaceri"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Pentru asistență suplimentară, contactează-ne pe \nmine sau pe Elena. Acest raport va fi"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Cheltuielile clientului"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Redu luminozitatea ecranului"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Comenzi pentru interacțiune"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Comenzi de sincronizare"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Netransparent"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text cu contrast ridicat"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Schimbă culoarea textului în negru sau alb. Astfel, se maximizează contrastul cu fundalul."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximizează contrastul textului"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Schimbă culoarea textului în negru sau alb pentru a crește contrastul dintre acesta și fundal."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Actualiz. automat mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Actualiz. mărirea ecran. la tranziția între aplic."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butonul de pornire închide"</string>
@@ -5124,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Anulează"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Prestabilit"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Mediu"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Ridicat"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Aplicația se poate deschide într-o singură fereastră"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 61d3724..f53faa0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Подключить прав. ухо"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Подключить левое ухо"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"На всех доступных слуховых аппаратах"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Другие настройки слухового аппарата"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Измените параметры телекатушки и настройки для нескольких устройств, например ярлыки"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"На этом устройстве"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудиовыход"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"О выводе звука"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Создание личного пространства…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Когда личное пространство заблокировано, уведомления из добавленных в него приложений скрываются"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"В параметрах личного пространства можно скрыть его и настроить автоматическую блокировку"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"В вашем личном пространстве уже установлены нужные приложения"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Не удалось создать личное пространство"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Повторить попытку"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Использовать способ, настроенный для экрана?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Приложения и уведомления"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Уведомления с конфиденциальными данными на заблокированном экране"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Показывать конфиденциальные данные, когда личное пространство разблокировано"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Создайте аккаунт Google для защиты своих данных"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"На следующем экране вы сможете войти в аккаунт, чтобы использовать его в личном пространстве."</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Создайте отдельный аккаунт, чтобы данные не появлялись вне вашего личного пространства:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синхронизированные фотографии, файлы, письма, контакты, мероприятия и другие данные."</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Рекомендации и история скачанных приложений."</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"История браузера, закладки и сохраненные пароли."</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Контент, рекомендованный с учетом ваших действий в приложениях из личного пространства."</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"ОК"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Максимальное количество отпечатков пальца, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Вы уже добавили максимальное количество отпечатков"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Больше нельзя добавить отпечатки пальцев"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Использовать приложение \"<xliff:g id="NEW_APP">%s</xliff:g>\" для управления сетевыми подключениями?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Последние запросы местоположения"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Геоданные для рабочего профиля"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Доступ приложений к геоданным"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Доступ к геоданным отключен"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# приложение из {total} имеет доступ к данным о местоположении}one{# приложение из {total} имеет доступ к данным о местоположении}few{# приложения из {total} имеют доступ к данным о местоположении}many{# приложений из {total} имеют доступ к данным о местоположении}other{# приложения из {total} имеют доступ к данным о местоположении}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Сбросить"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Выбор клавиши-модификатора"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Выберите новую клавишу для <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"По умолчанию"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Речь"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Скорость указателя"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Игровые контроллеры"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Общие"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Цвет и движение"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Цветовая контрастность"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Настройте контрастность. Чем она выше, тем заметнее текст, кнопки и значки."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Некоторые настройки контрастности цвета и текста поддерживаются не во всех приложениях."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Сделайте цвета и текст заметнее на экране"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Предпросмотр"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Елена, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 дня назад"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Есть вопросы?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Отчет о командировке"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Если у вас остались вопросы, напишите мне или Елене.\n Этот отчет будет"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Расходы клиента"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Уменьшение яркости экрана"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Элементы управления"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Настройка времени задержки"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Непрозрачная"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Контрастный текст"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Изменить цвет текста на черный или белый, чтобы сделать его максимально заметным"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Максимальная контрастность текста"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Измените цвет текста на черный или белый, чтобы сделать его заметнее."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Сохранять масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Сохранять масштаб при переходе между приложениями"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Кнопка питания завершает вызов"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Отмена"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контрастность"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандартная"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"По умолчанию"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Средняя"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Высокая"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Это приложение можно открыть только в одном окне."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index f117684..c68c1f0 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"දකුණු කණ යුගල කරන්න"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"වම් කණ යුගල කරන්න"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"පවතින සියලු ශ්‍රවණ උපාංග සඳහා"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"තවත් ශ්‍රවණ උපකරණ සැකසීම්"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"කෙටිමං, සහ ටෙලිකොයිල් පාලන වැනි හරස් උපාංග සැකසීම් වෙනස් කරන්න"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"මෙම උපාංගය සඳහා"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ශබ්ද ප්‍රතිදානය"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ශ්‍රව්‍ය ප්‍රතිදානය පිළිබඳව"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"පෞද්ගලික අවකාශය පිහිටුවමින්…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"පුද්ගලික අවකාශය අගුලු දමා ඇති විට ඒ වෙතින් එන දැනුම් දීම් සැඟවී ඇත"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"රහසිගත අවකාශය සැඟවීමට සහ ස්වයංක්‍රීය අගුලු දැමීම සැකසීමට රහසිගත අවකාශ සැකසීම් ගවේෂණය කරන්න"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"අවශ්‍ය වූ යෙදුම් දැනටමත් ඔබේ රහසිගත අවකාශයේ ස්ථාපනය කර ඇත"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"පුද්ගලික අවකාශයක් සැකසීමට නොහැකි විය"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"නැවත උත්සාහ කරන්න"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"පෞද්ගලික අවකාශය අගුළු හැරීමට තිර අගුල භාවිතා කරන්න ද?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"යෙදුම් සහ දැනුම්දීම්"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"අගුළු තිරය මත සංවේදී දැනුම්දීම්"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"රහසිගත අවකාශය අගුළු හරින ලද විට සංවේදී අන්තර්ගතය පෙන්වන්න"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"ඔබේ දත්ත පෞද්ගලිකව තබා ගැනීමට උදවු කිරීමට Google ගිණුමක් සාදන්න"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"මීළඟ තිරයේ ඔබට ඔබේ රහසිගත අවකාශය සමග භාවිත කිරීමට ගිණුමකට පුරනය විය හැක"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"රහසිගත අවකාශයෙන් පිටත දත්ත දිස්වීම නැවැත්වීමට උදවු කිරීමට කැපවූ ගිණුමක් සාදන්න, එනම්:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"සමමුහුර්ත කළ ඡායාරූප, ගොනු, ඉ-තැපැල්, සම්බන්ධතා, දින දර්ශන සිදුවීම් සහ වෙනත් දත්ත"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"යෙදුම් බාගැනීම් ඉතිහාසය සහ නිර්දේශ"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"බ්‍රවුස් කිරීමේ ඉතිහාසය, පිටුසන් සහ සුරකින ලද මුරපද"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"රහසිගත අවකාශ යෙදුම්වල ඔබේ ක්‍රියාකාරකම්වලට අදාළ යෝජිත අන්තර්ගතය"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"තේරුණා"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"ඔබට ඇඟිලි සලකුණු <xliff:g id="COUNT">%d</xliff:g> දක්වා එකතු කළ හැකිය"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"ඔබ ඇඟිලි සලකුණු උපරිම සංඛ්‍යාව එක් කර ඇත"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"තවත් ඇඟිලි සලකුණු එක් කළ නොහැකිය"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ඔබගේ ජාල සම්බන්ධතා කළමනාකරණය කිරීමට <xliff:g id="NEW_APP">%s</xliff:g> භාවිතා කරන්නද?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"මෑත කාලීන ස්ථාන ඉල්ලීම්"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"කාර්යාල පැතිකඩ සඳහා ස්ථානය"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"යෙදුම් ස්ථාන අවසර"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ස්ථානය ක්‍රියාවිරහිතයි"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{යෙදුම් {total}න් #කට ස්ථානයට ප්‍රවේශය ඇත}one{යෙදුම් {total}න් #කට ස්ථානයට ප්‍රවේශය ඇත}other{යෙදුම් {total}න් #කට ස්ථානයට ප්‍රවේශය ඇත}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"යළි සකසන්න"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"සංස්කාරක යතුර තෝරා ගන්න"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> සඳහා නව යතුරක් තෝරා ගන්න:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"පෙරනිමි"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"කථනය"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"දර්ශක වේගය"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"ක්‍රීඩා පාලකය"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"පොදු"</string>
     <string name="display_category_title" msgid="6638191682294461408">"සංදර්ශකය"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"වර්ණය සහ චලනය"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"වර්ණ අසමානතාව"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"ඉහළ අසමානතාව පෙළ, බොත්තම් සහ අයිකන වඩාත් කැපී පෙනෙන ලෙස සකසයි. ඔබට වඩාත්ම හොඳ යැයි හැඟෙන අසමානතාව තෝරන්න."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"සමහර යෙදුම් සියලු වර්ණ සහ පෙළ අසමානතා සැකසීම් සඳහා සහාය නොදක්වයි"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"ඔබේ තිරයේ පසුබිම් වර්ණයට එරෙහිව වර්ණ සහ පෙළ පෙනෙන ආකාරය සකසන්න"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"පෙරදසුන"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"හෙලන්, ඇඩම්"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"දින 2කට පෙර"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"පසු විපරම් කරන්න ද?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"ව්‍යාපාරික සංචාර වාර්තාව"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"වැඩිදුර සහාය සඳහා, \nමා හෝ හෙලන් වෙත සම්බන්ධ වන්න. මෙම වාර්තාව වනු ඇත්තේ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"සේවාලාභීයාගේ වියදම්"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"තිරය අඳුරු කිරීම ක්‍රියාත්මක කිරීම"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"අන්තර්ක්‍රියා පාලන"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"කාල නියාමන පාලන"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"පාරදෘශ්‍ය නොවන"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ඉහළම වෙනසක් ඇති පෙළ"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"පෙළ වර්ණය කළු හෝ සුදු ලෙස වෙනස් කරන්න. පසුබිම සමඟ වෙනස උපරිම කරයි."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"පෙළ අසමානතාව උපරිම කරන්න"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"පසුබිම සමග අසමානතාව වැඩි කිරීමට පෙළ වර්ණය කළු හෝ සුදු ලෙස වෙනස් කරන්න."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"තිර විශාලනය ස්වයංක්‍රීයව යාවත්කාලීන කරන්න"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"යෙදුම් සංක්‍රමණයේදී තිර විශාලනය යාවත්කාලීන කරන්න"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"බල බොත්තම ඇමතුම අවසන් කරයි"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"අවලංගු කරන්න"</string>
     <string name="contrast_title" msgid="6885768151336508075">"අසමානතාව"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"සම්මත"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"පෙරනිමි"</string>
     <string name="contrast_medium" msgid="384414510709285811">"මධ්‍යම"</string>
     <string name="contrast_high" msgid="3988567609694797696">"ඉහළ"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"මෙම යෙදුම විවෘත කළ හැක්කේ 1 කවුළුවක පමණයි"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2727ed7..90ee93c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Spárovať pravé ucho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Spárovať ľavé ucho"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Pre všetky dostupné načúvadlá"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Ďalšie nastavenia načúvacieho zariadenia"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Zmeňte nastavenia pre viacero zariadení, ako sú skratky a ovládanie cievky telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Pre toto zariadenie"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Zvukový výstup"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Zvukový výstup"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Nastavuje sa súkromný priestor…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Keď je súkromný priestor uzamknutý, upozornenia z aplikácií, ktoré sú v ňom, sú skryté"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Preskúmajte nastavenia súkromného priestoru umožňujúce jeho skrytie alebo nastavenie automatického zamykania"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Povinné aplikácie sú už nainštalované vo vašom súkromnom priestore"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Súkromný priestor sa nepodarilo nastaviť"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Skúsiť znova"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Odomykať súkromný priestor zámkou obrazovky?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikácie a upozornenia"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Citlivé upozornenia na uzamknutej obrazovke"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Zobrazujte citlivý obsah, keď je súkromný priestor odomknutý"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Vytvorte účet Google a pomôžte tak uchovať svoje údaje v súkromí"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na ďalšej obrazovke sa budete môcť prihlásiť do účtu, aby ste mohli začať používať súkromný priestor"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Vytvorte vyhradený účet a pomôžte tak zaistiť, aby sa údaje nezobrazovali mimo súkromného priestoru, napríklad:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synchronizované fotky, súbory, e‑maily, kontakty, udalosti v kalendári a ďalšie údaje"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"História sťahovania aplikácií a odporúčania"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"História prehliadania, záložky a uložené heslá"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Navrhovaný obsah súvisiaci s vašou aktivitou v aplikáciách v súkromnom priestore"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Dobre"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Maximálny počet odtlačkov, ktoré môžete pridať: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Pridali ste maximálny počet odtlačkov prstov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nie je možné pridať ďalšie odtlačky prstov"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Chcete spravovať sieťové pripojenia pomocou aplikácie <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedávne žiadosti o polohu"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Poloha pre pracovný profil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Prístup aplikácií k polohe"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Poloha je vypnutá"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Prístup k polohe má # z {total} aplikácií}few{Prístup k polohe majú # z {total} aplikácií}many{# of {total} apps have access to location}other{Prístup k polohe má # z {total} aplikácií}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Resetovať"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Vyberte modifikačný kláves"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Vyberte pre <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> nový kláves:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Predvolené"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Reč"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Rýchlosť kurzora"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Herné ovládače"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Všeobecné"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazenie"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Farba a pohyb"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Farebný kontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Zvýšením kontrastu zvýrazníte text, tlačidlá a ikony. Vyberte úroveň kontrastu, ktorá vám najviac vyhovuje."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Niektoré aplikácie nemusia podporovať všetky nastavenia kontrastu farieb a textu"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Upravte, vzhľad farieb a textu na farbe pozadia obrazovky"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Ukážka"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helena, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Pred 2 dňami"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Nadviazať?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Hlásenie o obchodnej ceste"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Ak budete potrebovať ďalšiu pomoc, obráťte sa na \nmňa alebo Helenu. Toto hlásenie bude"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Výdavky klienta"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Stmavenie obrazovky"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Doplnkové ovládanie"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Ovládanie časovania"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Nepriehľadné"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text s vysokým kontrastom"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Zmeniť farbu textu na čiernu alebo bielu, čim sa maximalizuje kontrast s pozadím"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximalizujte kontrast textu"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Zmeňte farbu textu na čiernu alebo bielu, aby lepšie vynikol na pozadí."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Auto. aktualiz. priblíž. obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Aktualizovať priblíž. obrazov. pri prechodoch apl."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Ukončiť hovor vypínačom"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Zrušiť"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Štandardný"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Predvolené"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Stredný"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Vysoký"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Táto aplikácia môže byť otvorená iba v jednom okne"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3fad070..2f372bd 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Seznani desno uho"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Seznani levo uho"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Za vse razpoložljive slušne aparate"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Več nastavitev za slušne pripomočke"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Spremenite nastavitve za zunanje naprave, kot so kontrolniki za bližnjice in teletuljave"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Za to napravo"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Zvočni izhod"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O zvočnem izhodu"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Nastavljanje zasebnega prostora …"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Obvestila aplikacij v zasebnem prostoru so skrita, kadar je zasebni prostor zaklenjen"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Raziščite nastavitve zasebnega prostora, če želite skriti zasebni prostor in nastaviti samodejno zaklepanje"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Obvezne aplikacije so že nameščene v zasebnem prostoru"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Zasebnega prostora ni bilo mogoče nastaviti"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Poskusi znova"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Želite uporabiti zaklepanje zaslona za odklepanje zasebnega prostora?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikacije in obvestila"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Občutljiva obvestila na zaklenjenem zaslonu"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Prikaz občutljive vsebine, ko je zasebni prostor odklenjen"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Ustvarite račun Google, da poskrbite za zasebnost svojih podatkov"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Na naslednjem zaslonu se lahko prijavite v račun, ki ga boste uporabljali z zasebnim prostorom"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Ustvarite namenski račun, da se podatki, kot so naslednji, ne bodo prikazovali zunaj zasebnega prostora:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinhronizirane fotografije, datoteke, e-poštna sporočila, stiki, dogodki na koledarju in drugi podatki"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Zgodovina in priporočila prenosov aplikacij"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Zgodovina brskanja, zaznamki in shranjena gesla"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Predlagana vsebina v zvezi z vašo dejavnostjo v aplikacijah v zasebnem prostoru"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Razumem"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Dodate lahko do toliko prstnih odtisov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Dodali ste največje dovoljeno število prstnih odtisov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Prstnih odtisov ni več mogoče dodati"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Želite za upravljanje omrežnih povezav uporabljati aplikacijo <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nedavne zahteve za lokacijo"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za delovni profil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Dovoljenja aplikacij za lokacijo"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Zaznavanje lokacije je izklopljeno."</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Dostop do lokacije ima # aplikacija od {total}.}one{Dostop do lokacije ima # aplikacija od {total}.}two{Dostop do lokacije imata # aplikaciji od {total}.}few{Dostop do lokacije imajo # aplikacije od {total}.}other{Dostop do lokacije ima # aplikacij od {total}.}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Ponastavi"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Izbira modifikatorske tipke"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Izberite novo tipko za »<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>«:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Privzeto"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Hitrost kazalca"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Krmilnik za igre"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Splošno"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Barva in gibanje"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Barvni kontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Z višjim kontrastom bodo besedilo, gumbi in ikone bolj izstopali. Izberite kontrast, ki se vam zdi najboljši."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Nekatere aplikacije morda ne podpirajo vseh nastavitev kontrasta barv in besedila"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Prilagodite videz barv in besedila glede na barvo ozadja zaslona"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Predogled"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Pred 2 dnevoma"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Imate podvprašanje?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Poročilo o službenem potovanju"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Za dodatno pomoč se obrnite \nname ali na Helen. To poročilo bo"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Stroški stranke"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Potemnitev zaslona"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrolniki za interakcije"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Časovni kontrolniki"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Neprosojno"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Visokokontrastno besedilo"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Spremenite barvo besedila v črno ali belo. Poveča kontrast z ozadjem."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Povečanje kontrasta besedila"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Spremenite barvo besedila v črno ali belo, da povečate kontrast z ozadjem."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Samodejno posodobi povečavo zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Posodabljanje povečave zaslona pri prehodih aplik."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Gumb za vklop konča klic"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Prekliči"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standardni"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Privzeto"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Srednji"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Visok"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"To aplikacijo je mogoče odpreti samo v enem oknu"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index c1b2818..7e6213e 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Çifto anën e djathtë"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Çifto anën e majtë"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Për të gjitha pajisjet e dëgjimit që ofrohen"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Cilësime të tjera të pajisjes ndihmëse për dëgjimin"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Ndrysho cilësimet e pajisjeve të ndërlidhura si shkurtorja dhe kontrollet e telebobinës"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Për këtë pajisje"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Dalja e audios"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Rreth daljes së audios"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Hapësira private po konfigurohet…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Njoftimet nga aplikacionet e hapësirëa private janë të fshehura kur ajo është e kyçur"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Eksploro cilësimet e hapësirës private për ta fshehur hapësirën private dhe për të konfiguruar kyçjen automatike"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Aplikacionet e kërkuara janë instaluar tashmë në hapësirën tënde private"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Hapësira private nuk mund të konfigurohej"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Provo përsëri"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Të përdoret kyçja e ekranit për të shkyçur hapësirën private?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Aplikacionet dhe njoftimet"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Njoftimet delikate në ekranin e kyçjes"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Shfaq përmbajtjet delikate kur hapësira private është e shkyçur"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Krijo një \"Llogari të Google\" për të ndihmuar t\'i mbash private të dhënat e tua"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Në ekranin tjetër mund të identifikohesh në një llogari për ta përdorur me hapësirën tënde private"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Krijo një llogari të posaçme për të ndihmuar në ndalimin e shfaqjes së të dhënave jashtë hapësirës private, si p.sh.:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Fotografitë, skedarët, email-et, kontaktet, ngjarjet e kalendarit dhe të dhëna të tjera të sinkronizuara"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Historiku i shkarkimit të aplikacioneve dhe rekomandimet"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historiku i shfletimit, faqeshënuesit dhe fjalëkalimet e ruajtura"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Përmbajtjet e sugjeruara në lidhje me aktivitetin tënd në aplikacionet e hapësirës private"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"E kuptova"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> gjurmë gishtash"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ke shtuar numrin maksimal të gjurmëve të gishtave"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Nuk mund të shtohen gjurmë të tjera të gishtave"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Të përdoret <xliff:g id="NEW_APP">%s</xliff:g> për të menaxhuar lidhjet e rrjetit?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Kërkesat e vendndodhjeve të fundit"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Vend. për profilin e punës"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Lejet e vendndodhjes për aplikacionet"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Vendndodhja është joaktive"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# nga {total} aplikacione ka qasje te vendndodhja}other{# nga {total} aplikacione kanë qasje te vendndodhja}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Rivendos"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Zgjidh tastin modifikues"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Zgjidh një çelës të ri për <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"E parazgjedhur"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Ligjërimi"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Shpejtësia e treguesit"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Kontrolluesi i lojës"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Të përgjithshme"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekrani"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Ngjyra dhe lëvizja"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Kontrasti i ngjyrës"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Kontrasti më i lartë bën që teksti, butonat dhe ikonat të dallohen më shumë. Zgjidh kontrastin që të duket më mirë."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Disa aplikacione mund të mos i mbështesin të gjitha cilësimet e kontrastit të tekstit dhe të ngjyrave"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Rregullo se si duken ngjyrat dhe testi në ngjyrën e sfondit të ekranit"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Pamja paraprake"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Elena, Adi"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ditë më parë"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Do ta ndjekësh?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Raporti i udhëtimit të punës"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Për ndihmë të mëtejshme, kontakto me \nmua ose Elenën. Ky raport do të jetë"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Shpenzimet e klientit"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bëj ekranin më të errët"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Kontrollet e ndërveprimeve"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Kontrollet në lidhje me kohën"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Jotransparente"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Tekst me kontrast të lartë"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Ndrysho ngjyrën e tekstit në të zezë ose në të bardhë. Maksimizon kontrastin me sfondin."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maksimizo kontrastin e tekstit"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Ndrysho ngjyrën e tekstit në të zezë ose të bardhë për të rritur kontrstin me sfondin."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Përditëso auto. zmadhimin e ekranit"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Përditëso zmadhimin e ekranit në kalimet e apl."</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butoni i energjisë mbyll telefonatën"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Anulo"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrasti"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Parazgjedhja"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Mesatar"</string>
     <string name="contrast_high" msgid="3988567609694797696">"I lartë"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ky aplikacion mund të hapet vetëm në 1 dritare"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9f04b5f..f0218f2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Упари десно уво"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Упари лево уво"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"За све доступне слушне апарате"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Још подешавања слушног апарата"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Промените подешавања на више уређаја, на пример контроле пречица и телекоила"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"За овај уређај"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио излаз"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"О аудио излазу"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Подешава се приватни простор…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Обавештења из апликација у приватном простору су скривена кад је он закључан"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Истражите подешавања приватног простора да бисте га сакрили и подесили аутоматско закључавање"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Обавезне апликације су већ инсталиране у приватном простору"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Подешавање приватног простора није успело"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Пробај поново"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Откључати приватни простор откључавањем екрана?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Апликације и обавештења"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Осетљива обавештења на закључаном екрану"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Приказујте осетљив садржај када је приватни простор откључан"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Отворите наменски Google налог да бисте заштитили приватност података"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"На следећем екрану можете да се пријавите на налог који ћете користити са приватним простором"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Отворите наменски налог како бисте спречили да се изван приватног простора приказују подаци, на пример:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синхронизоване слике, фајлови, имејлови, контакти, догађаји у календару и други подаци"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Историја преузимања апликације и препоруке"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Историја прегледања, обележивачи и сачуване лозинке"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Предложен садржај повезан са активностима у апликацијама из приватног простора"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Важи"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Можете да их додате до <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Додали сте максималан број отисака прстију"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Не можете да додате још отисака прстију"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Желите ли да користите апликацију <xliff:g id="NEW_APP">%s</xliff:g> за управљање мрежним везама?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Недавни захтеви за локацију"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Локација за пословни профил"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Дозволе за локацију апликације"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Локација је искључена"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Приступ локацији има # апликација од {total}}one{Приступ локацији има # апликација од {total}}few{Приступ локацији имају # апликације од {total}}other{Приступ локацији има # апликација од {total}}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Ресетуј"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Одаберите модификујући тастер"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Одаберите нови тастер за <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Подразумевано"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Говор"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Брзина показивача"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Контролер за игре"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Опште"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Боја и покрет"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Контраст боја"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Већи контраст истиче текст, дугмад и иконе. Изаберите контраст који вам изгледа најбоље."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Неке апликације можда не подржавају сва подешавања за контраст боја и текста"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Прилагодите изглед боја и текста у односу на боју позадине екрана"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Преглед"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Хелена, Адам"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Пре 2 дана"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Додатни упит?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Извештај о пословном путу"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Да бисте добили додатну помоћ, обратите се \nмени или Хелени. Овај извештај ће бити"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Трошкови клијента"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затамњује екран"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Контроле интеракције"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Контроле временских одредница"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Није прозирно"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Текст високог контраста"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Промените боју текста у црну или белу. Максимално увећава контраст са позадином."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Максимално увећајте контраст текста"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Промените боју текста у црну или белу да бисте повећали контраст са позадином."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Аутоматски ажурирај увелич. екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Ажурира увеличавање екрана при прелазу апликација"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Дугме за укључивање прекида позив"</string>
@@ -5124,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Откажи"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контраст"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандардно"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Подразумевано"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Средње"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Високо"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ова апликација може да се отвори само у једном прозору"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cb4157f..ae8352b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Parkoppla höger"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Parkoppla vänster"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"För alla tillgängliga hörapparater"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Fler inställningar för hörhjälpmedel"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Ändra inställningar för flera enheter, som kontroller för kortkommandon och telespole"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"För den här enheten"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Ljudutgång"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Om ljudutgång"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Ställer in privat rum …"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Aviseringar från appar i ett privat område döljs när det är låst"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Utforska inställningar för privat område om du vill dölja privat område och konfigurera automatiskt lås"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Appar som krävs är redan installerade i ditt privata område"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Det gick inte att ställa in privat område"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Försök igen"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Vill du låsa upp privat rum med skärmlåset?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Appar och aviseringar"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Känsliga aviseringar på låsskärmen"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Visa känsligt innehåll när privat område är olåst"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Skapa ett Google-konto för att hålla din data privat:"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"På nästa skärm kan du logga in på kontot som du vill använda med ditt privata område"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Skapa ett dedikerat konto för att förhindra att data visas utanför det privata området, till exempel:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Synkroniserade foton, filer, e-post, kontakter, kalenderhändelser och annan data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Rekommendationer och nedladdningshistorik för appar"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Webbhistorik, bokmärken och sparade lösenord"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Föreslaget innehåll som rör din aktivitet i appar i det privat området"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> fingeravtryck"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Du har lagt till det högsta tillåtna antalet fingeravtryck"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Det går inte att lägga till fler fingeravtryck"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Vill du hantera nätverksanslutningarna med <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Nya platsförfrågningar"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Plats för jobbprofil"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Appars platsbehörighet"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Plats har inaktiverats"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# av {total} appar har platsåtkomst}other{# av {total} appar har platsåtkomst}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Återställ"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Välj specialtangent"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Välj en ny tangent för <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standard"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Tal"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Markörens hastighet"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Spelkontroller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Allmänt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skärm"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Färg och rörelse"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Färgkontrast"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Högre kontrast gör att text, knappar och ikoner syns bättre. Välj kontrasten som ser bäst ut för dig."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Vissa appar kanske inte har stöd för alla inställningar för färg- och textkontrast"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Justera hur färger och text ser ut mot skärmens bakgrundsfärg"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Förhandsgranska"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 dagar sedan"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Följdfråga?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Rapport om affärsresa"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Om du behöver mer hjälp kontaktar du \nmig eller Helen. Den här rapporten kommer att vara"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Klientutgifter"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gör skärmen mörkare"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionsinställningar"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Inställningar för tidsgräns"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Inte genomskinlig"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text med hög kontrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Ändra textfärgen till svart eller vit. Det ger bäst kontrast mot bakgrunden."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Maximera textkontrasten"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Ändra textfärgen till svart eller vit för att öka kontrasten mot bakgrunden."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Uppdatera skärmförstoring automatiskt"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Uppdatera skärmförstoring på appövergångar"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Avsluta samtal med av/på-knapp"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Avbryt"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Standard"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Medelhög"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Hög"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Denna app kan bara vara öppen i ett fönster"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b7837d1..b02aa6f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Unganisha kisaidizi cha kulia"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Unganisha kisaidizi cha kushoto"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Kwa vifaa vyote vya kusikia vinavyopatikana"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Mipangilio zaidi ya vifaa vya kusikilizia"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Badilisha mipangilio ya kifaa kilichounganishwa kwingine kama vile vidhibiti vya koili ya shaba na njia ya mkato"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Katika kifaa hiki"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Vifaa vya kutoa sauti"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Kuhusu vifaa vya kutoa sauti"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Inaweka mipangilio ya sehemu ya faragha…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Arifa kutoka programu za sehemu ya faragha hufichwa ukiwa umeifunga"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Gundua mipangilio ya sehemu ya faragha ili ufiche sehemu ya faragha na uweke mipangilio ya kufunga skrini kiotomatiki"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Programu zinazotakikana tayari zimewekwa katika sehemu yako ya faragha"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Imeshindwa kuweka mipangilio ya sehemu ya faragha"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Jaribu Tena"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Ungependa kutumia kipengele cha kufunga skrini kufungua sehemu ya faragha?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Programu na arifa"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Arifa nyeti kwenye skrini iliyofungwa"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Onyesha maudhui nyeti wakati sehemu ya faragha imefunguliwa"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Fungua Akaunti ya Google ili usaidie kudumisha faragha ya data yako"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Kwenye skrini inayofuata, unaweza kuingia katika akaunti ambako utatumia sehemu yako ya faragha"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Fungua akaunti maalum ili usaidie kuzuia data isionekane nje ya sehemu ya faragha, kama vile:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Picha, faili, barua pepe, anwani, matukio ya kalenda na data nyingine iliyosawazishwa"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Mapendekezo na historia ya upakuaji wa programu"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Historia ya kuvinjari, alamisho na manenosiri uliyohifadhi"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Maudhui yanayopendekezwa yanayohusu shughuli zako kwenye programu za sehemu ya faragha"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Nimeelewa"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Unaweza kuongeza hadi alama za vidole <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Umeongeza idadi ya juu inayoruhusiwa ya alama za kidole"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Haiwezi kuongeza alama zaidi za kidole"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> kusimamia miunganisho yako ya mtandao?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Maombi ya hivi karibuni ya kutambua mahali"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Wasifu wa kazi kutambua mahali"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Ruhusa za programu kufikia mahali"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Utambuzi wa mahali umezimwa"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{Programu # kati ya {total} ina idhini ya kufikia data ya mahali}other{Programu # kati ya {total} zina idhini ya kufikia data ya mahali}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Weka upya"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Chagua kitufe cha kurekebisha"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Chagua kitufe kipya cha kurekebisha cha <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Chaguomsingi"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Kutamka"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Kasi ya kiashiria"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Kidhibiti cha Mchezo"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Jumla"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skrini"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Rangi na picha katika mwendo"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Utofautishaji wa rangi"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Utofautishaji wa juu hufanya maandishi, vitufe na aikoni kuonekana vizuri zaidi. Chagua utofautishaji unaokufaa zaidi."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Huenda programu nyingine zisitumie mipangilio yote ya utofautishaji wa maandishi na rangi"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Rekebisha jinsi rangi na maandishi yanavyoonekana kwenye rangi ya mandharinyuma ya skrini yako"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Toleo la kukagua"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Siku 2 zilizopita"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Utafuatilia?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Ripoti ya safari ya kikazi"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Kwa usaidizi zaidi, tafadhali wasiliana \nnami au Helen. Ripoti hii"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Gharama za Mteja"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Geuza skrini iwe nyeusi"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Vidhibiti vya mawasiliano"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Vidhibiti vya muda"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Kutopenyeza mwangaza"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Maandishi yenye utofautishaji bora"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Badilisha rangi ya maandishi kuwa nyeusi au nyeupe. Ongeza utofautishaji ukitumia mandharinyuma."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Imarisha utofautishaji wa matini"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Badilisha rangi ya maandishi iwe nyeusi au nyeupe ili uongeze utofautishaji kwenye mandharinyuma."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Sasisha otomatiki ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Sasisha ukuzaji wa skrini kwenye mipito ya  programu"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kata simu kwa kitufe cha kuwasha/kuzima"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Ghairi"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Utofautishaji"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Kawaida"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Chaguomsingi"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Wastani"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Juu"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Programu hii inaweza kufunguliwa katika dirisha 1 pekee"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index d96c8e2..9c978d5 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"வலதுபுற கருவியை இணை"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"இடதுபுற கருவியை இணை"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"கிடைக்கும் செவித்துணைக் கருவிகள் அனைத்திற்கும்"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"கூடுதல் செவித்துணைக் கருவி அமைப்புகள்"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"ஷார்ட்கட், டெலிகாயில் கட்டுப்பாடுகள் போன்ற பன்முகச் சாதன அமைப்புகளை மாற்றலாம்"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"இந்தச் சாதனத்திற்கு"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ஆடியோ வெளியீடு"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ஆடியோ அவுட்புட் - அறிமுகம்"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"தனிப்பட்ட இடத்தை அமைக்கிறது…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ரகசிய இடத்திற்கான ஆப்ஸ் பூட்டப்பட்டிருக்கும்போது அதிலிருந்து வரும் அறிவிப்புகள் மறைக்கப்படும்"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"ரகசிய இடத்தை மறைக்கவும் தானாகப் பூட்டும் அம்சத்தை அமைக்கவும் ரகசிய இட அமைப்புகளுக்குச் செல்லுங்கள்"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"உங்கள் ரகசிய இடத்தில் ஏற்கெனவே தேவையான ஆப்ஸ் நிறுவப்பட்டுள்ளன"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"ரகசிய இடத்தை அமைக்க முடியவில்லை"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"மீண்டும் முயல்க"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"திரைப்பூட்டால் தனிப்பட்ட இடத்தைத் திறக்க வேண்டுமா?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"ஆப்ஸும் அறிவிப்புகளும்"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"பூட்டுத் திரையில், பாதுகாக்கவேண்டிய அறிவிப்புகள்"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"ரகசிய இடம் அன்லாக் செய்யப்படும்போது, பாதுகாக்க வேண்டிய உள்ளடக்கத்தைக் காட்டும்"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"உங்கள் தரவை தனிப்பட்டதாக வைத்திருக்க உதவ ஒரு Google கணக்கை உருவாக்குங்கள்"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"அடுத்த திரையில் உங்கள் ரகசிய இடத்தைப் பயன்படுத்த, கணக்கில் உள்நுழையலாம்"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"ரகசிய இடத்திற்கு வெளியே தரவு தோன்றுவதைத் தடுக்க உதவ ஒரு பிரத்தியேகக் கணக்கை உருவாக்குங்கள்:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"ஒத்திசைக்கப்பட்ட படங்கள், ஃபைல், மின்னஞ்சல், தொடர்பு, கேலெண்டர் நிகழ்வு மற்றும் பிற தரவு"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"இதுவரை பதிவிறக்கிய ஆப்ஸும் பரிந்துரைகளும்"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"இதுவரை இணையத்தில் பார்த்தவை, புக்மார்க் &amp; சேமித்த கடவுச்சொல்"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ரகசிய இடம் ஆப்ஸில் உங்கள் செயல்பாடு தொடர்பாகப் பரிந்துரைக்கப்படும் உள்ளடக்கம்"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"சரி"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> கைரேகைகள் வரை சேர்க்கலாம்"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"அனுமதிக்கப்படும் அதிகபட்சக் கைரேகைகளைச் சேர்த்துவிட்டீர்கள்"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"மேலும் கைரேகைகளைச் சேர்க்க முடியவில்லை"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"நெட்வொர்க் இணைப்புகளை நிர்வகிக்க <xliff:g id="NEW_APP">%s</xliff:g>ஐப் பயன்படுத்தவா?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"சமீபத்திய இருப்பிடக் கோரிக்கைகள்"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"பணி சுயவிவரத்திற்கான இருப்பிடம்"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ஆப்ஸுக்கான இருப்பிட அனுமதிகள்"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"இருப்பிடம் ஆஃப் செய்யப்பட்டுள்ளது"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} ஆப்ஸில் # ஆப்ஸ் இருப்பிட அணுகலைப் பெற்றுள்ளது}other{{total} ஆப்ஸில் # ஆப்ஸ் இருப்பிட அணுகலைப் பெற்றுள்ளன}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ரீசெட்"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"மாற்றி விசையைத் தேர்வுசெய்தல்"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>க்கு புதிய விசையை தேர்வுசெய்யலாம்:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"இயல்பு"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"பேச்சு"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"குறிப்பான் வேகம்"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"கேம் கன்ட்ரோலர்"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"பொது"</string>
     <string name="display_category_title" msgid="6638191682294461408">"திரை அமைப்பு"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"கலர் மற்றும் மோஷன்"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"வண்ண வேறுபாடு"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"அதிக வண்ண மாறுபாடு வார்த்தை, பட்டன்கள், ஐகான்கள் ஆகியவற்றை மேலும் தனித்துக் காட்டுகிறது. உங்களுக்கு ஏற்ற வண்ண மாறுபாட்டைத் தேர்ந்தெடுங்கள்."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"சில வண்ணம் மற்றும் வார்த்தை மாறுபாடு அமைப்புகளைச் சில ஆப்ஸ் ஆதரிக்கலாம் இருக்கலாம்"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"உங்கள் திரையின் பின்னணி வண்ணத்திற்கு ஏற்ப வார்த்தையும் வண்ணங்களும் எப்படித் தோன்றும் என்பதைச் சரிசெய்யலாம்"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"மாதிரிக்காட்சி"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"ஹெலன், ஆடம்"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 நாளுக்கு முன்"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"பின்தொடரவா?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"பிசினஸ் பயண அறிக்கை"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"கூடுதல் உதவிக்கு, \nஎன்னை அல்லது ஹெலனைத் தொடர்புகொள்ளுங்கள். இந்த அறிக்கை"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"கிளையண்ட் செலவுகள்"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"திரையின் ஒளிர்வைக் குறைத்தல்"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"நேரக் கட்டுப்பாடுகள்"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"தெளிவுத்திறன் அற்றது"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"மிகை ஒளிமாற்ற எழுத்து"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"வார்த்தையின் வண்ணத்தைக் கருப்பு/வெள்ளைக்கு மாற்றும். பின்னணியில் ஒளி மாறுபாட்டை அதிகரிக்கும்."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"வார்த்தை நிற மாறுபாட்டை அதிகரித்தல்"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"பின்னணியுடன் மாறுபாட்டை அதிகரிக்க, வார்த்தையின் வண்ணத்தைக் கருப்பு/வெள்ளைக்கு மாற்றலாம்."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"திரை உருப்பெருக்கத்தைத் தானாகப் புதுப்பி"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ஆப்ஸ் மாற்றங்களில் திரை உருப்பெருக்கத்தைப் புதுப்பிக்கவும்"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"பவர் பட்டன் மூலம் அழைப்பை நிறுத்து"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ரத்துசெய்"</string>
     <string name="contrast_title" msgid="6885768151336508075">"ஒளி மாறுபாடு"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"இயல்புநிலை"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"இயல்பு"</string>
     <string name="contrast_medium" msgid="384414510709285811">"நடுத்தரம்"</string>
     <string name="contrast_high" msgid="3988567609694797696">"அதிகம்"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"இந்த ஆப்ஸை 1 சாளரத்தில் மட்டுமே திறக்க முடியும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3b92d40..43c52e4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"కుడి చెవి పెయిర్"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"ఎడమ చెవి పెయిర్ చేయి"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"అందుబాటులో ఉన్న అన్ని వినికిడి పరికరాల కోసం"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"మరిన్ని వినికిడి పరికర సెట్టింగ్‌లు"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"షార్ట్‌కట్, టెలికాయిల్ కంట్రోల్స్ వంటి క్రాస్-డివైజ్ సెట్టింగ్‌లను మార్చండి"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"ఈ పరికరం కోసం"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ఆడియో అవుట్‌పుట్"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ఆడియో అవుట్‌పుట్ గురించి"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"ప్రైవేట్ స్పేస్ సెటప్ ప్రోగ్రెస్‌లో ఉంది…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"ప్రైవేట్ స్పేస్ లాక్ అయ్యి ఉన్నప్పుడు, అందులోని యాప్‌ల నుండి నోటిఫికేషన్‌లు రావు"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"ప్రైవేట్ స్పేస్‌ను దాచడానికి, ఆటోమేటిక్ లాకింగ్‌ను సెటప్ చేయడానికి ప్రైవేట్ స్పేస్ సెట్టింగ్‌లను అన్వేషించండి"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"అవసరమైన యాప్‌లు ఇప్పటికే మీ ప్రైవేట్ స్పేస్‌లో ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"ప్రైవేట్ స్పేస్‌ను సెటప్ చేయడం సాధ్యపడలేదు"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"మళ్లీ ట్రై చేయండి"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ప్రైవేట్ స్పేస్ అన్లాకింగ్‌కు స్క్రీన్లాక్ వాడాలా?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"యాప్‌లు, నోటిఫికేషన్‌లు"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"లాక్ స్క్రీన్‌లో గోప్యమైన నోటిఫికేషన్‌లు"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"ప్రైవేట్ స్పేస్ అన్‌లాక్ చేయబడినప్పుడు సున్నితమైన కంటెంట్‌ను చూడండి"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"మీ డేటాను ప్రైవేట్‌గా ఉంచడంలో సహాయపడటానికి Google ఖాతాను క్రియేట్ చేయండి"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"తర్వాత స్క్రీన్‌లో మీరు మీ ప్రైవేట్ స్పేస్‌తో ఉపయోగించడానికి ఖాతాకు సైన్ ఇన్ చేయవచ్చు"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"ప్రైవేట్ స్పేస్ వెలుపల డేటా కనిపించకుండా చేయడంలో సహాయపడటానికి ప్రత్యేక ఖాతాను క్రియేట్ చేయండి, ఉదాహరణకు:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"సింక్ చేయబడిన ఫోటోలు, ఫైల్స్, ఈమెయిల్స్, కాంటాక్ట్‌లు, క్యాలెండర్ ఈవెంట్‌లు, ఇతర డేటా"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"యాప్ డౌన్‌లోడ్ హిస్టరీ, సిఫార్సులు"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"బ్రౌజింగ్ హిస్టరీ, బుక్‌మార్క్‌లు, సేవ్ చేసిన పాస్‌వర్డ్‌లు"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"ప్రైవేట్ స్పేస్ యాప్‌లలో మీ యాక్టివిటీకి సంబంధించి సూచించబడిన కంటెంట్"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"సరే"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"మీరు గరిష్ఠంగా <xliff:g id="COUNT">%d</xliff:g> వేలిముద్రలను జోడించవచ్చు"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"మీరు గరిష్ట సంఖ్యలో వేలిముద్రలను జోడించారు"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"మరిన్ని వేలిముద్రలను జోడించడం సాధ్యపడదు"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"మీ నెట్‌వర్క్ కనెక్షన్‌లను మేనేజ్ చేయడానికి <xliff:g id="NEW_APP">%s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"లొకేషన్‌ను ఇటీవల రిక్వెస్ట్ చేసినవి"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ఆఫీస్ ప్రొఫైల్ కోసం లొకేషన్"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"యాప్ లొకేషన్ అనుమతులు"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"లొకేష‌న్ ఆఫ్‌లో ఉంది"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} యాప్‌లలో # యాప్‌నకు లొకేషన్‌కు యాక్సెస్ ఉంది}other{{total} యాప్‌లలో # యాప్‌లకు లొకేషన్‌కు యాక్సెస్ ఉంది}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"రీసెట్ చేయండి"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"మోడిఫయర్ కీని ఎంచుకోండి"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> కొసం కొత్త కీని ఎంచుకోండి:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ఆటోమేటిక్"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"స్పీచ్"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"పాయింటర్ వేగం"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"గేమ్ కంట్రోలర్"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"సాధారణం"</string>
     <string name="display_category_title" msgid="6638191682294461408">"డిస్‌ప్లే"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"రంగు, మోషన్"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"రంగు కాంట్రాస్ట్"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"అధిక కాంట్రాస్ట్ టెక్స్ట్, బటన్‌లు మరియు చిహ్నాలను మరింత ప్రత్యేకంగా చేస్తుంది. మీకు ఉత్తమంగా కనిపించే కాంట్రాస్ట్‌ను ఎంచుకోండి."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"కొన్ని యాప్‌లు అన్ని రంగు, టెక్స్ట్ కాంట్రాస్ట్ సెట్టింగ్‌లకు సపోర్ట్ చేయకపోవచ్చు"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"మీ స్క్రీన్ బ్యాక్‌గ్రౌండ్ రంగుకు వ్యతిరేకంగా రంగులు, టెక్స్ట్ ఎలా కనిపించాలో సర్దుబాటు చేయండి"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"ప్రివ్యూ"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"హెలెన్, ఆడమ్"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 రోజుల క్రితం"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ఫాలోఅప్ చేయాలా?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"బిజినెస్ ట్రిప్ రిపోర్ట్"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"తదుపరి సహాయం కోసం, దయచేసి నన్ను లేదా హెలెన్‌ను \nసంప్రదించండి. ఈ రిపోర్ట్"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"క్లయింట్ ఖర్చులు"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"స్క్రీన్‌ను ముదురు రంగులో కనిపించేలా చేయండి"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ఇంటరాక్షన్ కంట్రోల్స్"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"టైమింగ్ కంట్రోల్స్"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"పారదర్శకం కాని"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"అధిక కాంట్రాస్ట్ టెక్స్ట్"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"టెక్స్ట్ రంగును నలుపు లేదా తెలుపు రంగుకు మార్చండి. బ్యాక్‌గ్రౌండ్‌తో కాంట్రాస్ట్‌ను పెంచుతుంది."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"టెక్స్ట్ కాంట్రాస్ట్‌ను పెంచండి"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"బ్యాక్‌గ్రౌండ్‌తో కాంట్రాస్ట్‌ను పెంచడానికి టెక్స్ట్ రంగును నలుపు లేదా తెలుపు రంగుకు మార్చండి."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"స్క్రీన్ వర్ధనాన్ని ఆటోమేటిక్‌గా అప్‌డేట్ చేయండి"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"యాప్‌ పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని అప్‌డేట్ చేయండి"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"పవర్ బటన్ కాల్‌ను ముగిస్తుంది"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"రద్దు చేయండి"</string>
     <string name="contrast_title" msgid="6885768151336508075">"కాంట్రాస్ట్"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"స్టాండర్డ్"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ఆటోమేటిక్ సెట్టింగ్"</string>
     <string name="contrast_medium" msgid="384414510709285811">"మధ్యస్థం"</string>
     <string name="contrast_high" msgid="3988567609694797696">"అధికం"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"ఈ యాప్‌ను 1 విండోలో మాత్రమే తెరవవచ్చు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1d949fa..6042a16 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"จับคู่หูฟังข้างขวา"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"จับคู่หูฟังข้างซ้าย"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"สำหรับเครื่องช่วยฟังทั้งหมดที่พร้อมใช้งาน"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"การตั้งค่าเครื่องช่วยฟังเพิ่มเติม"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"เปลี่ยนการตั้งค่าข้ามอุปกรณ์ เช่น การควบคุมทางลัดและเทเลคอยล์"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"สำหรับอุปกรณ์นี้"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"เอาต์พุตเสียง"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"เกี่ยวกับเอาต์พุตเสียง"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"กำลังตั้งค่าพื้นที่ส่วนตัว…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"การแจ้งเตือนจากแอปในพื้นที่ส่วนตัวจะถูกซ่อนเมื่อล็อกไว้"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"สำรวจการตั้งค่าพื้นที่ส่วนตัวเพื่อซ่อนพื้นที่ส่วนตัวและตั้งค่าการล็อกอัตโนมัติ"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"แอปที่จำเป็นได้รับการติดตั้งในพื้นที่ส่วนตัวอยู่แล้ว"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"ตั้งค่าพื้นที่ส่วนตัวไม่ได้"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"ลองอีกครั้ง"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"ใช้การล็อกหน้าจอเพื่อปลดล็อกพื้นที่ส่วนตัวใช่ไหม"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"แอปและการแจ้งเตือน"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"การแจ้งเตือนที่มีความละเอียดอ่อนบนหน้าจอล็อก"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"แสดงเนื้อหาที่ละเอียดอ่อนเมื่อพื้นที่ส่วนตัวปลดล็อกอยู่"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"สร้างบัญชี Google เพื่อช่วยรักษาข้อมูลของคุณให้เป็นส่วนตัว"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"คุณจะลงชื่อเข้าใช้บัญชีเพื่อใช้กับพื้นที่ส่วนตัวได้ในหน้าจอถัดไป"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"สร้างบัญชีเฉพาะเพื่อช่วยไม่ให้ข้อมูลปรากฏนอกพื้นที่ส่วนตัว เช่น"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"รูปภาพ ไฟล์ อีเมล รายชื่อติดต่อ กิจกรรมในปฏิทิน และข้อมูลอื่นๆ ที่ซิงค์ไว้"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"ประวัติและคำแนะนำในการดาวน์โหลดแอป"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"ประวัติการท่องเว็บ บุ๊กมาร์ก และรหัสผ่านที่บันทึกไว้"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"เนื้อหาแนะนำที่เกี่ยวข้องกับกิจกรรมของคุณในแอปพื้นที่ส่วนตัว"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"รับทราบ"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"คุณสามารถเพิ่มได้ถึง <xliff:g id="COUNT">%d</xliff:g> ลายนิ้วมือ"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"คุณได้เพิ่มลายนิ้วมือถึงขีดจำกัดสูงสุดแล้ว"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"เพิ่มลายนิ้วมืออีกไม่ได้แล้ว"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"ใช้ <xliff:g id="NEW_APP">%s</xliff:g> ในการจัดการการเชื่อมต่อเครือข่ายใช่ไหม"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"คำขอตำแหน่งล่าสุด"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ตำแหน่งสำหรับโปรไฟล์งาน"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"สิทธิ์เข้าถึงตำแหน่งสำหรับแอป"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ตำแหน่งปิดอยู่"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# จาก {total} แอปมีสิทธิ์เข้าถึงตำแหน่ง}other{# จาก {total} แอปมีสิทธิ์เข้าถึงตำแหน่ง}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"รีเซ็ต"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"เลือกแป้นกดร่วม"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"เลือกคีย์ใหม่สำหรับ <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ค่าเริ่มต้น"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"เสียงพูด"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"ความเร็วของตัวชี้"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"อุปกรณ์ควบคุมเกม"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"ทั่วไป"</string>
     <string name="display_category_title" msgid="6638191682294461408">"การแสดงผล"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"สีและการเคลื่อนไหว"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"คอนทราสต์ของสี"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"คอนทราสต์ที่สูงขึ้นทำให้ข้อความ ปุ่ม และไอคอนโดดเด่นกว่าเดิม เลือกคอนทราสต์ที่เหมาะกับคุณที่สุด"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"บางแอปอาจไม่รองรับการตั้งค่าคอนทราสต์ของสีและข้อความบางรูปแบบ"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"ปรับการแสดงสีและข้อความให้ตัดกับสีพื้นหลังของหน้าจอ"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"ตัวอย่าง"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 วันที่แล้ว"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"ติดตามผลไหม"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"รายงานการเดินทางเพื่อธุรกิจ"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"หากต้องการความช่วยเหลือเพิ่มเติม โปรดติดต่อมาที่\nฉันหรือ Helen รายงานนี้จะ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Client Expenses"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ปรับแสงหน้าจอให้มืดลง"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"ส่วนควบคุมการโต้ตอบ"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"การควบคุมเวลา"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"ไม่โปร่งใส"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ข้อความคอนทราสต์สูง"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"เปลี่ยนสีข้อความเป็นสีดำหรือสีขาว เพิ่มความ​คอนทราสต์เมื่อเทียบกับพื้นหลังให้สูงสุด"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"เพิ่มคอนทราสต์ของข้อความให้สูงสุด"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"เปลี่ยนสีข้อความเป็นสีดำหรือสีขาวเพื่อเพิ่มคอนทราสต์กับพื้นหลัง"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"อัปเดตการขยายหน้าจอเมื่อเปลี่ยนแอปพลิเคชัน"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"ยกเลิก"</string>
     <string name="contrast_title" msgid="6885768151336508075">"คอนทราสต์"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"มาตรฐาน"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"ค่าเริ่มต้น"</string>
     <string name="contrast_medium" msgid="384414510709285811">"ปานกลาง"</string>
     <string name="contrast_high" msgid="3988567609694797696">"สูง"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"แอปนี้เปิดได้ใน 1 หน้าต่างเท่านั้น"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0035783..2fef0e5 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Ipares ang kanan"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Ipares ang kaliwa"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Para sa lahat ng available na hearing device"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Higit pang setting ng hearing device"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Baguhin ang mga setting ng cross-device tulad ng shortcut, at mga kontrol sa telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Para sa device na ito"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Tungkol sa audio output"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Sine-set up ang pribadong space…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Nakatago ang mga notification mula sa mga app sa pribadong space kapag naka-lock ito"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"I-explore ang mga setting ng pribadong space para itago ang pribadong space at mag-set up ng awtomatikong pag-lock"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Naka-install na ang mga kinakailangang app sa iyong pribadong space"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Hindi na-set up ang pribadong space"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Subukan Ulit"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Gamitin ang lock ng screen para i-unlock ang pribadong space?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Mga app at notification"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Mga notification ng sensitibong content sa lock screen"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Ipakita ang sensitibong content kapag naka-unlock ang pribadong space"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Gumawa ng Google Account para matulungan kang panatilihing pribado ang iyong data"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Sa susunod na screen, puwede kang mag-sign in sa account na gagamitin sa iyong pribadong space"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Gumawa ng nakalaang account para makatulong sa paghinto ng paglabas ng data sa labas ng pribadong space, gaya ng:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Mga naka-sync na larawan, file, email, contact, event sa kalendaryo, at iba pang data"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"History at rekomendasyon sa pag-download ng app"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"History ng pag-browse, bookmark, at naka-save na password"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Iminumungkahing content na nauugnay sa iyong aktibidad sa mga pribadong space na app"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puwede kang magdagdag ng hanggang <xliff:g id="COUNT">%d</xliff:g> (na) fingerprint"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Naidagdag mo na ang maximum na bilang ng mga fingerprint"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Hindi na makapagdagdag ng higit pang fingerprint"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gamitin ang <xliff:g id="NEW_APP">%s</xliff:g> upang pamahalaan ang iyong mga koneksyon sa network?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Kamakailang hiling sa lokasyon"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokayon ng profile sa trabaho"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Pahintulot sa lokasyon ng app"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Naka-off ang lokasyon"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# sa {total} app ang may access sa lokasyon}one{# sa {total} app ang may access sa lokasyon}other{# sa {total} na app ang may access sa lokasyon}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"I-reset"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Pumili ng modifier key"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Pumili ng bagong key para sa <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Default"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Pagsasalita"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Bilis ng pointer"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Pangkalahatan"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Kulay at paggalaw"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Contrast ng kulay"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Pinapatingkad ng mas mataas na contrast ang text, mga button, at mga icon. Piliin ang contrast na pinakamainam para sa iyo."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Posibleng hindi sinusuportahan ng ilang app ang lahat ng setting ng contrast ng kulay at text"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"I-adjust ang hitsura ng mga kulay at text kumpara sa kulay ng background ng iyong screen"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Preview"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Nakalipas na 2 araw"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"I-follow up?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Ulat sa biyahe sa negosyo"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Para sa karagdagang tulong, makipag-ugnayan sa \nakin o kay Helen. Ang ulat na ito ay"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Mga Gastos ng Kliyente"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gawing mas madilim ang screen"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Mga kontrol ng pakikipag-ugnayan"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Mga kontrol sa timing"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Hindi transparent"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Text na high contrast"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Gawing itim o puti ang kulay ng text. Nagpapaigting ng contrast sa background."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"I-maximize ang contrast ng text"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Baguhin ang kulay ng text sa itim o puti para madagdagan ang contrast sa background."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"I-auto update pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"I-update pag-magnify ng screen sa app transition"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tatapusin ng power button ang tawag"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Kanselahin"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Contrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standard"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Default"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Katamtaman"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Mataas"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Sa 1 window lang puwedeng buksan ang app na ito"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8dc8e8b..01e70af 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Sağ kulağı eşle"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Sol kulağı eşle"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Mevcut tüm işitme cihazları için"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Diğer işitme cihazı ayarları"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Kısayol ve T bobini kontrolleri gibi cihazlar arası ayarları değiştirin"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Bu cihaz için"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Ses çıkışı"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Ses çıkışı hakkında"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Özel alan kuruluyor…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Kilitli olduğunda özel alan uygulamalarının gönderdiği bildirimler gizlenir"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Özel alanı gizlemek ve otomatik kilitlemeyi ayarlamak için özel alan ayarlarını keşfedin"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Gerekli uygulamalar, özel alanınıza önceden yüklenmiştir"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Özel alan kurulamadı"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Tekrar Dene"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Özel alanın kilidini açmak için ekran kilidi kullanılsın mı?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Uygulamalar ve bildirimler"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Kilit ekranındaki hassas bildirimler"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Özel alanın kilidi açıldığında hassas içerikleri göster"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Verilerinizin gizliliğini korumak için bir Google Hesabı oluşturun"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Sonraki ekranda özel alanınızda kullanacağınız hesapta oturum açabilirsiniz"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Aşağıdaki gibi verilerin özel alan dışında görünmesini durduracak özel bir hesap oluşturun:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Senkronize edilmiş fotoğraf, dosya, e-posta, kişi, takvim etkinliği ve diğer veriler"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Uygulama indirme geçmişi ve öneriler"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Tarama geçmişi, yer işaretleri ve kayıtlı şifreler"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Özel alan uygulamalarındaki etkinliğinizle ilgili önerilen içerik"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Anladım"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"<xliff:g id="COUNT">%d</xliff:g> adede kadar parmak izi ekleyebilirsiniz"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Maksimum sayıda parmak izi eklediniz"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Daha fazla parmak izi eklenemez"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Ağ bağlantılarınızı yönetmek için <xliff:g id="NEW_APP">%s</xliff:g> kullanılsın mı?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Son konum istekleri"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"İş profili konumu"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Uygulama konum izinleri"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Konum özelliği kapalı"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} uygulamanın konuma erişimi var}other{#/{total} uygulamanın konuma erişimi var}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Sıfırla"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Değiştirici tuşu seçin"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> için yeni bir tuş seçin:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Varsayılan"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Konuşma"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"İşaretçi hızı"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Oyun Denetleyici"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Genel"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Renk ve hareket"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Renk kontrastı"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Kontrast daha yüksek olduğunda metinler, düğmeler ve simgeler daha belirgin hale gelir. Kendinize en uygun kontrastı seçin."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Bazı uygulamalar tüm renk ve metin kontrastı ayarlarını desteklemiyor olabilir"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Renklerin ve metnin, ekranınızın arka plan rengine göre nasıl görüneceğini ayarlayın"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Önizleme"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 gün önce"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Takip edilsin mi?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"İş gezisi raporu"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Daha fazla yardım almak için lütfen \nbana veya Helen\'a ulaşın. Bu rapor"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Müşteri Masrafları"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranı koyulaştır"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Etkileşim denetimleri"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Zamanlama kontrolleri"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Opak"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Yüksek kontrastlı metin"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Metin rengini siyah veya beyaz olarak değiştirin. Arka planla kontrast en üst düzeye çıkar."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Metin kontrastını maksimuma çıkarın"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Arka plandaki kontrastı artırmak için metin rengini siyah veya beyaz olarak değiştirin."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Ekran büyütmeyi otomatik güncelle"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Uygulama geçişlerinde ekran büyütmeyi güncelle"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Güç düğmesi çağrıyı sonlandırır"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"İptal"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standart"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Varsayılan"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Orta"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Yüksek"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Bu uygulama yalnızca 1 pencerede açılabilir"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ed6a89e..37d3b73 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Підключити правий"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Підключити лівий"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Для всіх доступних слухових апаратів"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Інші налаштування слухового апарата"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Змінюйте налаштування для кількох пристроїв, наприклад швидкі команди й елементи керування індукційною котушкою"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Для цього пристрою"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудіовихід"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Про аудіовихід"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Налаштування приватного простору…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Сповіщення з додатків приватного простору приховуються, коли його заблоковано"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Перегляньте налаштування приватного простору, щоб приховати його й налаштувати автоматичне блокування"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Обов’язкові додатки вже встановлено в приватному просторі"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Не вдалося налаштувати приватний простір"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Повторити"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Викор. сп. розбл. екрана для розбл. пр. простору?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Додатки й сповіщення"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Чутливі сповіщення на заблокованому екрані"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Показувати контент делікатного характеру, коли приватний простір розблоковано"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Створіть обліковий запис Google, щоб забезпечити конфіденційність даних"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"На наступному екрані ввійдіть в обліковий запис, який використовуватиметься для приватного простору"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Створіть окремий обліковий запис, щоб дані не синхронізувалися за межами приватного простору, наприклад:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Синхронізовані фотографії, файли, електронні листи, контакти, події в календарі тощо"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Історія завантажень додатків і рекомендації"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Історія вебперегляду, закладки й збережені паролі"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Пропонований контент, пов’язаний із вашими діями в додатках приватного простору"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Можна додати максимум стільки відбитків: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ви додали максимальну кількість відбитків пальців"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Більше не можна додати відбитки пальців"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Використовувати <xliff:g id="NEW_APP">%s</xliff:g> для керування з’єднаннями?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Останні запити на геодані"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Геодані для робочого профілю"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Доступ додатків до геоданих"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Передавання геоданих вимкнено"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# додаток із {total} має доступ до геоданих}one{# додаток із {total} має доступ до геоданих}few{# додатки із {total} мають доступ до геоданих}many{# додатків із {total} мають доступ до геоданих}other{# додатка із {total} мають доступ до геоданих}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Скинути"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Вибрати клавішу-модифікатор"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Виберіть нову клавішу для <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"За умовчанням"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Мовлення"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Швидкість курсора"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Ігровий контролер"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Загальні"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Екран"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Кольори та зйомка в русі"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Контраст кольорів"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Якщо збільшити контраст, текст, кнопки й значки більше виділятимуться. Виберіть потрібний рівень контрасту."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Деякі додатки можуть підтримувати не всі налаштування контрасту кольорів і тексту"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Налаштуйте вигляд кольорів і тексту на фоні кольору екрана"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Попередній перегляд"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Олена, Андрій"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 дні тому"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Написати знову?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Звіт про службове відрядження"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Щоб отримати подальшу допомогу, зв’яжіться зі \nмною або Оленою. Цей звіт буде"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Витрати клієнта"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемняти екран"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Елементи керування взаємодією"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Налаштування часу реагування"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Непрозора"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Висококонтрастний текст"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Змініть колір тексту на чорний або білий. Це максимально підвищує контраст із фоном."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Збільшити контраст тексту"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Змініть колір тексту на чорний або білий, щоб зробити його контрастнішим порівняно з фоном."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Автоматично оновлювати збільшення"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Оновлювати збільшення екрана в інших програмах"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Кнопка живлення закінчує виклик"</string>
@@ -5125,8 +5109,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Скасувати"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Контраст"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Стандартний"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"За умовчанням"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Середній"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Високий"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Цей додаток можна відкрити лише в одному вікні"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 8fbd7e1..0485b7cb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1542,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"اپنے نیٹ ورک کنکشنز کا نظم کرنے کیلئے <xliff:g id="NEW_APP">%s</xliff:g> کا استعمال کریں؟"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"حالیہ مقام کی درخواستیں"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"دفتری پروفائل کیلئے مقام"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"ایپ کے لیے مقام کی اجازتیں"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"مقام آف ہے"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{{total} میں سے # ایپس کو مقام تک رسائی حاصل ہے}other{{total} میں سے # ایپس کو مقام تک رسائی حاصل ہے}}"</string>
@@ -1936,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"ری سیٹ کریں"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"موڈیفائر کلید منتخب کریں"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"‫<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> کے لیے نئی کلید منتخب کریں:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"ڈیفالٹ"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"اسپیچ"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"پوائنٹر کی رفتار"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"گیم کنٹرولر"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1ad1702..b304afe 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Oʻng quloqni ulash"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Chap quloqni ulash"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Barcha mavjud eshitish qurilmalari uchun"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Boshqa eshitish qurilmalari sozlamalari"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Induksion gʻaltak parametrlari va yorliq kabi qurilmalararo sozlamalarni oʻzgartiring"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Shu qurilma uchun"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio chiqishi"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Audio chiqishi haqida"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Maxfiy joy sozlanmoqda…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Qulflanganida maxfiy makon ilovalaridan bildirishnomalar berkitiladi"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Shaxsiy makon sozlamalarida siz uni yashirishingiz va avtomatik bloklashni sozlashingiz mumkin"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Kerakli ilovalar maxfiy makonda allaqachon oʻrnatilgan"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Maxfiy makon sozlanmadi"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Qayta urinish"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Maxfiy joy qurilma qulfi bilan ochilsinmi?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Ilovalar va bildirishnomalar"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Ekran qulfida nozik bildirishnomalar"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Maxfiy makon qulflanmaganda maxfiy kontentni koʻrsatish"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Maʼlumotlaringizni maxfiy saqlash uchun Google hisobini yarating"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Keyingi ekranda maxfiy makoningiz bilan foydalanish uchun hisobingizga kirishingiz mumkin"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Maxfiy makondan tashqarida maʼlumotlar chiqib ketishining oldini olish uchun maxsus hisob yarating, masalan:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Sinxronlangan suratlar, fayllar, emaillar, kontaktlar, taqvimdagi tadbirlar va boshqa maʼlumotlar"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Ilovani yuklab olishlar tarixi va tavsiyalar"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Veb-sahifalar tarixi, bukmarklar va saqlangan parollar"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Maxfiy makon ilovalaridagi faoliyatingizga aloqador tavsiya etilgan kontent"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"OK"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Ko’pi bilan <xliff:g id="COUNT">%d</xliff:g> ta barmoq izi qo’shish mumkin"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Barmoq izlari maksimal miqdorda qo‘shildi"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Boshqa barmoq izini qo‘shib bo‘lmaydi"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Tarmoq ulanishlarini boshqarish uchun “<xliff:g id="NEW_APP">%s</xliff:g>” ilovasidan foydalanilsinmi?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Joylashuv axboroti so‘rovlari"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ish profili uchun geolokatsiya"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Ilovalar uchun joylashuv ruxsati"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Joylashuv xizmati yoqilmagan"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} ta ilova joylashuvdan foydalanmoqda}other{#/{total} ta ilova joylashuvdan foydalanmoqda}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Yangilash"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Modifikator tugmasini tanlang"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g> uchun yangi tugma tanlang:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Standart"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Nutq"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Kursor tezligi"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"O‘yin qurilmasi"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Umumiy"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Rang va harakat"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Rang kontrasti"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Yuqori kontrast matn, tugmalar va belgilarni yanada ajratib turadi. Oʻzingizga eng mos kontrastni tanlang."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Ayrim ilovalarda barcha rang va matn kontrasti sozlamalari ishlamasligi mumkin"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Ranglar va matn ekraningiz fon rangiga nisbatan qanday koʻrinishini sozlang"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Razm solish"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 kun oldin"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Kuzatilsinmi?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Biznes safari hisoboti"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Qoʻshimcha yordam uchun \nmenga yoki Helenga murojaat qiling. Bu hisobot"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Mijoz xarajatlari"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranni xiralashtirish"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Boshqaruv elementlari"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Vaqt boshqaruvlari"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Noshaffof"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Yuqori kontrastli matn"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Matn rangini qora yoki oq rangga almashtirish. Fon yordamida kontrastni oshirish."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Matn kontrastini maksimallashtiring"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Fon yordamida kontrastni oshirish uchun matn rangini qora yoki oq rangga almashtiring."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Ekranda kattalashtirish xususiyatini avtomatik ravishda yangilash"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Bir ilovadan ikkinchisiga o‘tishda ekranda kattalashtirish xususiyatini yangilash"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Quvvat tugmasi chaqiruvni tugatadi"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Bekor qilish"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Kontrast"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Standart"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Birlamchi"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Oʻrtacha"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Yuqori"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Bu ilovani faqat 1 ta oynada ochish mumkin"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0e91ba9..57f9219 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Ghép nối tai phải"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Ghép nối tai trái"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Cho tất cả các thiết bị trợ thính có sẵn"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Các chế độ cài đặt khác về thiết bị trợ thính"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Thay đổi chế độ cài đặt trên nhiều thiết bị, chẳng hạn như chế độ điều khiển lối tắt và cuộn dây cảm ứng"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Cho thiết bị này"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Đầu ra âm thanh"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Giới thiệu về đầu ra âm thanh"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Đang thiết lập không gian riêng tư…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Thông báo của các ứng dụng trong không gian riêng tư sẽ bị ẩn khi không gian đó bị khoá"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Khám phá các chế độ cài đặt không gian riêng tư để ẩn không gian riêng tư và thiết lập chế độ khoá tự động"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Các ứng dụng bắt buộc đã được cài đặt trong không gian riêng tư của bạn"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Không thiết lập được không gian riêng tư"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Thử lại"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Dùng khoá màn hình để mở khoá không gian riêng tư?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Ứng dụng và thông báo"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Thông báo nhạy cảm trên màn hình khoá"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Hiển thị nội dung nhạy cảm khi không gian riêng tư mở khoá"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Tạo một Tài khoản Google để giúp bảo mật dữ liệu của bạn"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Trên màn hình tiếp theo, bạn có thể đăng nhập vào một tài khoản để dùng không gian riêng tư"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Tạo một tài khoản chuyên biệt để giúp ngăn dữ liệu xuất hiện bên ngoài không gian riêng tư, chẳng hạn như:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Ảnh, tệp, email, danh bạ, sự kiện trên lịch và các dữ liệu khác đã đồng bộ hoá"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Nhật ký ứng dụng đã tải xuống và các đề xuất"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Nhật ký duyệt web, dấu trang và mật khẩu đã lưu"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Nội dung đề xuất liên quan đến hoạt động của bạn ở các ứng dụng trong không gian riêng tư"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Tôi hiểu"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Bạn có thể thêm tối đa <xliff:g id="COUNT">%d</xliff:g> vân tay"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Bạn đã thêm số vân tay tối đa"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Không thể thêm dấu vân tay khác"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Sử dụng <xliff:g id="NEW_APP">%s</xliff:g> để quản lý các kết nối mạng của bạn?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Các yêu cầu gần đây về vị trí"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Vị trí của hồ sơ công việc"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Quyền truy cập thông tin vị trí cho ứng dụng"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Dịch vụ vị trí hiện đang tắt"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{#/{total} ứng dụng có quyền truy cập vào thông tin vị trí}other{#/{total} ứng dụng có quyền truy cập vào thông tin vị trí}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Đặt lại"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Chọn phím bổ trợ"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Chọn một phím mới cho <xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Mặc định"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Lời nói"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Tốc độ con trỏ"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Trình điều khiển trò chơi"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Chung"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Màn hình"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Màu sắc và chuyển động"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Độ tương phản màu"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Độ tương phản càng cao thì càng giúp làm nổi bật văn bản, nút và biểu tượng. Hãy chọn độ tương phản phù hợp nhất với bạn."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Một số ứng dụng có thể không hỗ trợ hết tất cả các chế độ cài đặt độ tương phản màu và văn bản"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Điều chỉnh cách hiển thị màu và văn bản dựa vào màu nền của màn hình"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Xem trước"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 ngày trước"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Theo dõi?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Báo cáo về chuyến công tác"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Để được hỗ trợ thêm, hãy liên hệ với \ntôi hoặc Helen. Báo cáo này sẽ"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Chi phí của khách hàng"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Giảm bớt độ sáng màn hình"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Điều khiển tương tác"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Điều khiển có hẹn giờ"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Không trong suốt"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Văn bản có độ tương phản cao"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Thay đổi màu chữ thành đen hoặc trắng. Tăng tối đa độ tương phản so với nền."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Tăng tối đa độ tương phản văn bản"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Thay đổi màu chữ thành đen hoặc trắng để tăng độ tương phản với nền."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Tự động cập nhật phóng đại màn hình"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Cập nhật phóng đại màn hình khi chuyển ứng dụng"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kết thúc cuộc gọi bằng nút nguồn"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Huỷ"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Độ tương phản"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Chuẩn"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Mặc định"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Vừa"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Cao"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Ứng dụng này chỉ có thể mở trong 1 cửa sổ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 81384a6..f43b65d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"为右耳进行配对"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"为左耳进行配对"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"适合所有可用的助听设备"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"更多助听装置设置"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"更改跨设备设置，例如快捷方式和电感线圈控件"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"适合此设备"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音频输出"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"音频输出简介"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"正在设置私密空间…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"私密空间处于锁定状态时，系统会隐藏私密空间内应用的通知"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"探索私密空间设置，以便隐藏私密空间和设置自动锁定功能"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"必需的应用已经安装在私密空间中"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"无法设置私密空间"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"重试"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"要使用屏锁来解锁私密空间？"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"应用和通知"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"锁屏状态下的敏感通知"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"可在私密空间解锁后显示敏感内容"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"创建 Google 账号协助确保数据的私密性"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"在下一个界面中，您可以登录用于私密空间的账号"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"创建专用账号，防止数据出现在私密空间外，例如："</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"已同步的照片、文件、电子邮件、联系人、日历活动和其他数据"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"应用下载记录和推荐"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"浏览记录、书签和已保存的密码"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"与私密空间应用中的活动相关的建议内容"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"知道了"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个指纹"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"您添加的指纹数量已达到上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"无法添加更多的指纹"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"要使用<xliff:g id="NEW_APP">%s</xliff:g>管理您的网络连接吗？"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"近期位置信息请求"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"工作资料位置信息"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"应用位置信息权限"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"位置信息服务已关闭"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# 个应用（共 {total} 个应用）有权获取位置信息}other{# 个应用（共 {total} 个应用）有权获取位置信息}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"重置"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"选择辅助键"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"为<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>选择新的辅助键："</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"默认"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"语音"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"指针速度"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"游戏控制器"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"常规"</string>
     <string name="display_category_title" msgid="6638191682294461408">"显示"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"色彩和动画"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"颜色对比度"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"对比度越高，文字、按钮和图标越引人注目。请选择最符合您需求的对比度。"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"某些应用可能仅支持部分颜色和文字对比度设置"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"调整颜色和文字与屏幕背景颜色的对比度"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"预览"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen、Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 天前"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"要后续跟进吗？"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"出差报告"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"如要获取进一步协助，请与我\n或 Helen 联系。此报告将"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"客户端支出"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"调暗屏幕"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"互动控制"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"定时控制"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"不透明"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"高对比度文字"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"将文字颜色更改为黑色或白色，使其与背景形成尽可能鲜明的对比。"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"尽可能提高文字对比度"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"将文字颜色更改为黑色或白色，提高与背景的对比度。"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"自动更新屏幕放大状态"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"在应用转换时更新屏幕放大状态"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按电源按钮结束通话"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"取消"</string>
     <string name="contrast_title" msgid="6885768151336508075">"对比度"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"标准"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"默认"</string>
     <string name="contrast_medium" msgid="384414510709285811">"中"</string>
     <string name="contrast_high" msgid="3988567609694797696">"高"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"此应用只能在 1 个窗口中打开"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d08f556..966bc3a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"配對右耳的裝置"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"配對左耳"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"所有適用的助聽器"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"更多助聽器設定"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"變更捷徑等跨裝置設定，以及電話線圈控制項"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"僅限此裝置"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音訊輸出裝置"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"關於音訊輸出"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"正在設定私人空間…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"私人空間處於鎖定狀態時，系統會隱藏私人空間應用程式的通知"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"探索私人空間設定，可隱藏私人空間及設定自動鎖定"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"所需的應用程式已安裝在私人空間內"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"無法設定私人空間"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"再試一次"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"要使用螢幕鎖定功能解鎖私人空間嗎？"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"應用程式和通知"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"上鎖畫面上的敏感通知"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"在私人空間解鎖時顯示敏感內容"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"建立 Google 帳戶有助將你的資料保密"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"在下一個畫面中，你可以登入用於私人空間的帳戶"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"建立專屬帳戶，防止資料出現在私人空間外，例如："</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"已同步的相片、檔案、電郵、聯絡人、日曆活動和其他資料"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"應用程式下載記錄和建議"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"瀏覽記錄、書籤和已儲存的密碼"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"與私人空間應用程式活動相關的建議內容"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"知道了"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"你最多可以加入 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"你加入指紋的數目已達上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"無法加入更多指紋"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」管理你的網絡連線？"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"最近的位置資訊要求"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"工作設定檔的位置"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"應用程式位置權限"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"位置設定已關閉"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{在 {total} 個應用程式中，有 # 個已取得位置資訊存取權}other{在 {total} 個應用程式中，有 # 個已取得位置資訊存取權}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"重設"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"選擇輔助鍵"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"為「<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>」選擇新的輔助鍵："</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"預設"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"語音"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"游標速度"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"遊戲控制器"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"一般"</string>
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"顏色及動作"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"色彩對比度"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"對比度越高，文字、按鈕和圖示便越突出。選擇最適合你的對比度。"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"部分應用程式可能尚未支援所有色彩和文字對比度設定"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"調整色彩和文字與螢幕背景色彩之間的對比度。"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"預覽"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen、Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 天前"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"要跟進嗎？"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"公幹報告"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"如需進一步協助，\n請與我或 Helen 聯絡。此報告將會"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"客戶支出"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"校暗螢幕"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"互動控制項"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"時間控制"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"不透明"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"高對比文字"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"將文字顏色改成黑色或白色，盡量令文字和背景顏色有最大對比。"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"將文字對比度最大化"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"將文字色彩改成黑色或白色，提升文字和背景之間的對比度。"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"在應用程式轉場時更新螢幕放大設定"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按開關按鈕結束通話"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"取消"</string>
     <string name="contrast_title" msgid="6885768151336508075">"對比"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"標準"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"預設"</string>
     <string name="contrast_medium" msgid="384414510709285811">"中"</string>
     <string name="contrast_high" msgid="3988567609694797696">"高"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"此應用程式只可在 1 個視窗中開啟"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7462a00..b94a096 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"配對右耳的裝置"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"配對左耳的裝置"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"適用於所有可用的助聽裝置"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"更多助聽器設定"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"變更捷徑等跨裝置設定，以及電話線圈控制選項"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"適用於本裝置"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音訊輸出裝置"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"關於音訊輸出"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"正在設定私人空間…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"私人空間鎖定時，系統會隱藏私人空間應用程式的通知"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"探索私人空間設定，可隱藏私人空間及設定自動鎖定"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"所需應用程式已安裝在私人空間"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"無法設定私人空間"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"再試一次"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"要使用螢幕鎖定功能鎖定私人空間嗎？"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"應用程式和通知"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"在螢幕鎖定畫面上顯示私密通知"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"可在私人空間解鎖後顯示私密內容"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"建立 Google 帳戶協助保障資料隱私"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"你可以在下個畫面登入帳戶，用來使用私人空間"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"建立專用帳戶，防止資料出現在私人空間外，例如："</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"已同步相片、檔案、電子郵件、聯絡人、日曆活動和其他資料"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"應用程式下載記錄和建議"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"瀏覽記錄、書籤和儲存的密碼"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"與你的私人空間應用程式活動相關的建議內容"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"我知道了"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"你最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"你新增的指紋數量已達上限"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"無法新增其他指紋"</string>
@@ -1553,6 +1542,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」管理你的網路連線？"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"最近的定位要求"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"工作資料夾位置資訊"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"應用程式位置存取權"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"定位功能已關閉"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{有 # 個應用程式 (共 {total} 個) 已取得位置存取權}other{有 # 個應用程式 (共 {total} 個) 已取得位置存取權}}"</string>
@@ -1947,7 +1938,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"重設"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"選擇輔助鍵"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"為「<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>」選擇新的輔助鍵："</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"預設"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"語音"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"游標速度"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"遊戲控制器"</string>
@@ -2010,28 +2007,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"一般"</string>
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"色彩和動態"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"色彩對比"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"對比度較高時，文字、按鈕和圖示會更醒目。請選擇效果最佳的對比度。"</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"部分應用程式可能不支援所有色彩和文字對比度設定"</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"調整色彩和文字在畫面背景色上的呈現效果"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"預覽"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"Helen、Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"2 天前"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"要追蹤後續嗎？"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"出差報告"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"如需進一步協助，請與我或 Helen 聯絡。\n報告將會"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"用戶端支出"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"調暗螢幕"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"互動控制項"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"時間控制項"</string>
@@ -2168,10 +2154,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"不透明"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"高對比文字"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"將文字色彩變更為黑色或白色，讓文字與背景色彩呈現最大對比。"</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"盡可能提高文字對比度"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"將文字色彩變更為黑色或白色，增加與背景的對比度。"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"更新應用程式轉場後的螢幕放大設定"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按電源鍵結束通話"</string>
@@ -5123,8 +5107,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"取消"</string>
     <string name="contrast_title" msgid="6885768151336508075">"對比"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"標準"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"預設"</string>
     <string name="contrast_medium" msgid="384414510709285811">"中"</string>
     <string name="contrast_high" msgid="3988567609694797696">"高"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"這個應用程式只能在 1 個視窗中開啟"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 829946d..271a3cc 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -74,10 +74,8 @@
     <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Bhangqa indlebe engakwesokudla"</string>
     <string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Bhangqa indlebe engakwesokunxele"</string>
     <string name="bluetooth_device_controls_general" msgid="1399214835599665488">"Mayelana nawo wonke amadivayisi wokuzwa atholakalayo"</string>
-    <!-- no translation found for bluetooth_device_controls_title (659009912978022189) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_controls_summary (5387400497394163925) -->
-    <skip />
+    <string name="bluetooth_device_controls_title" msgid="659009912978022189">"Amasethingi engeziwe ensizakuzwa"</string>
+    <string name="bluetooth_device_controls_summary" msgid="5387400497394163925">"Shintsha amasethingi amadivayisi amaningi njengesinqamuleli, kanye nezilawuli ze-telecoil"</string>
     <string name="bluetooth_device_controls_specific" msgid="7706863288754077107">"Kule divayisi"</string>
     <string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Okukhishwayo komsindo"</string>
     <string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Mayelana nokuphumayo komsindo"</string>
@@ -598,8 +596,7 @@
     <string name="private_space_setting_up_text" msgid="8458035555212009528">"Isetha isikhala esigodliwe…"</string>
     <string name="private_space_notifications_hidden_title" msgid="2009112565217540581">"Izaziso ezivela kuma-app wendawo engasese ziyafihlwa uma ikhiyiwe"</string>
     <string name="private_space_explore_settings_title" msgid="1448128245941571654">"Hlola amasethingi endawo engasese ukuze ufihle indawo engasese futhi usethe ukukhiya ngokuzenzakalelayo"</string>
-    <!-- no translation found for private_space_apps_installed_title (4781838023423527730) -->
-    <skip />
+    <string name="private_space_apps_installed_title" msgid="4781838023423527730">"Ama-app ayimfuneko afakiwe kakade endaweni yakho eyimfihlo"</string>
     <string name="private_space_error_screen_title" msgid="739381738044418346">"Ayikwazanga ukusetha indawo engasese"</string>
     <string name="private_space_tryagain_label" msgid="8305362615231738367">"Zama Futhi"</string>
     <string name="private_space_lockscreen_title" msgid="6034864097861137509">"Sebenzisa ukukhiya isikrini ukuvula isikhala esigodliwe?"</string>
@@ -622,22 +619,14 @@
     <string name="private_space_apps_and_notifications_header" msgid="7493922100321972687">"Ama-app nezaziso"</string>
     <string name="private_space_notifications_title" msgid="3456249671149740404">"Izaziso ezizwelayo kusikrini sokukhiya"</string>
     <string name="private_space_sensitive_notifications_description" msgid="1466031201599700985">"Bonisa okuqukethwe okubucayi uma indawo engasese ivuliwe"</string>
-    <!-- no translation found for private_space_gaia_education_title (3787414895669666563) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_description (1592753570023264559) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_header (7835879839637613495) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet1 (641701340908301992) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet2 (3679859681253672976) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet3 (1703614225321289717) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_bullet4 (515761604505366164) -->
-    <skip />
-    <!-- no translation found for private_space_gaia_education_got_it (7824029819615566806) -->
-    <skip />
+    <string name="private_space_gaia_education_title" msgid="3787414895669666563">"Sungula i-Google Account ukuze usize ekugcineni idatha yakho igodliwe"</string>
+    <string name="private_space_gaia_education_description" msgid="1592753570023264559">"Esikrinini esilandelayo ungangena ngemvume ku-akhawunti ukuze uyisebenzise nendawo engasese yakho"</string>
+    <string name="private_space_gaia_education_header" msgid="7835879839637613495"><b>"Sungula i-akhawunti ezinikele ukuze usize ekumiseni idatha evela ngaphandle kwendawo engasese, njengale:"</b></string>
+    <string name="private_space_gaia_education_bullet1" msgid="641701340908301992">"Izithombe, amafayela, ama-imeyile, oxhumana nabo, umcimbi wekhalenda kanye nenye idatha evunyelanisiwe"</string>
+    <string name="private_space_gaia_education_bullet2" msgid="3679859681253672976">"Umlando wokudawuniloda we-app kanye nokunconywayo"</string>
+    <string name="private_space_gaia_education_bullet3" msgid="1703614225321289717">"Umlando wokubhrawuza, amabhukhimakhi, kanye namaphasiwedi alondoloziwe"</string>
+    <string name="private_space_gaia_education_bullet4" msgid="515761604505366164">"Okuqukethwe okusikiselwe okuhlobene nomsebenzi wakho kuma-app endawo engasese"</string>
+    <string name="private_space_gaia_education_got_it" msgid="7824029819615566806">"Ngiyezwa"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Ungangeza izigxivizo zeminwe ezingafika kwezingu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Ungeze inombolo ephezulu yezigxivizo zeminwe"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Ayikwazi ukwengeza izingxovizo zeminwe eziningi"</string>
@@ -1554,6 +1543,8 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Sebenzisa i-<xliff:g id="NEW_APP">%s</xliff:g> ukuze uphathe uxhumo lwakho lenethiwekhi?"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Izicelo zendawo zakamuva"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Indawo yephrofayela yokusebenza"</string>
+    <!-- no translation found for private_profile_location_switch_title (4127119143109855789) -->
+    <skip />
     <string name="location_app_level_permissions" msgid="907206607664629759">"Izimvume zendawo ye-app"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Indawo ivaliwe"</string>
     <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{U-# ku-app e-{total} enokufinyelela kundawo}one{U-# kuma-app angu-{total} anokufinyelela kundawo}other{U-# kuma-app angu-{total} anokufinyelela kundawo}}"</string>
@@ -1948,7 +1939,13 @@
     <string name="modifier_keys_reset" msgid="551170906710422041">"Setha kabusha"</string>
     <string name="modifier_keys_picker_title" msgid="244545904150587851">"Khetha ukhiye wokushintsha"</string>
     <string name="modifier_keys_picker_summary" msgid="739397232249560785">"Khetha ukhiye omusha we-<xliff:g id="MODIFIER_KEY_DEFAULT_NAME">%1$s</xliff:g>:"</string>
+    <!-- no translation found for ime_label_title (8994569521516807168) -->
+    <skip />
     <string name="default_keyboard_layout" msgid="8690689331289452201">"Okuzenzakalelayo"</string>
+    <!-- no translation found for automatic_keyboard_layout_label (9138088156046198913) -->
+    <skip />
+    <!-- no translation found for user_selected_keyboard_layout_label (154742505924555156) -->
+    <skip />
     <string name="speech_category_title" msgid="5995161659186229742">"Inkulumo"</string>
     <string name="pointer_speed" msgid="7398649279282675718">"Ijubane lesikhombi"</string>
     <string name="game_controller_settings_category" msgid="8557472715034961918">"Isilawuli somdlalo"</string>
@@ -2011,28 +2008,17 @@
     <string name="general_category_title" msgid="6298579528716834157">"Okuvamile"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Bonisa"</string>
     <string name="accessibility_color_and_motion_title" msgid="2323301706545305874">"Umbala nokunyakaza"</string>
-    <!-- no translation found for accessibility_color_contrast_title (5757724357142452378) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_intro (7795090401101214930) -->
-    <skip />
-    <!-- no translation found for color_contrast_note (7592686603372566198) -->
-    <skip />
-    <!-- no translation found for accessibility_color_contrast_summary (7563237683500106632) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview (6791430227535363883) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_sender_name (8641943417589238147) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_send_date (2108702726171600080) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_badge (4845484039428505392) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_title (198712116139754823) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_body (4139331665325624199) -->
-    <skip />
-    <!-- no translation found for color_contrast_preview_email_attachment_name (852407311884814746) -->
-    <skip />
+    <string name="accessibility_color_contrast_title" msgid="5757724357142452378">"Ukungafani kombala"</string>
+    <string name="accessibility_color_contrast_intro" msgid="7795090401101214930">"Ukungafani okuphezulu kwenza umbhalo, izinkinobho kanye nezithonjana zivele kakhulu. Khetha ukungafani okubukeka kangcono kuwe."</string>
+    <string name="color_contrast_note" msgid="7592686603372566198">"Amanye ama-app angase angayisekeli yonke imibala nemibhalo yamasethingi okungafani."</string>
+    <string name="accessibility_color_contrast_summary" msgid="7563237683500106632">"Lungisa ukuthi imibala kanye nombhalo kubukeka kanjani uma kuqhathaniswa nombhala wengemuva lesikrini sakho"</string>
+    <string name="color_contrast_preview" msgid="6791430227535363883">"Hlola kuqala"</string>
+    <string name="color_contrast_preview_sender_name" msgid="8641943417589238147">"U-Helen, Adam"</string>
+    <string name="color_contrast_preview_email_send_date" msgid="2108702726171600080">"Izinsuku ezi-2 ezidlule"</string>
+    <string name="color_contrast_preview_email_badge" msgid="4845484039428505392">"Landelela?"</string>
+    <string name="color_contrast_preview_email_title" msgid="198712116139754823">"Umbiko wohambo lwebhizinisi"</string>
+    <string name="color_contrast_preview_email_body" msgid="4139331665325624199">"Ngosizo olwengeziwe, sicea uxhumane \nnami noma u-Helen. Lo mbiko uzo"</string>
+    <string name="color_contrast_preview_email_attachment_name" msgid="852407311884814746">"Izindleko Zeklayenti"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Yenza isikrini sibe mnyama"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Izilawuli zokubandakanya"</string>
     <string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Izilawuli zesikhathi"</string>
@@ -2169,10 +2155,8 @@
     <string name="accessibility_button_high_label" msgid="9138077512008190896">"Ayibonisi ngale"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Umbala okhanya kakhulu"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_summary" msgid="5286411556836346180">"Shintsha umbala wombhalo ube mnyama noma mhlophe. Khulisa ukugqama nengemuva."</string>
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_title (8737272017343509753) -->
-    <skip />
-    <!-- no translation found for accessibility_toggle_maximize_text_contrast_preference_summary (5493999083693403489) -->
-    <skip />
+    <string name="accessibility_toggle_maximize_text_contrast_preference_title" msgid="8737272017343509753">"Beka ekugcineni ukungafani kombhalo"</string>
+    <string name="accessibility_toggle_maximize_text_contrast_preference_summary" msgid="5493999083693403489">"Shintsha umbala wombhalo ube mnyama noma mhlophe ukuze wenyuse ukungafani nengemuva."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"Buyekeza ngokuzenzakalela isisondezi-skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"Buyekeza isisondezi-skrini ekushintshweni kohlelo lokusebenza"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Inkinobho yamandla ivala ikholi"</string>
@@ -5124,8 +5108,7 @@
     <string name="color_selector_dialog_cancel" msgid="8667350644753900701">"Khansela"</string>
     <string name="contrast_title" msgid="6885768151336508075">"Ukugqama"</string>
     <string name="contrast_standard" msgid="1097297089917185235">"Okujwayelekile"</string>
-    <!-- no translation found for contrast_default (8918545965525226966) -->
-    <skip />
+    <string name="contrast_default" msgid="8918545965525226966">"Okuzenzakalelayo"</string>
     <string name="contrast_medium" msgid="384414510709285811">"Okuphakathi"</string>
     <string name="contrast_high" msgid="3988567609694797696">"Phezulu"</string>
     <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Le-app ingavulwa kuphela ewindini eli-1."</string>
diff --git a/res/values/accessibility_shortcut_keys.xml b/res/values/accessibility_shortcut_keys.xml
index 4992a54..fcf62bc 100644
--- a/res/values/accessibility_shortcut_keys.xml
+++ b/res/values/accessibility_shortcut_keys.xml
@@ -22,6 +22,7 @@
     <string name="accessibility_shortcut_nav_button_pref" translatable="false">shortcut_nav_button_pref</string>
     <string name="accessibility_shortcut_fab_pref" translatable="false">shortcut_fab_pref</string>
     <string name="accessibility_shortcut_triple_tap_pref" translatable="false">shortcut_triple_tap_pref</string>
-    <string name="accessibility_shortcut_two_fingers_double_tap_pref" translatable="false">shortcut_two_fingers_double_tap_pref</string>
+    <string name="accessibility_shortcut_two_finger_double_tap_pref" translatable="false">shortcut_two_finger_double_tap_pref</string>
+    <string name="accessibility_shortcut_quick_settings_pref" translatable="false">shortcut_quick_settings_pref</string>
     <string name="accessibility_shortcuts_advanced_collapsed" translatable="false">advanced_shortcuts_collapsed</string>
 </resources>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 37866ae..fe3f429 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1091,7 +1091,7 @@
     </string-array>
 
     <string-array name="wifi_privacy_entries">
-        <item>Use randomized MAC (default)</item>
+        <item>Use randomized MAC</item>
         <item>Use device MAC</item>
     </string-array>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dfd4869..24ae75f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4839,6 +4839,8 @@
     <string name="accessibility_tutorial_dialog_title_triple">Triple tap screen to open</string>
     <!-- Title for the accessibility tutorial dialog in accessibility service with two finger double tap. [CHAR LIMIT=100] -->
     <string name="accessibility_tutorial_dialog_title_two_finger_double">Two finger double tap screen to open</string>
+    <!-- Title for the accessibility tutorial dialog in accessibility service with quick setting shortcut. [CHAR LIMIT=100] -->
+    <string name="accessibility_tutorial_dialog_title_quick_setting">Quick Settings shortcut</string>
     <!-- Title for the accessibility tutorial dialog in accessibility service with gesture. [CHAR LIMIT=50] -->
     <string name="accessibility_tutorial_dialog_title_gesture">Use gesture to open</string>
     <!-- Title for the accessibility tutorial dialog in gesture navigation settings. [CHAR LIMIT=50] -->
@@ -4853,6 +4855,8 @@
     <string name="accessibility_tutorial_dialog_message_triple">To start and stop magnification, triple-tap anywhere on your screen.</string>
     <!-- Instruction for the accessibility tutorial dialog in accessibility service with two finger double tap. [CHAR LIMIT=100] -->
     <string name="accessibility_tutorial_dialog_message_two_finger_triple">To start and stop magnification, double-tap anywhere on your screen with two fingers.</string>
+    <!-- Instruction for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=NONE]-->
+    <string name="accessibility_tutorial_dialog_message_quick_setting">To use this feature, swipe down from the top of your screen.</string>
     <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is not enabled. [CHAR LIMIT=NONE] -->
     <string name="accessibility_tutorial_dialog_message_gesture">To use this feature, swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold.</string>
     <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is enabled. [CHAR LIMIT=NONE] -->
@@ -4867,10 +4871,10 @@
     <string name="accessibility_tutorial_dialog_link_button">Button settings</string>
     <!-- Title for accessibility shortcut preference for accessibility apps. [CHAR LIMIT=40] -->
     <string name="accessibility_shortcut_title"><xliff:g id="service" example="Select to Speak">%1$s</xliff:g> shortcut</string>
-    <!-- Title for software shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_shortcut_edit_summary_software">Accessibility button</string>
-    <!-- Title for software shortcut gesture in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_shortcut_edit_summary_software_gesture">Accessibility gesture</string>
+    <!-- Shown as one of the item in the chosen accessibility shortcut types list presented as a label next to the shortcut toggle. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_shortcut_edit_summary_software">accessibility button</string>
+    <!-- Shown as one of the item in the chosen accessibility shortcut types list presented as a label next to the shortcut toggle. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_shortcut_edit_summary_software_gesture">accessibility gesture</string>
     <!-- Title for software shortcut in gesture mode in accessibility edit shortcut dialog while using gesture navigation is enabled. [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture">Swipe up with 2 fingers</string>
     <!-- Title for software shortcut in gesture mode in accessibility edit shortcut dialog while using gesture navigation and touch exploration are enabled. [CHAR LIMIT=NONE] -->
@@ -4889,6 +4893,12 @@
     <string name="accessibility_shortcut_edit_dialog_summary_software_floating"><annotation id="link">More options</annotation></string>
     <!-- Footer to show help link content description. [CHAR LIMIT=NONE] -->
     <string name="footer_learn_more_content_description">Learn more about <xliff:g id="service" example="Select to Speak">%1$s</xliff:g></string>
+    <!-- Title for quick settings shortcut option in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_shortcut_edit_dialog_title_quick_settings">Quick Settings</string>
+    <!-- Summary for quick settings shortcut option in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_shortcut_edit_dialog_summary_quick_settings">Swipe down from the top of your screen</string>
+    <!-- Shown as one of the item in the chosen accessibility shortcut types list presented as a label next to the shortcut toggle. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_feature_shortcut_setting_summary_quick_settings">Quick Settings</string>
     <!-- Title for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_title_hardware">Hold volume keys</string>
     <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
@@ -11689,6 +11699,13 @@
     <!-- Body text of automatic data switching at dual sim onboarding's primary sim page or SIMs page. [CHAR LIMIT=NONE] -->
     <string name="primary_sim_automatic_data_msg">Use data from either SIM depending on coverage and availability</string>
 
+    <!-- Title of asking the user whether to restart device after enabling DSDS. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_restart_dialog_title">Restart to use 2 SIMs</string>
+    <!-- Body text of asking the user whether to restart device after enabling DSDS. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_restart_dialog_msg">To use 2 SIMs at once, restart your device, then turn on both SIMs</string>
+    <!-- Button text to cancel dialog and then enable the sim -->
+    <string name="sim_action_restart_dialog_cancel">Use <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> only</string>
+
     <!-- Text of phone number item when the sim is data only. [CHAR LIMIT=NONE] -->
     <string name="sim_onboarding_phoneNumber_data_only">Data only</string>
 
@@ -13006,11 +13023,6 @@
     <!-- Developer settings: select Grammatical gender dialog title [CHAR LIMIT=50]-->
     <string name="grammatical_gender_dialog_title">Select Grammatical gender</string>
 
-    <!-- Do not translate. Developer settings: Title for the screen allowing user to control Quarantined apps [CHAR LIMIT=50] -->
-    <string name="quarantined_apps_title" translatable="false">Quarantined Apps</string>
-    <!-- Do not translate. Developer settings: Button to unquarantine an app [CHAR LIMIT=20] -->
-    <string name="unquarantine_app_button" translatable="false">Unquarantine app</string>
-
     <!-- Title of preference to manage content protection settings -->
     <string name="content_protection_preference_title">Scanning for deceptive apps</string>
     <!-- Summary of the preference to manage content protection settings -->
diff --git a/res/xml/accessibility_edit_shortcuts.xml b/res/xml/accessibility_edit_shortcuts.xml
index fdb5b99..37e25af 100644
--- a/res/xml/accessibility_edit_shortcuts.xml
+++ b/res/xml/accessibility_edit_shortcuts.xml
@@ -26,6 +26,14 @@
         settings:allowDividerBelow="false"/>
 
     <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
+        android:key="@string/accessibility_shortcut_quick_settings_pref"
+        android:persistent="false"
+        android:selectable="true"
+        settings:allowDividerAbove="false"
+        settings:allowDividerBelow="false"
+        settings:controller="com.android.settings.accessibility.shortcuts.QuickSettingsShortcutOptionController" />
+
+    <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
         android:key="@string/accessibility_shortcut_fab_pref"
         android:persistent="false"
         android:selectable="true"
@@ -58,12 +66,12 @@
         settings:controller="com.android.settings.accessibility.shortcuts.VolumeKeysShortcutOptionController" />
 
     <com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
-        android:key="@string/accessibility_shortcut_two_fingers_double_tap_pref"
+        android:key="@string/accessibility_shortcut_two_finger_double_tap_pref"
         android:persistent="false"
         android:selectable="true"
         settings:allowDividerAbove="false"
         settings:allowDividerBelow="false"
-        settings:controller="com.android.settings.accessibility.shortcuts.TwoFingersDoubleTapShortcutOptionController" />
+        settings:controller="com.android.settings.accessibility.shortcuts.TwoFingerDoubleTapShortcutOptionController" />
 
     <Preference
         android:icon="@drawable/ic_keyboard_arrow_down"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 9a5f039..b1ebbb8 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -776,12 +776,6 @@
             android:title="@string/enable_notes_role_title"
             android:summary="@string/enable_notes_role_summary" />
 
-        <Preference
-            android:key="quarantined_apps"
-            android:title="@string/quarantined_apps_title"
-            settings:controller="com.android.settings.development.quarantine.QuarantinedAppsPreferenceController"
-            android:fragment="com.android.settings.development.quarantine.QuarantinedAppsFragment" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 1e43ef0..adb84b6 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -18,9 +18,8 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="mobile_network_pref_screen">
 
-    <com.android.settings.widget.SettingsMainSwitchPreference
+    <com.android.settings.spa.preference.ComposePreference
         android:key="use_sim_switch"
-        android:title="@string/mobile_network_use_sim_on"
         settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>
 
     <PreferenceCategory
diff --git a/res/xml/quarantined_apps.xml b/res/xml/quarantined_apps.xml
deleted file mode 100644
index 69a90d6..0000000
--- a/res/xml/quarantined_apps.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2023 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="quarantined_apps_screen"
-    android:title="@string/quarantined_apps_title"
-    settings:controller="com.android.settings.development.quarantine.QuarantinedAppsScreenController"
-    settings:searchable="true">
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/user_aspect_ratio_details.xml b/res/xml/user_aspect_ratio_details.xml
index 44a7589..24c3271 100644
--- a/res/xml/user_aspect_ratio_details.xml
+++ b/res/xml/user_aspect_ratio_details.xml
@@ -28,7 +28,8 @@
         settings:searchable="false"/>
 
     <com.android.settingslib.widget.ActionButtonsPreference
-        android:key="header_view" />
+        android:key="header_view"
+        android:order="-999"/>
 
     <com.android.settings.applications.appcompat.RadioWithImagePreference
         android:key="app_default_pref"
diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 1a53b83..c0d2445 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -30,6 +30,7 @@
 import com.android.settings.core.instrumentation.ElapsedTimeUtils;
 import com.android.settings.fuelgauge.BatterySettingsStorage;
 import com.android.settings.homepage.SettingsHomepageActivity;
+import com.android.settings.localepicker.LocaleNotificationDataManager;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.FeatureFactoryImpl;
 import com.android.settings.spa.SettingsSpaEnvironment;
@@ -56,7 +57,10 @@
     public void onCreate() {
         super.onCreate();
 
-        BackupRestoreStorageManager.getInstance(this).add(new BatterySettingsStorage(this));
+        BackupRestoreStorageManager.getInstance(this)
+                .add(
+                        new BatterySettingsStorage(this),
+                        LocaleNotificationDataManager.getSharedPreferencesStorage(this));
 
         // Add null checking to avoid test case failed.
         if (getApplicationContext() != null) {
diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java
index c0c0777..297bad7 100644
--- a/src/com/android/settings/SettingsInitialize.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -118,7 +118,8 @@
     }
 
     private void privateProfileSetup(Context context, PackageManager pm, UserInfo userInfo) {
-        if (Flags.allowPrivateProfile()) {
+        if (Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             if (userInfo == null || !userInfo.isPrivateProfile()) {
                 return;
             }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 108e331..6e36ee3 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1228,6 +1228,7 @@
             UserProperties userProperties = userManager.getUserProperties(userHandle);
             if (userProperties.getShowInSettings() == UserProperties.SHOW_IN_SETTINGS_SEPARATE) {
                 if (Flags.allowPrivateProfile()
+                        && android.multiuser.Flags.enablePrivateSpaceFeatures()
                         && userProperties.getShowInQuietMode()
                         == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN) {
                     if (!userManager.isQuietModeEnabled(userHandle)) {
diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
index 1f71ab0..4b394a0 100644
--- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
@@ -414,7 +414,7 @@
 
     private static TutorialPage createTwoFingerTripleTapTutorialPage(@NonNull Context context) {
         // TODO(b/308088945): Update tutorial string and image when UX provides them
-        final int type = UserShortcutType.TWOFINGERTRIPLETAP;
+        final int type = UserShortcutType.TWOFINGER_DOUBLETAP;
         final CharSequence title =
                 context.getText(R.string.accessibility_tutorial_dialog_title_two_finger_double);
         final View image =
@@ -429,10 +429,32 @@
         return new TutorialPage(type, title, image, indicatorIcon, instruction);
     }
 
+    private static TutorialPage createQuickSettingTutorialPage(@NonNull Context context) {
+        final int type = UserShortcutType.QUICK_SETTINGS;
+        final CharSequence title =
+                context.getText(R.string.accessibility_tutorial_dialog_title_quick_setting);
+        final View image =
+                createIllustrationView(context,
+                        R.drawable.a11y_shortcut_type_quick_settings);
+        final CharSequence instruction =
+                context.getText(R.string.accessibility_tutorial_dialog_message_quick_setting);
+        final ImageView indicatorIcon =
+                createImageView(context, R.drawable.ic_accessibility_page_indicator);
+        indicatorIcon.setEnabled(false);
+
+        return new TutorialPage(type, title, image, indicatorIcon, instruction);
+    }
+
     @VisibleForTesting
     static List<TutorialPage> createShortcutTutorialPages(@NonNull Context context,
             int shortcutTypes) {
         final List<TutorialPage> tutorialPages = new ArrayList<>();
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if ((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
+                    == UserShortcutType.QUICK_SETTINGS) {
+                tutorialPages.add(createQuickSettingTutorialPage(context));
+            }
+        }
         if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             tutorialPages.add(createSoftwareTutorialPage(context));
         }
@@ -446,8 +468,8 @@
         }
 
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if ((shortcutTypes & UserShortcutType.TWOFINGERTRIPLETAP)
-                    == UserShortcutType.TWOFINGERTRIPLETAP) {
+            if ((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
+                    == UserShortcutType.TWOFINGER_DOUBLETAP) {
                 tutorialPages.add(createTwoFingerTripleTapTutorialPage(context));
             }
         }
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 09a691e..8af284d 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -452,7 +452,13 @@
                 getComponentName().flattenToString());
 
         final List<CharSequence> list = new ArrayList<>();
-
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if (hasShortcutType(shortcutTypes, AccessibilityUtil.UserShortcutType.QUICK_SETTINGS)) {
+                final CharSequence qsTitle = context.getText(
+                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
+                list.add(qsTitle);
+            }
+        }
         if (hasShortcutType(shortcutTypes, AccessibilityUtil.UserShortcutType.SOFTWARE)) {
             list.add(getSoftwareShortcutTypeSummary(context));
         }
@@ -538,6 +544,10 @@
     }
 
     private void showQuickSettingsTooltipIfNeeded() {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            // Don't show Quick Settings tooltip
+            return;
+        }
         final ComponentName tileComponentName = getTileComponentName();
         if (tileComponentName == null) {
             // Returns if no tile service assigned.
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index 3b81bdb..afc7b84 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -28,6 +28,7 @@
 import android.graphics.Insets;
 import android.graphics.Rect;
 import android.os.Build;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -40,8 +41,11 @@
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 
+import com.android.internal.accessibility.util.ShortcutUtils;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Set;
 import java.util.StringJoiner;
 
 /** Provides utility methods to accessibility settings only. */
@@ -87,6 +91,10 @@
      * choose accessibility shortcut as preferred shortcut.
      * {@code TRIPLETAP} for displaying specifying magnification to be toggled via quickly
      * tapping screen 3 times as preferred shortcut.
+     * {@code TWOFINGER_DOUBLETAP} for displaying specifying magnification to be toggled via
+     * quickly tapping screen 2 times with two fingers as preferred shortcut.
+     * {@code QUICK_SETTINGS} for displaying specifying the accessibility services or features which
+     * choose Quick Settings as preferred shortcut.
      */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
@@ -94,16 +102,18 @@
             UserShortcutType.SOFTWARE,
             UserShortcutType.HARDWARE,
             UserShortcutType.TRIPLETAP,
-            UserShortcutType.TWOFINGERTRIPLETAP,
+            UserShortcutType.TWOFINGER_DOUBLETAP,
+            UserShortcutType.QUICK_SETTINGS,
     })
 
     /** Denotes the user shortcut type. */
     public @interface UserShortcutType {
         int EMPTY = 0;
-        int SOFTWARE = 1; // 1 << 0
-        int HARDWARE = 2; // 1 << 1
-        int TRIPLETAP = 4; // 1 << 2
-        int TWOFINGERTRIPLETAP = 8; // 1 << 3
+        int SOFTWARE = 1;
+        int HARDWARE = 1 << 1;
+        int TRIPLETAP = 1 << 2;
+        int TWOFINGER_DOUBLETAP = 1 << 3;
+        int QUICK_SETTINGS = 1 << 4;
     }
 
     /**
@@ -200,12 +210,26 @@
      * Opts in component name into multiple {@code shortcutTypes} colon-separated string in
      * Settings.
      *
-     * @param context The current context.
-     * @param shortcutTypes  A combination of {@link UserShortcutType}.
+     * @param context       The current context.
+     * @param shortcutTypes A combination of {@link UserShortcutType}.
      * @param componentName The component name that need to be opted in Settings.
      */
     static void optInAllValuesToSettings(Context context, int shortcutTypes,
             @NonNull ComponentName componentName) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(
+                        /* enable= */ true,
+                        shortcutTypes,
+                        Set.of(componentName.flattenToString()),
+                        UserHandle.myUserId()
+                );
+            }
+
+            return;
+        }
+
         if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             optInValueToSettings(context, UserShortcutType.SOFTWARE, componentName);
         }
@@ -217,13 +241,26 @@
     /**
      * Opts in component name into {@code shortcutType} colon-separated string in Settings.
      *
-     * @param context The current context.
-     * @param shortcutType The preferred shortcut type user selected.
+     * @param context       The current context.
+     * @param shortcutType  The preferred shortcut type user selected.
      * @param componentName The component name that need to be opted in Settings.
      */
     @VisibleForTesting
     static void optInValueToSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(
+                        /* enable= */ true,
+                        shortcutType,
+                        Set.of(componentName.flattenToString()),
+                        UserHandle.myUserId()
+                );
+            }
+            return;
+        }
+
         final String targetKey = convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
                 targetKey);
@@ -245,12 +282,25 @@
      * Opts out component name into multiple {@code shortcutTypes} colon-separated string in
      * Settings.
      *
-     * @param context The current context.
+     * @param context       The current context.
      * @param shortcutTypes A combination of {@link UserShortcutType}.
      * @param componentName The component name that need to be opted out from Settings.
      */
     static void optOutAllValuesFromSettings(Context context, int shortcutTypes,
             @NonNull ComponentName componentName) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(
+                        /* enable= */ false,
+                        shortcutTypes,
+                        Set.of(componentName.flattenToString()),
+                        UserHandle.myUserId()
+                );
+            }
+            return;
+        }
+
         if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             optOutValueFromSettings(context, UserShortcutType.SOFTWARE, componentName);
         }
@@ -262,13 +312,26 @@
     /**
      * Opts out component name into {@code shortcutType} colon-separated string in Settings.
      *
-     * @param context The current context.
-     * @param shortcutType The preferred shortcut type user selected.
+     * @param context       The current context.
+     * @param shortcutType  The preferred shortcut type user selected.
      * @param componentName The component name that need to be opted out from Settings.
      */
     @VisibleForTesting
     static void optOutValueFromSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(
+                        /* enable= */ false,
+                        shortcutType,
+                        Set.of(componentName.flattenToString()),
+                        UserHandle.myUserId()
+                );
+            }
+            return;
+        }
+
         final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
         final String targetKey = convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
@@ -307,6 +370,14 @@
         if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
             exist |= hasValueInSettings(context, UserShortcutType.HARDWARE, componentName);
         }
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if ((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
+                    == UserShortcutType.QUICK_SETTINGS) {
+                exist |= hasValueInSettings(context, UserShortcutType.QUICK_SETTINGS,
+                        componentName);
+            }
+        }
+
         return exist;
     }
 
@@ -321,6 +392,12 @@
     @VisibleForTesting
     static boolean hasValueInSettings(Context context, @UserShortcutType int shortcutType,
             @NonNull ComponentName componentName) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            return ShortcutUtils.getShortcutTargetsFromSettings(
+                    context, shortcutType, UserHandle.myUserId()
+            ).contains(componentName.flattenToString());
+        }
+
         final String targetKey = convertKeyFromSettings(shortcutType);
         final String targetString = Settings.Secure.getString(context.getContentResolver(),
                 targetKey);
@@ -357,6 +434,12 @@
         if (hasValuesInSettings(context, UserShortcutType.HARDWARE, componentName)) {
             shortcutTypes |= UserShortcutType.HARDWARE;
         }
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if (hasValuesInSettings(context, UserShortcutType.QUICK_SETTINGS, componentName)) {
+                shortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+            }
+        }
+
         return shortcutTypes;
     }
 
@@ -367,6 +450,10 @@
      * @return Mapping key in Settings.
      */
     static String convertKeyFromSettings(@UserShortcutType int shortcutType) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            return ShortcutUtils.convertToKey(shortcutType);
+        }
+
         switch (shortcutType) {
             case UserShortcutType.SOFTWARE:
                 return Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
diff --git a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
index 869443c..58aa0cc 100644
--- a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
+++ b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
@@ -47,7 +47,7 @@
 
 
 /**
- *  A preference controller to turn on/off keyboard vibration state with a single toggle.
+ * A preference controller to turn on/off keyboard vibration state with a single toggle.
  */
 public class KeyboardVibrationTogglePreferenceController extends TogglePreferenceController
         implements DefaultLifecycleObserver {
@@ -110,7 +110,9 @@
     @Override
     public int getAvailabilityStatus() {
         if (Flags.keyboardCategoryEnabled()
-                && mContext.getResources().getBoolean(R.bool.config_keyboard_vibration_supported)) {
+                && mContext.getResources().getBoolean(R.bool.config_keyboard_vibration_supported)
+                && mContext.getResources().getFloat(
+                com.android.internal.R.dimen.config_keyboardHapticFeedbackFixedAmplitude) > 0) {
             return AVAILABLE;
         }
         return UNSUPPORTED_ON_DEVICE;
diff --git a/src/com/android/settings/accessibility/PreferredShortcuts.java b/src/com/android/settings/accessibility/PreferredShortcuts.java
index e76bc9b..e166f38 100644
--- a/src/com/android/settings/accessibility/PreferredShortcuts.java
+++ b/src/com/android/settings/accessibility/PreferredShortcuts.java
@@ -21,8 +21,10 @@
 import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.util.ArrayMap;
+import android.view.accessibility.Flags;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.internal.accessibility.util.ShortcutUtils;
@@ -98,6 +100,11 @@
             @NonNull Context context, @NonNull Set<String> components) {
         final Map<Integer, Set<String>> shortcutTypeToTargets = new ArrayMap<>();
         for (int shortcutType : ShortcutConstants.USER_SHORTCUT_TYPES) {
+            if (!Flags.a11yQsShortcut()
+                    && shortcutType == ShortcutConstants.UserShortcutType.QUICK_SETTINGS) {
+                // Skip saving quick setting as preferred shortcut option when flag is not enabled
+                continue;
+            }
             shortcutTypeToTargets.put(
                     shortcutType,
                     ShortcutUtils.getShortcutTargetsFromSettings(
@@ -138,6 +145,11 @@
         return context.getSharedPreferences(ACCESSIBILITY_PERF, Context.MODE_PRIVATE);
     }
 
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    static void clearPreferredShortcuts(Context context) {
+        getSharedPreferences(context).edit().clear().apply();
+    }
+
     /**
      * Returns the default shortcut types for the given accessibility feature.
      */
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index e7835f8..6d5f536 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -711,6 +711,13 @@
                 mComponentName.flattenToString());
 
         final List<CharSequence> list = new ArrayList<>();
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if (hasShortcutType(shortcutTypes, UserShortcutType.QUICK_SETTINGS)) {
+                final CharSequence qsTitle = context.getText(
+                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
+                list.add(qsTitle);
+            }
+        }
         if (hasShortcutType(shortcutTypes, UserShortcutType.SOFTWARE)) {
             list.add(getSoftwareShortcutTypeSummary(context));
         }
@@ -906,6 +913,10 @@
     }
 
     private void showQuickSettingsTooltipIfNeeded() {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            // Don't show Quick Settings tooltip
+            return;
+        }
         final ComponentName tileComponentName = getTileComponentName();
         if (tileComponentName == null) {
             // Returns if no tile service assigned.
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 985d45d..6ef764e 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -33,6 +33,7 @@
 import android.icu.text.MessageFormat;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.provider.DeviceConfig;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -65,6 +66,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.StringJoiner;
 
 /**
@@ -357,7 +359,7 @@
         }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
             if (mTwoFingerTripleTapTypeCheckBox.isChecked()) {
-                value |= UserShortcutType.TWOFINGERTRIPLETAP;
+                value |= UserShortcutType.TWOFINGER_DOUBLETAP;
             }
         }
         return value;
@@ -419,7 +421,7 @@
                 hasShortcutType(value, UserShortcutType.TRIPLETAP));
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
             mTwoFingerTripleTapTypeCheckBox.setChecked(
-                    hasShortcutType(value, UserShortcutType.TWOFINGERTRIPLETAP));
+                    hasShortcutType(value, UserShortcutType.TWOFINGER_DOUBLETAP));
         }
     }
 
@@ -483,6 +485,13 @@
                 MAGNIFICATION_CONTROLLER_NAME);
 
         final List<CharSequence> list = new ArrayList<>();
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if (hasShortcutType(shortcutTypes, UserShortcutType.QUICK_SETTINGS)) {
+                final CharSequence qsTitle = context.getText(
+                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings);
+                list.add(qsTitle);
+            }
+        }
         if (hasShortcutType(shortcutTypes, UserShortcutType.SOFTWARE)) {
             list.add(getSoftwareShortcutTypeSummary(context));
         }
@@ -497,7 +506,7 @@
             list.add(tripleTapTitle);
         }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (hasShortcutType(shortcutTypes, UserShortcutType.TWOFINGERTRIPLETAP)) {
+            if (hasShortcutType(shortcutTypes, UserShortcutType.TWOFINGER_DOUBLETAP)) {
                 final CharSequence twoFingerTripleTapTitle = context.getText(
                         R.string.accessibility_shortcut_two_finger_double_tap_keyword);
                 list.add(twoFingerTripleTapTitle);
@@ -678,15 +687,34 @@
             optInMagnificationValueToSettings(context, UserShortcutType.TRIPLETAP);
         }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (((shortcutTypes & UserShortcutType.TWOFINGERTRIPLETAP)
-                    == UserShortcutType.TWOFINGERTRIPLETAP)) {
-                optInMagnificationValueToSettings(context, UserShortcutType.TWOFINGERTRIPLETAP);
+            if (((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
+                    == UserShortcutType.TWOFINGER_DOUBLETAP)) {
+                optInMagnificationValueToSettings(context, UserShortcutType.TWOFINGER_DOUBLETAP);
+            }
+        }
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if (((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
+                    == UserShortcutType.QUICK_SETTINGS)) {
+                optInMagnificationValueToSettings(context, UserShortcutType.QUICK_SETTINGS);
             }
         }
     }
 
-    private static void optInMagnificationValueToSettings(Context context,
-            @UserShortcutType int shortcutType) {
+    private static void optInMagnificationValueToSettings(
+            Context context, @UserShortcutType int shortcutType) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(
+                        /* enable= */ true,
+                        shortcutType,
+                        Set.of(MAGNIFICATION_CONTROLLER_NAME),
+                        UserHandle.myUserId()
+                );
+            }
+            return;
+        }
+
         if (shortcutType == UserShortcutType.TRIPLETAP) {
             Settings.Secure.putInt(context.getContentResolver(),
                     Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
@@ -694,8 +722,9 @@
         }
 
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (shortcutType == UserShortcutType.TWOFINGERTRIPLETAP) {
-                Settings.Secure.putInt(context.getContentResolver(),
+            if (shortcutType == UserShortcutType.TWOFINGER_DOUBLETAP) {
+                Settings.Secure.putInt(
+                        context.getContentResolver(),
                         Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
                         ON);
                 return;
@@ -743,15 +772,34 @@
             optOutMagnificationValueFromSettings(context, UserShortcutType.TRIPLETAP);
         }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (((shortcutTypes & UserShortcutType.TWOFINGERTRIPLETAP)
-                    == UserShortcutType.TWOFINGERTRIPLETAP)) {
-                optOutMagnificationValueFromSettings(context, UserShortcutType.TWOFINGERTRIPLETAP);
+            if (((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
+                    == UserShortcutType.TWOFINGER_DOUBLETAP)) {
+                optOutMagnificationValueFromSettings(context, UserShortcutType.TWOFINGER_DOUBLETAP);
+            }
+        }
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            if (((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
+                    == UserShortcutType.QUICK_SETTINGS)) {
+                optOutMagnificationValueFromSettings(context, UserShortcutType.QUICK_SETTINGS);
             }
         }
     }
 
     private static void optOutMagnificationValueFromSettings(Context context,
             @UserShortcutType int shortcutType) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = context.getSystemService(AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(
+                        /* enable= */ false,
+                        shortcutType,
+                        Set.of(MAGNIFICATION_CONTROLLER_NAME),
+                        UserHandle.myUserId()
+                );
+            }
+            return;
+        }
+
         if (shortcutType == UserShortcutType.TRIPLETAP) {
             Settings.Secure.putInt(context.getContentResolver(),
                     Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
@@ -759,8 +807,9 @@
         }
 
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (shortcutType == UserShortcutType.TWOFINGERTRIPLETAP) {
-                Settings.Secure.putInt(context.getContentResolver(),
+            if (shortcutType == UserShortcutType.TWOFINGER_DOUBLETAP) {
+                Settings.Secure.putInt(
+                        context.getContentResolver(),
                         Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
                         OFF);
                 return;
@@ -803,10 +852,10 @@
             exist |= hasMagnificationValueInSettings(context, UserShortcutType.TRIPLETAP);
         }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (((shortcutTypes & UserShortcutType.TWOFINGERTRIPLETAP)
-                    == UserShortcutType.TWOFINGERTRIPLETAP)) {
+            if (((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
+                    == UserShortcutType.TWOFINGER_DOUBLETAP)) {
                 exist |= hasMagnificationValueInSettings(context,
-                        UserShortcutType.TWOFINGERTRIPLETAP);
+                        UserShortcutType.TWOFINGER_DOUBLETAP);
             }
         }
         return exist;
@@ -820,7 +869,7 @@
         }
 
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (shortcutType == UserShortcutType.TWOFINGERTRIPLETAP) {
+            if (shortcutType == UserShortcutType.TWOFINGER_DOUBLETAP) {
                 return Settings.Secure.getInt(context.getContentResolver(),
                         Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
                         OFF) == ON;
@@ -857,8 +906,8 @@
             shortcutTypes |= UserShortcutType.TRIPLETAP;
         }
         if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
-            if (hasMagnificationValuesInSettings(context, UserShortcutType.TWOFINGERTRIPLETAP)) {
-                shortcutTypes |= UserShortcutType.TWOFINGERTRIPLETAP;
+            if (hasMagnificationValuesInSettings(context, UserShortcutType.TWOFINGER_DOUBLETAP)) {
+                shortcutTypes |= UserShortcutType.TWOFINGER_DOUBLETAP;
             }
         }
         return shortcutTypes;
diff --git a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index aba342a..976fffb 100644
--- a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -21,6 +21,7 @@
 import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
 import static android.provider.Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
 import static android.provider.Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED;
+import static android.provider.Settings.Secure.ACCESSIBILITY_QS_TARGETS;
 import static android.provider.Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
 
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
@@ -98,6 +99,9 @@
     private static final Uri TWO_FINGERS_DOUBLE_TAP_SHORTCUT_SETTING =
             Settings.Secure.getUriFor(ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED);
 
+    private static final Uri QUICK_SETTINGS_SHORTCUT_SETTING =
+            Settings.Secure.getUriFor(ACCESSIBILITY_QS_TARGETS);
+
     @VisibleForTesting
     static final Uri[] SHORTCUT_SETTINGS = {
             VOLUME_KEYS_SHORTCUT_SETTING,
@@ -105,6 +109,7 @@
             BUTTON_SHORTCUT_SETTING,
             TRIPLE_TAP_SHORTCUT_SETTING,
             TWO_FINGERS_DOUBLE_TAP_SHORTCUT_SETTING,
+            QUICK_SETTINGS_SHORTCUT_SETTING,
     };
 
     private Set<String> mShortcutTargets;
@@ -171,7 +176,9 @@
                 } else if (TRIPLE_TAP_SHORTCUT_SETTING.equals(uri)) {
                     refreshPreferenceController(TripleTapShortcutOptionController.class);
                 } else if (TWO_FINGERS_DOUBLE_TAP_SHORTCUT_SETTING.equals(uri)) {
-                    refreshPreferenceController(TwoFingersDoubleTapShortcutOptionController.class);
+                    refreshPreferenceController(TwoFingerDoubleTapShortcutOptionController.class);
+                } else if (QUICK_SETTINGS_SHORTCUT_SETTING.equals(uri)) {
+                    refreshPreferenceController(QuickSettingsShortcutOptionController.class);
                 }
 
                 PreferredShortcuts.updatePreferredShortcutsFromSettings(
diff --git a/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java
new file mode 100644
index 0000000..27f6bc9
--- /dev/null
+++ b/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionController.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility.shortcuts;
+
+import static com.android.internal.accessibility.common.ShortcutConstants.AccessibilityFragmentType.INVISIBLE_TOGGLE;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserHandle;
+import android.service.quicksettings.TileService;
+import android.util.ArraySet;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.accessibility.common.ShortcutConstants;
+import com.android.internal.accessibility.util.AccessibilityUtils;
+import com.android.settings.R;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A controller handles displaying the quick settings shortcut option preference and
+ * configuring the shortcut.
+ */
+public class QuickSettingsShortcutOptionController extends ShortcutOptionPreferenceController {
+    public QuickSettingsShortcutOptionController(
+            @NonNull Context context, @NonNull String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @ShortcutConstants.UserShortcutType
+    @Override
+    protected int getShortcutType() {
+        return ShortcutConstants.UserShortcutType.QUICK_SETTINGS;
+    }
+
+    @Override
+    public void displayPreference(@NonNull PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        if (preference instanceof ShortcutOptionPreference shortcutOptionPreference) {
+            shortcutOptionPreference.setTitle(
+                    R.string.accessibility_shortcut_edit_dialog_title_quick_settings);
+            shortcutOptionPreference.setSummary(
+                    R.string.accessibility_shortcut_edit_dialog_summary_quick_settings);
+            shortcutOptionPreference.setIntroImageResId(
+                    R.drawable.a11y_shortcut_type_quick_settings);
+        }
+    }
+
+    @Override
+    protected boolean isShortcutAvailable() {
+        return Flags.a11yQsShortcut()
+                && TileService.isQuickSettingsSupported()
+                && allTargetsHasQsTile()
+                && allTargetsHasValidQsTileUseCase();
+    }
+
+    private boolean allTargetsHasQsTile() {
+        AccessibilityManager accessibilityManager = mContext.getSystemService(
+                AccessibilityManager.class);
+        if (accessibilityManager == null) {
+            return false;
+        }
+
+        Map<ComponentName, ComponentName> a11yFeatureToTileMap =
+                accessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId());
+        if (a11yFeatureToTileMap.isEmpty()) {
+            return false;
+        }
+        for (String target : getShortcutTargets()) {
+            ComponentName targetComponentName = ComponentName.unflattenFromString(target);
+            if (!a11yFeatureToTileMap.containsKey(targetComponentName)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns true if all targets have valid QS Tile shortcut use case.
+     *
+     * <p>
+     * Note: We don't want to promote the qs option in the edit shortcuts screen for
+     * a standard AccessibilityService, because the Tile is provided by the owner of the
+     * AccessibilityService, and they don't have control to enable the A11yService themselves
+     * which makes the TileService not acting as the other a11y shortcut like FAB where the user
+     * can turn on/off the feature by toggling the shortcut.
+     *
+     * A standard AccessibilityService normally won't create a TileService because the
+     * above mentioned reason. In any case where the standard AccessibilityService provides a tile,
+     * we'll hide it from the Setting's UI.
+     * </p>
+     */
+    private boolean allTargetsHasValidQsTileUseCase() {
+        AccessibilityManager accessibilityManager = mContext.getSystemService(
+                AccessibilityManager.class);
+        if (accessibilityManager == null) {
+            return false;
+        }
+
+        List<AccessibilityServiceInfo> installedServices =
+                accessibilityManager.getInstalledAccessibilityServiceList();
+        final Set<String> standardA11yServices = new ArraySet<>();
+        for (AccessibilityServiceInfo serviceInfo : installedServices) {
+            if (AccessibilityUtils.getAccessibilityServiceFragmentType(serviceInfo)
+                    != INVISIBLE_TOGGLE) {
+                standardA11yServices.add(serviceInfo.getComponentName().flattenToString());
+            }
+        }
+
+        for (String target : getShortcutTargets()) {
+            if (standardA11yServices.contains(target)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java
index 4d35554..defb256 100644
--- a/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java
+++ b/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceController.java
@@ -18,6 +18,8 @@
 
 import android.content.Context;
 import android.os.UserHandle;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
 
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
@@ -116,6 +118,16 @@
         Set<String> shortcutTargets = getShortcutTargets();
         @ShortcutConstants.UserShortcutType int shortcutType = getShortcutType();
 
+        if (Flags.a11yQsShortcut()) {
+            AccessibilityManager a11yManager = mContext.getSystemService(
+                    AccessibilityManager.class);
+            if (a11yManager != null) {
+                a11yManager.enableShortcutsForTargets(enable, shortcutType, shortcutTargets,
+                        UserHandle.myUserId());
+            }
+            return;
+        }
+
         if (enable) {
             for (String target : shortcutTargets) {
                 ShortcutUtils.optInValueToSettings(mContext, shortcutType, target);
diff --git a/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java b/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
index 24098c8..861bebd 100644
--- a/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
+++ b/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceController.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.provider.Settings;
 import android.view.View;
+import android.view.accessibility.Flags;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.settings.R;
@@ -65,6 +66,9 @@
     @Override
     protected void enableShortcutForTargets(boolean enable) {
         super.enableShortcutForTargets(enable);
+        if (Flags.a11yQsShortcut()) {
+            return;
+        }
 
         if (enable) {
             // Update the A11y FAB size to large when the Magnification shortcut is enabled
diff --git a/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
index 0eb1ee5..e43aeb2 100644
--- a/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionController.java
@@ -21,6 +21,7 @@
 import android.content.Context;
 import android.icu.text.MessageFormat;
 import android.provider.Settings;
+import android.view.accessibility.Flags;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -105,6 +106,11 @@
 
     @Override
     protected void enableShortcutForTargets(boolean enable) {
+        if (Flags.a11yQsShortcut()) {
+            super.enableShortcutForTargets(enable);
+            return;
+        }
+
         Settings.Secure.putInt(
                 mContext.getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
diff --git a/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java
similarity index 90%
rename from src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java
rename to src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java
index 64ed7bd..83ba6e4 100644
--- a/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionController.java
@@ -36,17 +36,17 @@
  * A controller handles displaying the two fingers double tap shortcut option preference and
  * configuring the shortcut.
  */
-public class TwoFingersDoubleTapShortcutOptionController
+public class TwoFingerDoubleTapShortcutOptionController
         extends ShortcutOptionPreferenceController {
 
-    public TwoFingersDoubleTapShortcutOptionController(Context context, String preferenceKey) {
+    public TwoFingerDoubleTapShortcutOptionController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
 
     @ShortcutConstants.UserShortcutType
     @Override
     protected int getShortcutType() {
-        return ShortcutConstants.UserShortcutType.TRIPLETAP;
+        return ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP;
     }
 
     @Override
@@ -90,6 +90,10 @@
 
     @Override
     protected void enableShortcutForTargets(boolean enable) {
+        if (android.view.accessibility.Flags.a11yQsShortcut()) {
+            super.enableShortcutForTargets(enable);
+            return;
+        }
         Settings.Secure.putInt(
                 mContext.getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
diff --git a/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java b/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
index 9083e7c..e8e261c 100644
--- a/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
+++ b/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionController.java
@@ -17,6 +17,7 @@
 package com.android.settings.accessibility.shortcuts;
 
 import android.content.Context;
+import android.view.accessibility.Flags;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -64,6 +65,10 @@
     @Override
     protected void enableShortcutForTargets(boolean enable) {
         super.enableShortcutForTargets(enable);
+        if (Flags.a11yQsShortcut()) {
+            return;
+        }
+
         if (enable) {
             AccessibilityUtil.skipVolumeShortcutDialogTimeoutRestriction(mContext);
         }
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 2d862d6..4f03303 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -311,11 +311,10 @@
                 // should be shown or not.
                 if (((profile.isManagedProfile()
                         && (mType & ProfileSelectFragment.ProfileType.WORK) != 0)
-                        || (Flags.allowPrivateProfile()
-                            && profile.isPrivateProfile()
+                        || (isPrivateProfile(profile)
                             && (mType & ProfileSelectFragment.ProfileType.PRIVATE) != 0)
                         || (!profile.isManagedProfile()
-                            && !(Flags.allowPrivateProfile() && profile.isPrivateProfile())
+                            && !isPrivateProfile(profile)
                             && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0))
                         && !(mUm.getUserProperties(profile.getUserHandle())
                             .getShowInQuietMode() == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN
@@ -338,6 +337,12 @@
         mFragment.forceUpdatePreferences();
     }
 
+    private static boolean isPrivateProfile(UserInfo profile) {
+        return Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                && profile.isPrivateProfile();
+    }
+
     private void updateProfileUi(final UserInfo userInfo) {
         if (mFragment.getPreferenceManager() == null) {
             return;
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index ef054df..cbc5a7b 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -66,7 +66,8 @@
     private static final String TAG = UserAspectRatioDetails.class.getSimpleName();
 
     private static final String KEY_HEADER_SUMMARY = "app_aspect_ratio_summary";
-    private static final String KEY_HEADER_BUTTONS = "header_view";
+    @VisibleForTesting
+    static final String KEY_HEADER_BUTTONS = "header_view";
 
     private static final String KEY_PREF_HALF_SCREEN = "half_screen_pref";
     private static final String KEY_PREF_DISPLAY_SIZE = "display_size_pref";
@@ -237,6 +238,7 @@
             return;
         }
         pref.setTitle(mUserAspectRatioManager.getAccessibleEntry(aspectRatio, mPackageName));
+        pref.setOrder(getAspectRatioManager().getUserMinAspectRatioOrder(aspectRatio));
         pref.setOnClickListener(this);
         mKeyToAspectRatioMap.put(key, aspectRatio);
         mAspectRatioPreferences.add(pref);
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java b/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
index 3bf6109..0550a9a 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioManager.java
@@ -44,6 +44,7 @@
 import android.os.UserHandle;
 import android.provider.DeviceConfig;
 import android.util.ArrayMap;
+import android.util.SparseIntArray;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -76,6 +77,7 @@
     /** Apps that have launcher entry defined in manifest */
     private final Map<Integer, String> mUserAspectRatioMap;
     private final Map<Integer, CharSequence> mUserAspectRatioA11yMap;
+    private final SparseIntArray mUserAspectRatioOrder;
 
     public UserAspectRatioManager(@NonNull Context context) {
         this(context, AppGlobals.getPackageManager());
@@ -86,6 +88,7 @@
         mContext = context;
         mIPm = pm;
         mUserAspectRatioA11yMap = new ArrayMap<>();
+        mUserAspectRatioOrder = new SparseIntArray();
         mUserAspectRatioMap = getUserMinAspectRatioMapping();
     }
 
@@ -153,6 +156,14 @@
     }
 
     /**
+     * @return the order of the aspect ratio option corresponding to
+     * config_userAspectRatioOverrideValues
+     */
+    int getUserMinAspectRatioOrder(@PackageManager.UserMinAspectRatio int option) {
+        return mUserAspectRatioOrder.get(option);
+    }
+
+    /**
      * Whether user aspect ratio option is specified in
      * {@link R.array.config_userAspectRatioOverrideValues}
      * and is enabled by device config
@@ -224,7 +235,6 @@
                 && isFullscreenCompatChangeEnabled(pkgName, userId);
     }
 
-    @VisibleForTesting
     boolean isFullscreenCompatChangeEnabled(String pkgName, int userId) {
         return CompatChanges.isChangeEnabled(
                 OVERRIDE_ANY_ORIENTATION_TO_USER, pkgName, UserHandle.of(userId));
@@ -281,6 +291,7 @@
                         mUserAspectRatioA11yMap.put(aspectRatioVal, accessibleSequence);
                     }
                     userMinAspectRatioMap.put(aspectRatioVal, aspectRatioString);
+                    mUserAspectRatioOrder.put(aspectRatioVal, i);
             }
         }
         if (!userMinAspectRatioMap.containsKey(USER_MIN_ASPECT_RATIO_UNSET)) {
@@ -290,6 +301,8 @@
         if (mIsUserMinAspectRatioAppDefaultFlagEnabled) {
             userMinAspectRatioMap.put(USER_MIN_ASPECT_RATIO_APP_DEFAULT,
                     userMinAspectRatioMap.get(USER_MIN_ASPECT_RATIO_UNSET));
+            mUserAspectRatioOrder.put(USER_MIN_ASPECT_RATIO_APP_DEFAULT,
+                    mUserAspectRatioOrder.get(USER_MIN_ASPECT_RATIO_UNSET));
             if (mUserAspectRatioA11yMap.containsKey(USER_MIN_ASPECT_RATIO_UNSET)) {
                 mUserAspectRatioA11yMap.put(USER_MIN_ASPECT_RATIO_APP_DEFAULT,
                         mUserAspectRatioA11yMap.get(USER_MIN_ASPECT_RATIO_UNSET));
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index 640f21d..86c11c2 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -167,8 +167,9 @@
     }
 
     private boolean shouldSkipProfile(UserHandle profile) {
-        return  android.os.Flags.allowPrivateProfile()
+        return android.os.Flags.allowPrivateProfile()
                 && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && mUm.isQuietModeEnabled(profile)
                 && mUm.getUserProperties(profile).getShowInQuietMode()
                         == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index 0861af2..556ab72 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -16,10 +16,8 @@
 
 package com.android.settings.backup;
 
-import static com.android.settings.localepicker.LocaleNotificationDataManager.LOCALE_NOTIFICATION;
 
 import android.app.backup.BackupAgentHelper;
-import android.app.backup.SharedPreferencesBackupHelper;
 
 import com.android.settings.flags.Flags;
 import com.android.settings.onboarding.OnboardingFeatureProvider;
@@ -29,15 +27,12 @@
 
 /** Backup agent for Settings APK */
 public class SettingsBackupHelper extends BackupAgentHelper {
-    private static final String PREF_LOCALE_NOTIFICATION = "localeNotificationSharedPref";
     public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup";
 
     @Override
     public void onCreate() {
         super.onCreate();
         BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this);
-        addHelper(PREF_LOCALE_NOTIFICATION,
-                new SharedPreferencesBackupHelper(this, LOCALE_NOTIFICATION));
         if (Flags.enableSoundBackup()) {
             OnboardingFeatureProvider onboardingFeatureProvider =
                     FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index f92cfbf..26965fa 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -340,6 +340,9 @@
             final List<FingerprintSensorPropertiesInternal> props =
                     mFingerprintManager.getSensorPropertiesInternal();
             // This will need to be updated for devices with multiple fingerprint sensors
+            if (props == null || props.isEmpty()) {
+                return R.string.fingerprint_intro_error_unknown;
+            }
             final int max = props.get(0).maxEnrollmentsPerUser;
             final int numEnrolledFingerprints =
                     mFingerprintManager.getEnrolledFingerprints(mUserId).size();
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 53a5554..494ef95 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -233,13 +233,20 @@
                 return ((ViewPagerAdapter) mViewPager.getAdapter())
                         .getPositionForProfileTab(extraTab);
             }
-            final int userId = bundle.getInt(EXTRA_USER_ID, UserHandle.SYSTEM.getIdentifier());
+            final UserManager userManager = getSystemService(UserManager.class);
+            UserHandle mainUser = userManager.getMainUser();
+            if (mainUser == null) {
+                mainUser = UserHandle.SYSTEM;
+            }
+            final int userId = bundle.getInt(EXTRA_USER_ID, mainUser.getIdentifier());
             final boolean isWorkProfile = UserManager.get(activity).isManagedProfile(userId);
             if (isWorkProfile) {
                 return WORK_TAB;
             }
             UserInfo userInfo = UserManager.get(activity).getUserInfo(userId);
-            if (Flags.allowPrivateProfile() && userInfo != null && userInfo.isPrivateProfile()) {
+            if (Flags.allowPrivateProfile()
+                    && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                    && userInfo != null && userInfo.isPrivateProfile()) {
                 return PRIVATE_TAB;
             }
         }
@@ -249,7 +256,9 @@
             return WORK_TAB;
         }
         UserInfo userInfo = UserManager.get(activity).getUserInfo(intentUser);
-        if (Flags.allowPrivateProfile() && userInfo != null && userInfo.isPrivateProfile()) {
+        if (Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                && userInfo != null && userInfo.isPrivateProfile()) {
             return PRIVATE_TAB;
         }
 
@@ -260,7 +269,7 @@
         final DevicePolicyManager devicePolicyManager =
                 getContext().getSystemService(DevicePolicyManager.class);
 
-        if (Flags.allowPrivateProfile()) {
+        if (Flags.allowPrivateProfile() && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             int tabForPosition =
                     ((ViewPagerAdapter) mViewPager.getAdapter()).getTabForPosition(position);
 
@@ -321,7 +330,7 @@
             List<UserInfo> userInfos = userManager.getProfiles(UserHandle.myUserId());
 
             for (UserInfo userInfo : userInfos) {
-                if (userInfo.getUserHandle().isSystem()) {
+                if (userInfo.isMain()) {
                     fragments.add(createAndGetFragment(
                             ProfileType.PERSONAL,
                             bundle != null ? bundle : new Bundle(),
@@ -331,7 +340,9 @@
                             ProfileType.WORK,
                             bundle != null ? bundle.deepCopy() : new Bundle(),
                             workFragmentConstructor));
-                } else if (Flags.allowPrivateProfile() && userInfo.isPrivateProfile()) {
+                } else if (Flags.allowPrivateProfile()
+                        && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                        && userInfo.isPrivateProfile()) {
                     if (!privateSpaceInfoProvider.isPrivateSpaceLocked(context)) {
                         fragments.add(createAndGetFragment(
                                 ProfileType.PRIVATE,
@@ -339,7 +350,7 @@
                                 privateFragmentConstructor));
                     }
                 } else {
-                    Log.d(TAG, "Not showing tab for unsupported user");
+                    Log.d(TAG, "Not showing tab for unsupported user " + userInfo);
                 }
             }
 
diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
index c9e49f1..40d1a93 100644
--- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java
+++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java
@@ -87,6 +87,7 @@
                 return resources.getString(WORK_CATEGORY_HEADER,
                         () -> context.getString(com.android.settingslib.R.string.category_work));
             } else if (android.os.Flags.allowPrivateProfile()
+                    && android.multiuser.Flags.enablePrivateSpaceFeatures()
                     && mUserManager.getUserInfo(userId).isPrivateProfile()) {
                 return resources.getString(PRIVATE_CATEGORY_HEADER,
                         () -> context.getString(com.android.settingslib.R.string.category_private));
diff --git a/src/com/android/settings/development/quarantine/OWNERS b/src/com/android/settings/development/quarantine/OWNERS
deleted file mode 100644
index d4de31a..0000000
--- a/src/com/android/settings/development/quarantine/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-# Bug component: 316234
-
-sudheersai@google.com
-yamasani@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java b/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java
deleted file mode 100644
index 6ad1f86..0000000
--- a/src/com/android/settings/development/quarantine/QuarantinedAppPreference.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.utils.ThreadUtils;
-import com.android.settingslib.widget.AppSwitchPreference;
-
-public class QuarantinedAppPreference extends AppSwitchPreference {
-    private final AppEntry mEntry;
-    private Drawable mCacheIcon;
-
-    public QuarantinedAppPreference(Context context, AppEntry entry) {
-        super(context);
-        mEntry = entry;
-        mCacheIcon = AppUtils.getIconFromCache(mEntry);
-
-        mEntry.ensureLabel(context);
-        setKey(generateKey(mEntry));
-        if (mCacheIcon != null) {
-            setIcon(mCacheIcon);
-        } else {
-            setIcon(R.drawable.empty_icon);
-        }
-        updateState();
-    }
-
-    static String generateKey(AppEntry entry) {
-        return entry.info.packageName + "|" + entry.info.uid;
-    }
-
-    public AppEntry getEntry() {
-        return mEntry;
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        if (mCacheIcon == null) {
-            ThreadUtils.postOnBackgroundThread(() -> {
-                final Drawable icon = AppUtils.getIcon(getContext(), mEntry);
-                ThreadUtils.postOnMainThread(() -> {
-                    setIcon(icon);
-                    mCacheIcon = icon;
-                });
-            });
-        }
-        super.onBindViewHolder(holder);
-    }
-
-    void updateState() {
-        setTitle(mEntry.label);
-        setChecked((boolean) mEntry.extraInfo);
-        notifyChanged();
-    }
-}
diff --git a/src/com/android/settings/development/quarantine/QuarantinedAppStateBridge.java b/src/com/android/settings/development/quarantine/QuarantinedAppStateBridge.java
deleted file mode 100644
index 206b922..0000000
--- a/src/com/android/settings/development/quarantine/QuarantinedAppStateBridge.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserHandle;
-
-import com.android.settings.applications.AppStateBaseBridge;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
-import java.util.ArrayList;
-
-public class QuarantinedAppStateBridge extends AppStateBaseBridge {
-    private Context mContext;
-
-    public QuarantinedAppStateBridge(Context context,
-            ApplicationsState appState, Callback callback) {
-        super(appState, callback);
-        mContext = context;
-    }
-
-    @Override
-    protected void loadAllExtraInfo() {
-        final ArrayList<AppEntry> apps = mAppSession.getAllApps();
-        for (int i = 0; i < apps.size(); i++) {
-            final AppEntry app = apps.get(i);
-            updateExtraInfo(app, app.info.packageName, app.info.uid);
-        }
-    }
-
-    @Override
-    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
-        app.extraInfo = isPackageQuarantined(pkg, uid);
-    }
-
-    private boolean isPackageQuarantined(String pkg, int uid) {
-        final PackageManager pm = mContext.createContextAsUser(
-                UserHandle.getUserHandleForUid(uid), 0).getPackageManager();
-        try {
-            return pm.isPackageQuarantined(pkg);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-}
diff --git a/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java b/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java
deleted file mode 100644
index 985e962..0000000
--- a/src/com/android/settings/development/quarantine/QuarantinedAppsFragment.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import static android.view.MenuItem.SHOW_AS_ACTION_ALWAYS;
-import static android.view.MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW;
-
-import android.app.settings.SettingsEnums;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.SearchView;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.applications.AppIconCacheManager;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppFilter;
-import com.android.settingslib.search.SearchIndexable;
-
-import com.google.android.material.appbar.AppBarLayout;
-
-// TODO: b/297934650 - Update this to use SPA framework
-@SearchIndexable
-public class QuarantinedAppsFragment extends DashboardFragment implements
-        SearchView.OnQueryTextListener, SearchView.OnCloseListener,
-        MenuItem.OnActionExpandListener {
-    private static final String TAG = "QuarantinedApps";
-
-    private static final int MENU_SEARCH_APPS = Menu.FIRST + 42;
-    private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 43;
-    private static final String EXTRA_SHOW_SYSTEM = "show_system";
-
-    private boolean mShowSystem;
-    private SearchView mSearchView;
-    private String mCurQuery;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        mShowSystem = icicle != null && icicle.getBoolean(EXTRA_SHOW_SYSTEM);
-        use(QuarantinedAppsScreenController.class).setFilter(mCustomFilter);
-        use(QuarantinedAppsScreenController.class).setSession(getSettingsLifecycle());
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        mSearchView = new SearchView(getContext());
-        mSearchView.setOnQueryTextListener(this);
-        mSearchView.setOnCloseListener(this);
-        mSearchView.setIconifiedByDefault(true);
-
-        menu.add(Menu.NONE, MENU_SEARCH_APPS, Menu.NONE, R.string.search_settings)
-                .setIcon(R.drawable.ic_find_in_page_24px)
-                .setActionView(mSearchView)
-                .setOnActionExpandListener(this)
-                .setShowAsAction(SHOW_AS_ACTION_ALWAYS | SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
-        menu.add(Menu.NONE, MENU_SHOW_SYSTEM, Menu.NONE,
-                mShowSystem ? R.string.menu_hide_system : R.string.menu_show_system);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == MENU_SHOW_SYSTEM) {
-            mShowSystem = !mShowSystem;
-            item.setTitle(mShowSystem ? R.string.menu_hide_system : R.string.menu_show_system);
-            use(QuarantinedAppsScreenController.class).setFilter(mCustomFilter);
-            use(QuarantinedAppsScreenController.class).rebuild();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public boolean onQueryTextChange(String newText) {
-        mCurQuery = !TextUtils.isEmpty(newText) ? newText : null;
-        use(QuarantinedAppsScreenController.class).rebuild();
-        return true;
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        // Don't care about this.
-        return true;
-    }
-
-    @Override
-    public boolean onClose() {
-        if (!TextUtils.isEmpty(mSearchView.getQuery())) {
-            mSearchView.setQuery(null, true);
-        }
-        return true;
-    }
-
-    public final AppFilter mCustomFilter = new AppFilter() {
-        @Override
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(ApplicationsState.AppEntry entry) {
-            final AppFilter defaultFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
-                    : ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;
-            return defaultFilter.filterApp(entry) && (mCurQuery == null
-                    || entry.label.toLowerCase().contains(mCurQuery.toLowerCase()));
-        }
-    };
-
-    @Override
-    public boolean onMenuItemActionExpand(MenuItem item) {
-        final AppBarLayout mAppBarLayout = getActivity().findViewById(R.id.app_bar);
-        // To prevent a large space on tool bar.
-        mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
-        return true;
-    }
-
-    @Override
-    public boolean onMenuItemActionCollapse(MenuItem item) {
-        final AppBarLayout mAppBarLayout = getActivity().findViewById(R.id.app_bar);
-        // To prevent a large space on tool bar.
-        mAppBarLayout.setExpanded(false /*expanded*/, false /*animate*/);
-        return true;
-    }
-
-    @Override
-    public int getPreferenceScreenResId() {
-        return R.xml.quarantined_apps;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.QUARANTINED_APPS_DEV_CONTROL;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        AppIconCacheManager.getInstance().release();
-    }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.quarantined_apps);
-}
diff --git a/src/com/android/settings/development/quarantine/QuarantinedAppsPreferenceController.java b/src/com/android/settings/development/quarantine/QuarantinedAppsPreferenceController.java
deleted file mode 100644
index de3b18b..0000000
--- a/src/com/android/settings/development/quarantine/QuarantinedAppsPreferenceController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import android.content.Context;
-import android.content.pm.Flags;
-
-import com.android.settings.core.BasePreferenceController;
-
-public class QuarantinedAppsPreferenceController extends BasePreferenceController {
-    public QuarantinedAppsPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return Flags.quarantinedEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-}
diff --git a/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java b/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java
deleted file mode 100644
index 4d4834b..0000000
--- a/src/com/android/settings/development/quarantine/QuarantinedAppsScreenController.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.pm.Flags;
-import android.content.pm.PackageManager;
-import android.content.pm.SuspendDialogInfo;
-import android.os.UserHandle;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.applications.AppStateBaseBridge;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.applications.ApplicationsState.AppFilter;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnDestroy;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
-
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.TreeSet;
-
-public class QuarantinedAppsScreenController extends BasePreferenceController implements
-        LifecycleObserver, OnStart, OnStop, OnDestroy,
-        ApplicationsState.Callbacks, Preference.OnPreferenceChangeListener,
-        AppStateBaseBridge.Callback {
-    private final ApplicationsState mApplicationsState;
-    private final QuarantinedAppStateBridge mQuarantinedAppStateBridge;
-    private ApplicationsState.Session mSession;
-    private PreferenceScreen mScreen;
-    private AppFilter mFilter;
-    private boolean mExtraLoaded;
-
-    public QuarantinedAppsScreenController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-        mApplicationsState = ApplicationsState.getInstance(
-                (Application) context.getApplicationContext());
-        mQuarantinedAppStateBridge = new QuarantinedAppStateBridge(context,
-                mApplicationsState, this);
-    }
-
-    @Override
-    public void onStart() {
-        mQuarantinedAppStateBridge.resume(true /* forceLoadAllApps */);
-    }
-
-    @Override
-    public void onStop() {
-        mQuarantinedAppStateBridge.pause();
-    }
-
-    @Override
-    public void onDestroy() {
-        mQuarantinedAppStateBridge.release();
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mScreen = screen;
-    }
-
-    public void setFilter(AppFilter filter) {
-        mFilter = filter;
-    }
-
-    public void setSession(Lifecycle lifecycle) {
-        mSession = mApplicationsState.newSession(this, lifecycle);
-    }
-
-    @Override
-    public void onExtraInfoUpdated() {
-        mExtraLoaded = true;
-        rebuild();
-    }
-
-    public void rebuild() {
-        if (!mExtraLoaded || mSession == null) {
-            return;
-        }
-
-        final ArrayList<AppEntry> apps = mSession.rebuild(mFilter,
-                ApplicationsState.ALPHA_COMPARATOR);
-        if (apps != null) {
-            onRebuildComplete(apps);
-        }
-    }
-
-    @Override
-    public void onRebuildComplete(ArrayList<AppEntry> apps) {
-        if (apps == null) {
-            return;
-        }
-
-        // Preload top visible icons of app list.
-        AppUtils.preloadTopIcons(mContext, apps,
-                mContext.getResources().getInteger(R.integer.config_num_visible_app_icons));
-
-        // Create apps key set for removing useless preferences
-        final Set<String> appsKeySet = new TreeSet<>();
-        // Add or update preferences
-        final int count = apps.size();
-        for (int i = 0; i < count; i++) {
-            final AppEntry entry = apps.get(i);
-            if (!shouldAddPreference(entry)) {
-                continue;
-            }
-            final String prefkey = QuarantinedAppPreference.generateKey(entry);
-            appsKeySet.add(prefkey);
-            QuarantinedAppPreference preference = mScreen.findPreference(prefkey);
-            if (preference == null) {
-                preference = new QuarantinedAppPreference(mScreen.getContext(), entry);
-                preference.setOnPreferenceChangeListener(this);
-                mScreen.addPreference(preference);
-            } else {
-                preference.updateState();
-            }
-            preference.setOrder(i);
-        }
-
-        // Remove useless preferences
-        removeUselessPrefs(appsKeySet);
-    }
-
-    private void removeUselessPrefs(final Set<String> appsKeySet) {
-        final int prefCount = mScreen.getPreferenceCount();
-        String prefKey;
-        if (prefCount > 0) {
-            for (int i = prefCount - 1; i >= 0; i--) {
-                final Preference pref = mScreen.getPreference(i);
-                prefKey = pref.getKey();
-                if (!appsKeySet.isEmpty() && appsKeySet.contains(prefKey)) {
-                    continue;
-                }
-                mScreen.removePreference(pref);
-            }
-        }
-    }
-
-    @VisibleForTesting
-    static boolean shouldAddPreference(AppEntry app) {
-        return app != null && UserHandle.isApp(app.info.uid);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference instanceof QuarantinedAppPreference) {
-            final QuarantinedAppPreference quarantinedPreference =
-                    (QuarantinedAppPreference) preference;
-            final boolean quarantined = newValue == Boolean.TRUE;
-            setPackageQuarantined(quarantinedPreference.getEntry().info.packageName,
-                    quarantinedPreference.getEntry().info.uid, quarantined);
-            quarantinedPreference.getEntry().extraInfo = quarantined;
-            return true;
-        }
-        return false;
-    }
-
-    private void setPackageQuarantined(String pkg, int uid, boolean quarantined) {
-        final PackageManager pm = mContext.createContextAsUser(
-                UserHandle.getUserHandleForUid(uid), 0).getPackageManager();
-        final SuspendDialogInfo dialogInfo;
-        if (quarantined) {
-            dialogInfo = new SuspendDialogInfo.Builder()
-                    .setNeutralButtonText(R.string.unquarantine_app_button)
-                    .setNeutralButtonAction(SuspendDialogInfo.BUTTON_ACTION_UNSUSPEND)
-                    .build();
-        } else {
-            dialogInfo = null;
-        }
-        pm.setPackagesSuspended(new String[] {pkg}, quarantined, null /* appExtras */,
-                null /* launcherExtras */, dialogInfo,
-                PackageManager.FLAG_SUSPEND_QUARANTINED);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return Flags.quarantinedEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void onRunningStateChanged(boolean running) {
-    }
-
-    @Override
-    public void onPackageListChanged() {
-    }
-
-    @Override
-    public void onPackageIconChanged() {
-    }
-
-    @Override
-    public void onPackageSizeChanged(String packageName) {
-    }
-
-    @Override
-    public void onAllSizesComputed() {
-    }
-
-    @Override
-    public void onLauncherInfoChanged() {
-    }
-
-    @Override
-    public void onLoadEntriesCompleted() {
-    }
-}
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 887fc32..ef542a3 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -257,6 +257,7 @@
     private boolean shouldSkipProfile(UserInfo userInfo) {
         return android.os.Flags.allowPrivateProfile()
                 && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && userInfo.isQuietModeEnabled()
                 && mUm.getUserProperties(userInfo.getUserHandle()).getShowInQuietMode()
                         == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
index ff3223f..99edbec 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsStorage.java
@@ -26,7 +26,6 @@
 import android.content.pm.ApplicationInfo;
 import android.os.Build;
 import android.os.IDeviceIdleController;
-import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
@@ -39,6 +38,7 @@
 
 import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.datastore.BackupCodec;
 import com.android.settingslib.datastore.BackupContext;
 import com.android.settingslib.datastore.BackupRestoreEntity;
 import com.android.settingslib.datastore.BackupRestoreStorageManager;
@@ -52,6 +52,7 @@
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /** An implementation to backup and restore battery configurations. */
@@ -159,8 +160,24 @@
         return Arrays.asList(allowlistedApps);
     }
 
+    @NonNull
     @Override
-    public void writeNewStateDescription(@NonNull ParcelFileDescriptor newState) {
+    public OutputStream wrapBackupOutputStream(
+            @NonNull BackupCodec codec, @NonNull OutputStream outputStream) {
+        // not using any codec for backward compatibility
+        return outputStream;
+    }
+
+    @NonNull
+    @Override
+    public InputStream wrapRestoreInputStream(
+            @NonNull BackupCodec codec, @NonNull InputStream inputStream) {
+        // not using any codec for backward compatibility
+        return inputStream;
+    }
+
+    @Override
+    public void onRestoreFinished() {
         BatterySettingsMigrateChecker.verifySaverConfiguration(mApplication);
         performRestoreIfNeeded();
     }
@@ -305,8 +322,8 @@
                 @NonNull BackupContext backupContext, @NonNull OutputStream outputStream)
                 throws IOException {
             final long timestamp = System.currentTimeMillis();
-            final ArraySet<ApplicationInfo> applications = getInstalledApplications();
-            if (applications == null || applications.isEmpty()) {
+            final ApplicationInfo[] applications = getInstalledApplications();
+            if (applications.length == 0) {
                 Log.w(TAG, "no data found in the getInstalledApplications()");
                 return EntityBackupResult.DELETE;
             }
@@ -344,15 +361,24 @@
                     TAG,
                     String.format(
                             "backup getInstalledApplications():%d count=%d in %d/ms",
-                            applications.size(),
+                            applications.length,
                             backupCount,
                             (System.currentTimeMillis() - timestamp)));
             return EntityBackupResult.UPDATE;
         }
 
-        private @Nullable ArraySet<ApplicationInfo> getInstalledApplications() {
-            return BatteryOptimizeUtils.getInstalledApplications(
-                    mApplication, AppGlobals.getPackageManager());
+        private ApplicationInfo[] getInstalledApplications() {
+            ArraySet<ApplicationInfo> installedApplications =
+                    BatteryOptimizeUtils.getInstalledApplications(
+                            mApplication, AppGlobals.getPackageManager());
+            ApplicationInfo[] applicationInfos = new ApplicationInfo[0];
+            if (installedApplications == null || installedApplications.isEmpty()) {
+                return applicationInfos;
+            }
+            applicationInfos = installedApplications.toArray(applicationInfos);
+            // sort the list to ensure backup data is stable
+            Arrays.sort(applicationInfos, Comparator.comparing(info -> info.packageName));
+            return applicationInfos;
         }
 
         static @NonNull SharedPreferences getSharedPreferences(Context context) {
diff --git a/src/com/android/settings/localepicker/LocaleNotificationDataManager.java b/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
index 0e89366..6ec578d 100644
--- a/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
+++ b/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
@@ -19,8 +19,11 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settingslib.datastore.SharedPreferencesStorage;
+
 import com.google.gson.Gson;
 
 import java.util.HashMap;
@@ -43,6 +46,12 @@
         this.mContext = context;
     }
 
+    /** Returns the underlying {@link SharedPreferences} storage. */
+    @NonNull
+    public static SharedPreferencesStorage getSharedPreferencesStorage(@NonNull Context context) {
+        return new SharedPreferencesStorage(context, LOCALE_NOTIFICATION, Context.MODE_PRIVATE);
+    }
+
     private static SharedPreferences getSharedPreferences(Context context) {
         return context.getSharedPreferences(LOCALE_NOTIFICATION, Context.MODE_PRIVATE);
     }
diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index 98bb5d7..350f5b8 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -21,7 +21,6 @@
 import android.os.Bundle
 import android.telephony.SubscriptionManager
 import android.util.Log
-import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -45,7 +44,6 @@
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -67,7 +65,6 @@
 import com.android.settingslib.spa.widget.dialog.AlertDialogButton
 import com.android.settingslib.spa.widget.dialog.getDialogWidth
 import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter
-import com.android.settingslib.spa.widget.editor.SettingsOutlinedTextField
 import com.android.settingslib.spa.widget.ui.SettingsTitle
 import com.android.settingslib.spaprivileged.framework.common.userManager
 import kotlinx.coroutines.CoroutineScope
@@ -83,6 +80,8 @@
     lateinit var showBottomSheet: MutableState<Boolean>
     lateinit var showError: MutableState<ErrorType>
     lateinit var showProgressDialog: MutableState<Boolean>
+    lateinit var showDsdsProgressDialog: MutableState<Boolean>
+    lateinit var showRestartDialog: MutableState<Boolean>
 
     private var switchToEuiccSubscriptionSidecar: SwitchToEuiccSubscriptionSidecar? = null
     private var switchToRemovableSlotSidecar: SwitchToRemovableSlotSidecar? = null
@@ -132,6 +131,12 @@
                 setProgressDialog(false)
             }
 
+            CallbackType.CALLBACK_ENABLE_DSDS-> {
+                scope.launch {
+                    onboardingService.startEnableDsds(this@SimOnboardingActivity)
+                }
+            }
+
             CallbackType.CALLBACK_ONBOARDING_COMPLETE -> {
                 showBottomSheet.value = false
                 setProgressDialog(true)
@@ -179,12 +184,14 @@
         showBottomSheet = remember { mutableStateOf(false) }
         showError = remember { mutableStateOf(ErrorType.ERROR_NONE) }
         showProgressDialog = remember { mutableStateOf(false) }
+        showDsdsProgressDialog = remember { mutableStateOf(false) }
+        showRestartDialog = remember { mutableStateOf(false) }
         scope = rememberCoroutineScope()
 
         registerSidecarReceiverFlow()
 
         ErrorDialogImpl()
-
+        RestartDialogImpl()
         LaunchedEffect(Unit) {
             if (onboardingService.activeSubInfoList.isNotEmpty()) {
                 showBottomSheet.value = true
@@ -196,29 +203,76 @@
             BottomSheetImpl(
                 sheetState = sheetState,
                 nextAction = {
-                    // TODO: if the phone is SS mode and the isDsdsConditionSatisfied is true, then
-                    //  enable the DSDS mode.
-                    //  case#1: the device need the reboot after enabling DSDS. Showing the confirm
-                    //          dialog to user whether reboot device or not.
-                    //  case#2: The device don't need the reboot. Enabling DSDS and then showing
-                    //          the SIM onboarding UI.
-
-                    // case#2
-                    val route = getRoute(onboardingService.targetSubId)
-                    startSpaActivity(route)
+                    if (onboardingService.isDsdsConditionSatisfied()) {
+                        // TODO: if the phone is SS mode and the isDsdsConditionSatisfied is true,
+                        //  then enable the DSDS mode.
+                        //  case#1: the device need the reboot after enabling DSDS. Showing the
+                        //          confirm dialog to user whether reboot device or not.
+                        //  case#2: The device don't need the reboot. Enabling DSDS and then showing
+                        //          the SIM onboarding UI.
+                        if (onboardingService.doesSwitchMultiSimConfigTriggerReboot) {
+                            // case#1
+                            Log.d(TAG, "Device does not support reboot free DSDS.")
+                            showRestartDialog.value = true
+                        } else {
+                            // case#2
+                            Log.d(TAG, "Enable DSDS mode")
+                            showDsdsProgressDialog.value = true
+                            enableMultiSimSidecar?.run(SimOnboardingService.NUM_OF_SIMS_FOR_DSDS)
+                        }
+                    } else {
+                        startSimOnboardingProvider()
+                    }
                 },
                 cancelAction = { finish() },
             )
         }
 
-        if(showProgressDialog.value) {
-            ProgressDialogImpl()
+        if (showProgressDialog.value) {
+            ProgressDialogImpl(
+                stringResource(
+                    R.string.sim_onboarding_progressbar_turning_sim_on,
+                    onboardingService.targetSubInfo?.displayName ?: ""
+                )
+            )
+        }
+        if (showDsdsProgressDialog.value) {
+            ProgressDialogImpl(
+                stringResource(R.string.sim_action_enabling_sim_without_carrier_name)
+            )
+        }
+    }
+    @Composable
+    private fun RestartDialogImpl() {
+        val restartDialogPresenter = rememberAlertDialogPresenter(
+            confirmButton = AlertDialogButton(
+                stringResource(R.string.sim_action_reboot)
+            ) {
+                callbackListener(CallbackType.CALLBACK_ENABLE_DSDS)
+            },
+            dismissButton = AlertDialogButton(
+                stringResource(
+                    R.string.sim_action_restart_dialog_cancel,
+                    onboardingService.targetSubInfo?.displayName ?: "")
+            ) {
+                callbackListener(CallbackType.CALLBACK_ONBOARDING_COMPLETE)
+            },
+            title = stringResource(R.string.sim_action_restart_dialog_title),
+            text = {
+                Text(stringResource(R.string.sim_action_restart_dialog_msg))
+            },
+        )
+
+        if(showRestartDialog.value){
+            LaunchedEffect(Unit) {
+                restartDialogPresenter.open()
+            }
         }
     }
 
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
-    fun ProgressDialogImpl() {
+    fun ProgressDialogImpl(title: String) {
         // TODO: Create the SPA's ProgressDialog and using SPA's widget
         BasicAlertDialog(
             onDismissRequest = {},
@@ -232,19 +286,14 @@
             ) {
                 Row(
                     modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(SettingsDimension.itemPaddingStart),
+                        .fillMaxWidth()
+                        .padding(SettingsDimension.itemPaddingStart),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     CircularProgressIndicator()
                     Column(modifier = Modifier
                             .padding(start = SettingsDimension.itemPaddingStart)) {
-                        SettingsTitle(
-                            stringResource(
-                                R.string.sim_onboarding_progressbar_turning_sim_on,
-                                onboardingService.targetSubInfo?.displayName ?: ""
-                            )
-                        )
+                        SettingsTitle(title)
                     }
                 }
             }
@@ -329,7 +378,7 @@
         Log.e(TAG, "Error while sidecarReceiverFlow", e)
     }.conflate()
 
-    fun startSimSwitching(){
+    fun startSimSwitching() {
         Log.d(TAG, "startSimSwitching:")
 
         var targetSubInfo = onboardingService.targetSubInfo
@@ -376,8 +425,6 @@
                 switchToEuiccSubscriptionSidecar!!.reset()
                 showError.value = ErrorType.ERROR_EUICC_SLOT
                 callbackListener(CallbackType.CALLBACK_ERROR)
-                // TODO: showErrorDialog and using privileged_action_disable_fail_title and
-                //       privileged_action_disable_fail_text
             }
         }
     }
@@ -396,18 +443,19 @@
                 switchToRemovableSlotSidecar!!.reset()
                 showError.value = ErrorType.ERROR_REMOVABLE_SLOT
                 callbackListener(CallbackType.CALLBACK_ERROR)
-                // TODO: showErrorDialog and using sim_action_enable_sim_fail_title and
-                //       sim_action_enable_sim_fail_text
             }
         }
     }
 
     fun handleEnableMultiSimSidecarStateChange() {
+        showDsdsProgressDialog.value = false
         when (enableMultiSimSidecar!!.state) {
             SidecarFragment.State.SUCCESS -> {
                 enableMultiSimSidecar!!.reset()
                 Log.i(TAG, "Successfully switched to DSDS without reboot.")
-                handleEnableSubscriptionAfterEnablingDsds()
+                // refresh data
+                initServiceData(this, onboardingService.targetSubId, callbackListener)
+                startSimOnboardingProvider()
             }
 
             SidecarFragment.State.ERROR -> {
@@ -415,34 +463,14 @@
                 Log.i(TAG, "Failed to switch to DSDS without rebooting.")
                 showError.value = ErrorType.ERROR_ENABLE_DSDS
                 callbackListener(CallbackType.CALLBACK_ERROR)
-                // TODO: showErrorDialog and using dsds_activation_failure_title and
-                //       dsds_activation_failure_body_msg2
             }
         }
     }
 
-    fun handleEnableSubscriptionAfterEnablingDsds() {
-        var targetSubInfo = onboardingService.targetSubInfo
-        if (targetSubInfo?.isEmbedded == true) {
-            Log.i(TAG,
-                    "DSDS enabled, start to enable profile: " + targetSubInfo.getSubscriptionId()
-            )
-            // For eSIM operations, we simply switch to the selected eSIM profile.
-            switchToEuiccSubscriptionSidecar!!.run(
-                targetSubInfo.subscriptionId,
-                UiccSlotUtil.INVALID_PORT_ID,
-                null
-            )
-            return
-        }
-        Log.i(TAG, "DSDS enabled, start to enable pSIM profile.")
-        onboardingService.handleTogglePsimAction()
-        callbackListener(CallbackType.CALLBACK_FINISH)
-    }
-
     @Composable
     fun BottomSheetBody(nextAction: () -> Unit) {
-        Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(bottom = SettingsDimension.itemPaddingVertical)) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.padding(bottom = SettingsDimension.itemPaddingVertical)) {
             Icon(
                 imageVector = Icons.Outlined.SignalCellularAlt,
                 contentDescription = null,
@@ -497,6 +525,11 @@
         onboardingService.initData(targetSubId, context,callback)
     }
 
+    private fun startSimOnboardingProvider() {
+        val route = getRoute(onboardingService.targetSubId)
+        startSpaActivity(route)
+    }
+
     companion object {
         @JvmStatic
         fun startSimOnboardingActivity(
@@ -523,9 +556,10 @@
         enum class CallbackType(val value:Int){
             CALLBACK_ERROR(-1),
             CALLBACK_ONBOARDING_COMPLETE(1),
-            CALLBACK_SETUP_NAME(2),
-            CALLBACK_SETUP_PRIMARY_SIM(3),
-            CALLBACK_FINISH(4)
+            CALLBACK_ENABLE_DSDS(2),
+            CALLBACK_SETUP_NAME(3),
+            CALLBACK_SETUP_PRIMARY_SIM(4),
+            CALLBACK_FINISH(5)
         }
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/network/SimOnboardingService.kt b/src/com/android/settings/network/SimOnboardingService.kt
index 962741f..2ec1ad3 100644
--- a/src/com/android/settings/network/SimOnboardingService.kt
+++ b/src/com/android/settings/network/SimOnboardingService.kt
@@ -24,6 +24,7 @@
 import android.telephony.UiccSlotInfo
 import android.util.Log
 import com.android.settings.network.SimOnboardingActivity.Companion.CallbackType
+import com.android.settings.sim.SimActivationNotifier
 import com.android.settings.spa.network.setAutomaticData
 import com.android.settings.spa.network.setDefaultData
 import com.android.settings.spa.network.setDefaultSms
@@ -32,9 +33,6 @@
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
-private const val TAG = "SimOnboardingService"
-private const val INVALID = SubscriptionManager.INVALID_SUBSCRIPTION_ID
-
 class SimOnboardingService {
     var subscriptionManager:SubscriptionManager? = null
     var telephonyManager:TelephonyManager? = null
@@ -70,7 +68,7 @@
             }
             return  uiccCardInfoList.any { it.isMultipleEnabledProfilesSupported }
         }
-    var isRemovableSimEnabled: Boolean = false
+    var isRemovablePsimProfileEnabled: Boolean = false
         get() {
             if(slotInfoList.isEmpty()) {
                 Log.w(TAG, "UICC Slot info list is empty.")
@@ -78,7 +76,11 @@
             }
             return UiccSlotUtil.isRemovableSimEnabled(slotInfoList)
         }
-
+    var isEsimProfileEnabled: Boolean = false
+        get() {
+            activeSubInfoList.stream().anyMatch { it.isEmbedded }
+            return false
+        }
     var doesTargetSimHaveEsimOperation = false
         get() {
             return targetSubInfo?.isEmbedded ?: false
@@ -109,6 +111,19 @@
             }
             return getActiveModemCount != 0 && activeSubInfoList.size == getActiveModemCount
         }
+    var isMultiSimEnabled = false
+        get() {
+            return getActiveModemCount > 1
+        }
+    var isMultiSimSupported = false
+        get() {
+            return telephonyManager?.isMultiSimSupported == TelephonyManager.MULTISIM_ALLOWED
+        }
+
+    var doesSwitchMultiSimConfigTriggerReboot = false
+        get() {
+            return telephonyManager?.doesSwitchMultiSimConfigTriggerReboot() ?: false
+        }
 
     fun isValid(): Boolean {
         return targetSubId != INVALID
@@ -161,9 +176,10 @@
             targetPrimarySimCalls = SubscriptionManager.getDefaultVoiceSubscriptionId()
             targetPrimarySimTexts = SubscriptionManager.getDefaultSmsSubscriptionId()
             targetPrimarySimMobileData = SubscriptionManager.getDefaultDataSubscriptionId()
+
             Log.d(
                 TAG,"doesTargetSimHaveEsimOperation: $doesTargetSimHaveEsimOperation" +
-                    ", isRemovableSimEnabled: $isRemovableSimEnabled" +
+                    ", isRemovableSimEnabled: $isRemovablePsimProfileEnabled" +
                     ", isMultipleEnabledProfilesSupported: $isMultipleEnabledProfilesSupported" +
                     ", targetPrimarySimCalls: $targetPrimarySimCalls" +
                     ", targetPrimarySimTexts: $targetPrimarySimTexts" +
@@ -261,6 +277,45 @@
         }
     }
 
+    fun isDsdsConditionSatisfied(): Boolean {
+        if (isMultiSimEnabled) {
+            Log.d(
+                TAG,
+                "DSDS is already enabled. Condition not satisfied."
+            )
+            return false
+        }
+        if (!isMultiSimSupported) {
+            Log.d(TAG, "Hardware does not support DSDS.")
+            return false
+        }
+        val isActiveSim = activeSubInfoList.isNotEmpty()
+        if (isMultipleEnabledProfilesSupported && isActiveSim) {
+            Log.d(TAG,
+                "Device supports MEP and eSIM operation and eSIM profile is enabled."
+                        + " DSDS condition satisfied."
+            )
+            return true
+        }
+
+        if (doesTargetSimHaveEsimOperation && isRemovablePsimProfileEnabled) {
+            Log.d(TAG,
+                "eSIM operation and removable PSIM is enabled. DSDS condition satisfied."
+            )
+            return true
+        }
+
+        if (!doesTargetSimHaveEsimOperation && isEsimProfileEnabled) {
+            Log.d(TAG,
+                "Removable SIM operation and eSIM profile is enabled. DSDS condition"
+                        + " satisfied."
+            )
+            return true
+        }
+        Log.d(TAG, "DSDS condition not satisfied.")
+        return false
+    }
+
     fun startActivatingSim(){
         // TODO: start to activate sim
         callback(CallbackType.CALLBACK_FINISH)
@@ -281,30 +336,50 @@
 
     suspend fun startSetupPrimarySim(context: Context) {
         withContext(Dispatchers.Default) {
-            setDefaultVoice(subscriptionManager,targetPrimarySimCalls)
-            setDefaultSms(subscriptionManager,targetPrimarySimTexts)
-            setDefaultData(
-                context,
-                subscriptionManager,
-                null,
-                targetPrimarySimMobileData
-            )
+            if (SubscriptionUtil.getActiveSubscriptions(subscriptionManager).size <= 1) {
+                Log.d(TAG,
+                    "startSetupPrimarySim: number of active subscriptionInfo is less than 2"
+                )
+            } else {
+                setDefaultVoice(subscriptionManager, targetPrimarySimCalls)
+                setDefaultSms(subscriptionManager, targetPrimarySimTexts)
+                setDefaultData(
+                    context,
+                    subscriptionManager,
+                    null,
+                    targetPrimarySimMobileData
+                )
 
-            var nonDds = targetNonDds
-            Log.d(
-                TAG,
-                "setAutomaticData: targetNonDds: $nonDds," +
-                    " targetPrimarySimAutoDataSwitch: $targetPrimarySimAutoDataSwitch"
-            )
-            if (nonDds != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-                val telephonyManagerForNonDds: TelephonyManager? =
-                    context.getSystemService(TelephonyManager::class.java)
-                        ?.createForSubscriptionId(nonDds)
-                setAutomaticData(telephonyManagerForNonDds, targetPrimarySimAutoDataSwitch)
+                var nonDds = targetNonDds
+                Log.d(
+                    TAG,
+                    "setAutomaticData: targetNonDds: $nonDds," +
+                            " targetPrimarySimAutoDataSwitch: $targetPrimarySimAutoDataSwitch"
+                )
+                if (nonDds != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                    val telephonyManagerForNonDds: TelephonyManager? =
+                        context.getSystemService(TelephonyManager::class.java)
+                            ?.createForSubscriptionId(nonDds)
+                    setAutomaticData(telephonyManagerForNonDds, targetPrimarySimAutoDataSwitch)
+                }
             }
-
             // no next action, send finish
             callback(CallbackType.CALLBACK_FINISH)
         }
     }
+
+    suspend fun startEnableDsds(context: Context) {
+        withContext(Dispatchers.Default) {
+            Log.d(TAG, "User confirmed reboot to enable DSDS.")
+            SimActivationNotifier.setShowSimSettingsNotification(context, true)
+            telephonyManager?.switchMultiSimConfig(NUM_OF_SIMS_FOR_DSDS)
+            callback(CallbackType.CALLBACK_FINISH)
+        }
+    }
+
+    companion object{
+        private const val TAG = "SimOnboardingService"
+        private const val INVALID = SubscriptionManager.INVALID_SUBSCRIPTION_ID
+        const val NUM_OF_SIMS_FOR_DSDS = 2
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/network/SubscriptionInfoListViewModel.kt b/src/com/android/settings/network/SubscriptionInfoListViewModel.kt
index f682002..df3b8ba 100644
--- a/src/com/android/settings/network/SubscriptionInfoListViewModel.kt
+++ b/src/com/android/settings/network/SubscriptionInfoListViewModel.kt
@@ -20,6 +20,7 @@
 import android.telephony.SubscriptionManager
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import com.android.settings.network.telephony.getSelectableSubscriptionInfoList
 import com.android.settings.network.telephony.subscriptionsChangedFlow
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
@@ -41,10 +42,10 @@
     }.stateIn(scope, SharingStarted.Eagerly, initialValue = emptyList())
 
     /**
-     * Getting the Selectable SubscriptionInfo List from the SubscriptionManager's
+     * Getting the Selectable SubscriptionInfo List from the SubscriptionRepository's
      * getAvailableSubscriptionInfoList
      */
     val selectableSubscriptionInfoListFlow = application.subscriptionsChangedFlow().map {
-        SubscriptionUtil.getSelectableSubscriptionInfoList(application)
+        application.getSelectableSubscriptionInfoList()
     }.stateIn(scope, SharingStarted.Eagerly, initialValue = emptyList())
 }
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 83f6c38..497af25 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -50,12 +50,12 @@
 import com.android.settings.network.helper.SubscriptionAnnotation;
 import com.android.settings.network.telephony.DeleteEuiccSubscriptionDialogActivity;
 import com.android.settings.network.telephony.EuiccRacConnectivityDialogActivity;
+import com.android.settings.network.telephony.SubscriptionRepositoryKt;
 import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -499,40 +499,7 @@
      * @return list of user selectable subscriptions.
      */
     public static List<SubscriptionInfo> getSelectableSubscriptionInfoList(Context context) {
-        SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
-        List<SubscriptionInfo> availableList = subManager.getAvailableSubscriptionInfoList();
-        if (availableList == null) {
-            return null;
-        } else {
-            // Multiple subscriptions in a group should only have one representative.
-            // It should be the current active primary subscription if any, or any
-            // primary subscription.
-            List<SubscriptionInfo> selectableList = new ArrayList<>();
-            Map<ParcelUuid, SubscriptionInfo> groupMap = new HashMap<>();
-
-            for (SubscriptionInfo info : availableList) {
-                // Opportunistic subscriptions are considered invisible
-                // to users so they should never be returned.
-                if (!isSubscriptionVisible(subManager, context, info)) continue;
-
-                ParcelUuid groupUuid = info.getGroupUuid();
-                if (groupUuid == null) {
-                    // Doesn't belong to any group. Add in the list.
-                    selectableList.add(info);
-                } else if (!groupMap.containsKey(groupUuid)
-                        || (groupMap.get(groupUuid).getSimSlotIndex() == INVALID_SIM_SLOT_INDEX
-                        && info.getSimSlotIndex() != INVALID_SIM_SLOT_INDEX)) {
-                    // If it belongs to a group that has never been recorded or it's the current
-                    // active subscription, add it in the list.
-                    selectableList.remove(groupMap.get(groupUuid));
-                    selectableList.add(info);
-                    groupMap.put(groupUuid, info);
-                }
-
-            }
-            Log.d(TAG, "getSelectableSubscriptionInfoList: " + selectableList);
-            return selectableList;
-        }
+        return SubscriptionRepositoryKt.getSelectableSubscriptionInfoList(context);
     }
 
     /**
diff --git a/src/com/android/settings/network/telephony/CellInfoUtil.kt b/src/com/android/settings/network/telephony/CellInfoUtil.kt
index c7b6b24..51f60e7 100644
--- a/src/com/android/settings/network/telephony/CellInfoUtil.kt
+++ b/src/com/android/settings/network/telephony/CellInfoUtil.kt
@@ -82,7 +82,7 @@
      */
     @JvmStatic
     fun cellInfoListToString(cellInfos: List<CellInfo>): String =
-        cellInfos.joinToString { cellInfo -> cellInfo.readableString() }
+        cellInfos.joinToString(System.lineSeparator()) { cellInfo -> cellInfo.readableString() }
 
     /**
      * Convert [CellInfo] to a readable string without sensitive info.
diff --git a/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt b/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
index 240843d..6d326e0 100644
--- a/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
+++ b/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
@@ -33,6 +33,7 @@
 import com.android.settings.datausage.lib.DataUsageLib
 import com.android.settings.datausage.lib.NetworkCycleDataRepository
 import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange
+import com.android.settingslib.spaprivileged.framework.compose.getPlaceholder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -63,6 +64,7 @@
     }
 
     override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
+        preference.summary = mContext.getPlaceholder()
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 update()
@@ -113,7 +115,6 @@
         }
 
         val allTimeUsage = repository.queryUsage(AllTimeRange)
-        if (allTimeUsage.usage > 0) return allTimeUsage.getDataUsedString(mContext) to true
-        return null to false
+        return allTimeUsage.getDataUsedString(mContext) to (allTimeUsage.usage > 0)
     }
 }
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
deleted file mode 100644
index 20a3d89..0000000
--- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static android.telephony.TelephonyManager.CALL_STATE_IDLE;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyCallback;
-import android.telephony.TelephonyManager;
-
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.network.SubscriptionsChangeListener;
-import com.android.settings.widget.SettingsMainSwitchPreference;
-
-/** This controls a switch to allow enabling/disabling a mobile network */
-public class MobileNetworkSwitchController extends BasePreferenceController implements
-        SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver {
-    private static final String TAG = "MobileNetworkSwitchCtrl";
-    private SettingsMainSwitchPreference mSwitchBar;
-    private int mSubId;
-    private SubscriptionsChangeListener mChangeListener;
-    private SubscriptionManager mSubscriptionManager;
-    private TelephonyManager mTelephonyManager;
-    private CallStateTelephonyCallback mCallStateCallback;
-
-    public MobileNetworkSwitchController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-        mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
-        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
-        mChangeListener = new SubscriptionsChangeListener(context, this);
-    }
-
-    void init(int subId) {
-        mSubId = subId;
-        mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
-    }
-
-    @OnLifecycleEvent(ON_RESUME)
-    public void onResume() {
-        mChangeListener.start();
-
-        if (mCallStateCallback == null) {
-            mCallStateCallback = new CallStateTelephonyCallback();
-            mTelephonyManager.registerTelephonyCallback(
-                    mContext.getMainExecutor(), mCallStateCallback);
-        }
-        update();
-    }
-
-    @OnLifecycleEvent(ON_PAUSE)
-    public void onPause() {
-        if (mCallStateCallback != null) {
-            mTelephonyManager.unregisterTelephonyCallback(mCallStateCallback);
-            mCallStateCallback = null;
-        }
-        mChangeListener.stop();
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mSwitchBar = (SettingsMainSwitchPreference) screen.findPreference(mPreferenceKey);
-
-        mSwitchBar.setOnBeforeCheckedChangeListener((isChecked) -> {
-            // TODO b/135222940: re-evaluate whether to use
-            // mSubscriptionManager#isSubscriptionEnabled
-            if (mSubscriptionManager.isActiveSubscriptionId(mSubId) != isChecked) {
-                SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, mSubId, isChecked);
-                return true;
-            }
-            return false;
-        });
-        update();
-    }
-
-    private void update() {
-        if (mSwitchBar == null) {
-            return;
-        }
-
-        SubscriptionInfo subInfo = null;
-        for (SubscriptionInfo info : SubscriptionUtil.getAvailableSubscriptions(mContext)) {
-            if (info.getSubscriptionId() == mSubId) {
-                subInfo = info;
-                break;
-            }
-        }
-
-        // For eSIM, we always want the toggle. If telephony stack support disabling a pSIM
-        // directly, we show the toggle.
-        if (subInfo == null || (!subInfo.isEmbedded() && !SubscriptionUtil.showToggleForPhysicalSim(
-                mSubscriptionManager))) {
-            mSwitchBar.hide();
-        } else {
-            mSwitchBar.show();
-            mSwitchBar.setCheckedInternal(mSubscriptionManager.isActiveSubscriptionId(mSubId));
-        }
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE_UNSEARCHABLE;
-
-    }
-
-    @Override
-    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
-    }
-
-    @Override
-    public void onSubscriptionsChanged() {
-        update();
-    }
-
-    private class CallStateTelephonyCallback extends TelephonyCallback implements
-            TelephonyCallback.CallStateListener {
-        @Override
-        public void onCallStateChanged(int state) {
-            mSwitchBar.setSwitchBarEnabled(state == CALL_STATE_IDLE);
-        }
-    }
-}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.kt b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.kt
new file mode 100644
index 0000000..dcac74f
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony
+
+import android.content.Context
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.android.settings.R
+import com.android.settings.network.SubscriptionUtil
+import com.android.settings.spa.preference.ComposePreferenceController
+import com.android.settingslib.spa.widget.preference.MainSwitchPreference
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import kotlinx.coroutines.flow.map
+
+class MobileNetworkSwitchController @JvmOverloads constructor(
+    context: Context,
+    preferenceKey: String,
+    private val subscriptionRepository: SubscriptionRepository = SubscriptionRepository(context),
+) : ComposePreferenceController(context, preferenceKey) {
+
+    private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
+
+    override fun getAvailabilityStatus() = AVAILABLE_UNSEARCHABLE
+
+    fun init(subId: Int) {
+        this.subId = subId
+    }
+
+    @Composable
+    override fun Content() {
+        val context = LocalContext.current
+        if (remember { !context.isVisible() }) return
+        val checked by remember {
+            subscriptionRepository.isSubscriptionEnabledFlow(subId)
+        }.collectAsStateWithLifecycle(initialValue = null)
+        val changeable by remember {
+            context.callStateFlow(subId).map { it == TelephonyManager.CALL_STATE_IDLE }
+        }.collectAsStateWithLifecycle(initialValue = true)
+        MainSwitchPreference(model = object : SwitchPreferenceModel {
+            override val title = stringResource(R.string.mobile_network_use_sim_on)
+            override val changeable = { changeable }
+            override val checked = { checked }
+            override val onCheckedChange = { newChecked: Boolean ->
+                SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId, newChecked)
+            }
+        })
+    }
+
+    private fun Context.isVisible(): Boolean {
+        val subInfo = subscriptionRepository.getSelectableSubscriptionInfoList()
+            .firstOrNull { it.subscriptionId == subId }
+            ?: return false
+        // For eSIM, we always want the toggle. If telephony stack support disabling a pSIM
+        // directly, we show the toggle.
+        return subInfo.isEmbedded || requireSubscriptionManager().canDisablePhysicalSubscription()
+    }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
deleted file mode 100644
index 1961329..0000000
--- a/src/com/android/settings/network/telephony/NetworkScanHelper.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright (C) 2018 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.settings.network.telephony;
-
-import android.annotation.IntDef;
-import android.content.Context;
-import android.telephony.AccessNetworkConstants.AccessNetworkType;
-import android.telephony.CellInfo;
-import android.telephony.NetworkScan;
-import android.telephony.NetworkScanRequest;
-import android.telephony.PhoneCapability;
-import android.telephony.RadioAccessSpecifier;
-import android.telephony.TelephonyManager;
-import android.telephony.TelephonyScanManager;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.internal.telephony.CellNetworkScanResult;
-
-import com.android.settings.R;
-
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.SettableFuture;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
-
-/**
- * A helper class that builds the common interface and performs the network scan for two different
- * network scan APIs.
- */
-public class NetworkScanHelper {
-    public static final String TAG = "NetworkScanHelper";
-
-    /**
-     * Callbacks interface to inform the network scan results.
-     */
-    public interface NetworkScanCallback {
-        /**
-         * Called when the results is returned from {@link TelephonyManager}. This method will be
-         * called at least one time if there is no error occurred during the network scan.
-         *
-         * <p> This method can be called multiple times in one network scan, until
-         * {@link #onComplete()} or {@link #onError(int)} is called.
-         *
-         * @param results
-         */
-        void onResults(List<CellInfo> results);
-
-        /**
-         * Called when the current network scan process is finished. No more
-         * {@link #onResults(List)} will be called for the current network scan after this method is
-         * called.
-         */
-        void onComplete();
-
-        /**
-         * Called when an error occurred during the network scan process.
-         *
-         * <p> There is no more result returned from {@link TelephonyManager} if an error occurred.
-         *
-         * <p> {@link #onComplete()} will not be called if an error occurred.
-         *
-         * @see {@link NetworkScan.ScanErrorCode}
-         */
-        void onError(int errorCode);
-    }
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS, NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS})
-    public @interface NetworkQueryType {}
-
-    /**
-     * Performs the network scan using {@link TelephonyManager#getAvailableNetworks()}. The network
-     * scan results won't be returned to the caller until the network scan is completed.
-     *
-     * <p> This is typically used when the modem doesn't support the new network scan api
-     * {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
-     */
-    public static final int NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS = 1;
-
-    /**
-     * Performs the network scan using {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)} The network scan
-     * results will be returned to the caller periodically in a small time window until the network
-     * scan is completed. The complete results should be returned in the last called of
-     * {@link NetworkScanCallback#onResults(List)}.
-     *
-     * <p> This is recommended to be used if modem supports the new network scan api
-     * {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}
-     */
-    public static final int NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS = 2;
-
-    /** The constants below are used in the async network scan. */
-    @VisibleForTesting
-    static final boolean INCREMENTAL_RESULTS = true;
-    @VisibleForTesting
-    static final int SEARCH_PERIODICITY_SEC = 5;
-    @VisibleForTesting
-    static final int MAX_SEARCH_TIME_SEC = 300;
-    @VisibleForTesting
-    static final int INCREMENTAL_RESULTS_PERIODICITY_SEC = 3;
-
-    private final NetworkScanCallback mNetworkScanCallback;
-    private final TelephonyManager mTelephonyManager;
-    private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback;
-    private final Executor mExecutor;
-
-    private int mMaxSearchTimeSec = MAX_SEARCH_TIME_SEC;
-    private NetworkScan mNetworkScanRequester;
-
-    /** Callbacks for sync network scan */
-    private ListenableFuture<List<CellInfo>> mNetworkScanFuture;
-
-    public NetworkScanHelper(TelephonyManager tm, NetworkScanCallback callback, Executor executor) {
-        mTelephonyManager = tm;
-        mNetworkScanCallback = callback;
-        mInternalNetworkScanCallback = new NetworkScanCallbackImpl();
-        mExecutor = executor;
-    }
-
-    public NetworkScanHelper(Context context, TelephonyManager tm, NetworkScanCallback callback,
-            Executor executor) {
-        this(tm, callback, executor);
-        mMaxSearchTimeSec = context.getResources().getInteger(
-                R.integer.config_network_scan_helper_max_search_time_sec);
-    }
-
-    @VisibleForTesting
-    NetworkScanRequest createNetworkScanForPreferredAccessNetworks() {
-        long networkTypeBitmap3gpp = mTelephonyManager.getPreferredNetworkTypeBitmask()
-                & TelephonyManager.NETWORK_STANDARDS_FAMILY_BITMASK_3GPP;
-
-        List<RadioAccessSpecifier> radioAccessSpecifiers = new ArrayList<>();
-        // If the allowed network types are unknown or if they are of the right class, scan for
-        // them; otherwise, skip them to save scan time and prevent users from being shown networks
-        // that they can't connect to.
-        if (networkTypeBitmap3gpp == 0
-                || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_2G) != 0) {
-            radioAccessSpecifiers.add(
-                    new RadioAccessSpecifier(AccessNetworkType.GERAN, null, null));
-        }
-        if (networkTypeBitmap3gpp == 0
-                || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_3G) != 0) {
-            radioAccessSpecifiers.add(
-                    new RadioAccessSpecifier(AccessNetworkType.UTRAN, null, null));
-        }
-        if (networkTypeBitmap3gpp == 0
-                || (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_4G) != 0) {
-            radioAccessSpecifiers.add(
-                    new RadioAccessSpecifier(AccessNetworkType.EUTRAN, null, null));
-        }
-        // If a device supports 5G stand-alone then the code below should be re-enabled; however
-        // a device supporting only non-standalone mode cannot perform PLMN selection and camp on
-        // a 5G network, which means that it shouldn't scan for 5G at the expense of battery as
-        // part of the manual network selection process.
-        //
-        if (networkTypeBitmap3gpp == 0
-                || (hasNrSaCapability()
-                && (networkTypeBitmap3gpp & TelephonyManager.NETWORK_CLASS_BITMASK_5G) != 0)) {
-            radioAccessSpecifiers.add(
-                    new RadioAccessSpecifier(AccessNetworkType.NGRAN, null, null));
-            Log.d(TAG, "radioAccessSpecifiers add NGRAN.");
-        }
-
-        return new NetworkScanRequest(
-                NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
-                radioAccessSpecifiers.toArray(
-                        new RadioAccessSpecifier[radioAccessSpecifiers.size()]),
-                SEARCH_PERIODICITY_SEC,
-                mMaxSearchTimeSec,
-                INCREMENTAL_RESULTS,
-                INCREMENTAL_RESULTS_PERIODICITY_SEC,
-                null /* List of PLMN ids (MCC-MNC) */);
-    }
-
-    /**
-     * Performs a network scan for the given type {@code type}.
-     * {@link #NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS} is recommended if modem supports
-     * {@link TelephonyManager#requestNetworkScan(
-     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
-     *
-     * @param type used to tell which network scan API should be used.
-     */
-    public void startNetworkScan(@NetworkQueryType int type) {
-        if (type == NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS) {
-            mNetworkScanFuture = SettableFuture.create();
-            Futures.addCallback(mNetworkScanFuture, new FutureCallback<List<CellInfo>>() {
-                @Override
-                public void onSuccess(List<CellInfo> result) {
-                    onResults(result);
-                    onComplete();
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    if (t instanceof CancellationException) {
-                        return;
-                    }
-                    int errCode = Integer.parseInt(t.getMessage());
-                    onError(errCode);
-                }
-            }, MoreExecutors.directExecutor());
-            mExecutor.execute(new NetworkScanSyncTask(
-                    mTelephonyManager, (SettableFuture) mNetworkScanFuture));
-        } else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {
-            if (mNetworkScanRequester != null) {
-                return;
-            }
-            mNetworkScanRequester = mTelephonyManager.requestNetworkScan(
-                    createNetworkScanForPreferredAccessNetworks(),
-                    mExecutor,
-                    mInternalNetworkScanCallback);
-            if (mNetworkScanRequester == null) {
-                onError(NetworkScan.ERROR_RADIO_INTERFACE_ERROR);
-            }
-        }
-    }
-
-    /**
-     * The network scan of type {@link #NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS} can't be stopped,
-     * however, the result of the current network scan won't be returned to the callback after
-     * calling this method.
-     */
-    public void stopNetworkQuery() {
-        if (mNetworkScanRequester != null) {
-            mNetworkScanRequester.stopScan();
-            mNetworkScanRequester = null;
-        }
-
-        if (mNetworkScanFuture != null) {
-            mNetworkScanFuture.cancel(true /* mayInterruptIfRunning */);
-            mNetworkScanFuture = null;
-        }
-    }
-
-    private void onResults(List<CellInfo> cellInfos) {
-        mNetworkScanCallback.onResults(cellInfos);
-    }
-
-    private void onComplete() {
-        mNetworkScanCallback.onComplete();
-    }
-
-    private void onError(int errCode) {
-        mNetworkScanCallback.onError(errCode);
-    }
-
-    private boolean hasNrSaCapability() {
-        return Arrays.stream(
-                mTelephonyManager.getPhoneCapability().getDeviceNrCapabilities())
-                .anyMatch(i -> i == PhoneCapability.DEVICE_NR_CAPABILITY_SA);
-    }
-
-    /**
-     * Converts the status code of {@link CellNetworkScanResult} to one of the
-     * {@link NetworkScan.ScanErrorCode}.
-     * @param errCode status code from {@link CellNetworkScanResult}.
-     *
-     * @return one of the scan error code from {@link NetworkScan.ScanErrorCode}.
-     */
-    private static int convertToScanErrorCode(int errCode) {
-        switch (errCode) {
-            case CellNetworkScanResult.STATUS_RADIO_NOT_AVAILABLE:
-                return NetworkScan.ERROR_RADIO_INTERFACE_ERROR;
-            case CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE:
-            default:
-                return NetworkScan.ERROR_MODEM_ERROR;
-        }
-    }
-
-    private final class NetworkScanCallbackImpl extends TelephonyScanManager.NetworkScanCallback {
-        public void onResults(List<CellInfo> results) {
-            Log.d(TAG, "Async scan onResults() results = "
-                    + CellInfoUtil.cellInfoListToString(results));
-            NetworkScanHelper.this.onResults(results);
-        }
-
-        public void onComplete() {
-            Log.d(TAG, "async scan onComplete()");
-            NetworkScanHelper.this.onComplete();
-        }
-
-        public void onError(@NetworkScan.ScanErrorCode int errCode) {
-            Log.d(TAG, "async scan onError() errorCode = " + errCode);
-            NetworkScanHelper.this.onError(errCode);
-        }
-    }
-
-    private static final class NetworkScanSyncTask implements Runnable {
-        private final SettableFuture<List<CellInfo>> mCallback;
-        private final TelephonyManager mTelephonyManager;
-
-        NetworkScanSyncTask(
-                TelephonyManager telephonyManager, SettableFuture<List<CellInfo>> callback) {
-            mTelephonyManager = telephonyManager;
-            mCallback = callback;
-        }
-
-        @Override
-        public void run() {
-            final CellNetworkScanResult result = mTelephonyManager.getAvailableNetworks();
-            if (result.getStatus() == CellNetworkScanResult.STATUS_SUCCESS) {
-                final List<CellInfo> cellInfos = result.getOperators()
-                        .stream()
-                        .map(operatorInfo
-                                -> CellInfoUtil.convertOperatorInfoToCellInfo(operatorInfo))
-                        .collect(Collectors.toList());
-                Log.d(TAG, "Sync network scan completed, cellInfos = "
-                        + CellInfoUtil.cellInfoListToString(cellInfos));
-                mCallback.set(cellInfos);
-            } else {
-                final Throwable error = new Throwable(
-                        Integer.toString(convertToScanErrorCode(result.getStatus())));
-                mCallback.setException(error);
-                Log.d(TAG, "Sync network scan error, ex = " + error);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 461930b..eb89d9e 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network.telephony;
 
-import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
@@ -39,6 +38,7 @@
 import android.view.View;
 
 import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -48,14 +48,21 @@
 import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.network.telephony.scan.NetworkScanRepository;
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanCellInfos;
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanComplete;
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanError;
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanResult;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.utils.ThreadUtils;
 
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -70,12 +77,8 @@
     private static final String TAG = "NetworkSelectSettings";
 
     private static final int EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE = 1;
-    private static final int EVENT_NETWORK_SCAN_RESULTS = 2;
-    private static final int EVENT_NETWORK_SCAN_ERROR = 3;
-    private static final int EVENT_NETWORK_SCAN_COMPLETED = 4;
 
     private static final String PREF_KEY_NETWORK_OPERATORS = "network_operators_preference";
-    private static final int MIN_NUMBER_OF_SCAN_REQUIRED = 2;
 
     private PreferenceCategory mPreferenceCategory;
     @VisibleForTesting
@@ -90,18 +93,14 @@
     private CarrierConfigManager mCarrierConfigManager;
     private List<String> mForbiddenPlmns;
     private boolean mShow4GForLTE = false;
-    private NetworkScanHelper mNetworkScanHelper;
     private final ExecutorService mNetworkScanExecutor = Executors.newFixedThreadPool(1);
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private boolean mUseNewApi;
-    private long mRequestIdManualNetworkSelect;
-    private long mRequestIdManualNetworkScan;
-    private long mWaitingForNumberOfScanResults;
-    @VisibleForTesting
-    boolean mIsAggregationEnabled = false;
     private CarrierConfigManager.CarrierConfigChangeListener mCarrierConfigChangeListener;
     private AtomicBoolean mShouldFilterOutSatellitePlmn = new AtomicBoolean();
 
+    private NetworkScanRepository mNetworkScanRepository;
+    private boolean mUpdateScanResult = false;
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -113,7 +112,6 @@
     @Initializer
     protected void onCreateInitialization() {
         Context context = getContext();
-        mUseNewApi = enableNewAutoSelectNetworkUI(context);
         mSubId = getSubId();
 
         mPreferenceCategory = getPreferenceCategory(PREF_KEY_NETWORK_OPERATORS);
@@ -123,8 +121,6 @@
         mTelephonyManager = getTelephonyManager(context, mSubId);
         mSatelliteManager = getSatelliteManager(context);
         mCarrierConfigManager = getCarrierConfigManager(context);
-        mNetworkScanHelper = new NetworkScanHelper(
-                mTelephonyManager, mCallback, mNetworkScanExecutor);
         PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(mSubId,
                 CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL,
                 CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL);
@@ -135,30 +131,13 @@
                 true));
 
         mMetricsFeatureProvider = getMetricsFeatureProvider(context);
-        mIsAggregationEnabled = enableAggregation(context);
-        Log.d(TAG, "init: mUseNewApi:" + mUseNewApi
-                + " ,mIsAggregationEnabled:" + mIsAggregationEnabled + " ,mSubId:" + mSubId);
 
         mCarrierConfigChangeListener =
                 (slotIndex, subId, carrierId, specificCarrierId) -> handleCarrierConfigChanged(
                         subId);
         mCarrierConfigManager.registerCarrierConfigChangeListener(mNetworkScanExecutor,
                 mCarrierConfigChangeListener);
-
-    }
-
-    @Keep
-    @VisibleForTesting
-    protected boolean enableNewAutoSelectNetworkUI(Context context) {
-        return context.getResources().getBoolean(
-                com.android.internal.R.bool.config_enableNewAutoSelectNetworkUI);
-    }
-
-    @Keep
-    @VisibleForTesting
-    protected boolean enableAggregation(Context context) {
-        return context.getResources().getBoolean(
-                R.bool.config_network_selection_list_aggregation_enabled);
+        mNetworkScanRepository = new NetworkScanRepository(context, mSubId);
     }
 
     @Keep
@@ -217,17 +196,42 @@
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        final Activity activity = getActivity();
-        if (activity != null) {
-            mProgressHeader = setPinnedHeaderView(
-                    com.android.settingslib.widget.progressbar.R.layout.progress_header)
-                    .findViewById(com.android.settingslib.widget.progressbar.R.id.progress_bar_animation);
-            setProgressBarVisible(false);
-        }
+        mProgressHeader = setPinnedHeaderView(
+                com.android.settingslib.widget.progressbar.R.layout.progress_header
+        ).findViewById(com.android.settingslib.widget.progressbar.R.id.progress_bar_animation);
         forceUpdateConnectedPreferenceCategory();
+        launchNetworkScan();
+    }
+
+    private void launchNetworkScan() {
+        mNetworkScanRepository.launchNetworkScan(getViewLifecycleOwner(), new Function1<>() {
+            @Override
+            public Unit invoke(@NonNull NetworkScanResult networkScanResult) {
+                if (!mUpdateScanResult) {
+                    // Not update UI if not in scan mode.
+                    return Unit.INSTANCE;
+                }
+                if (networkScanResult instanceof NetworkScanCellInfos networkScanCellInfos) {
+                    scanResultHandler(networkScanCellInfos.getCellInfos());
+                    return Unit.INSTANCE;
+                }
+                if (!isPreferenceScreenEnabled()) {
+                    clearPreferenceSummary();
+                    enablePreferenceScreen(true);
+                } else if (networkScanResult instanceof NetworkScanComplete
+                        && mCellInfoList == null) {
+                    // In case the scan timeout before getting any results
+                    addMessagePreference(R.string.empty_networks_list);
+                } else if (networkScanResult instanceof NetworkScanError) {
+                    addMessagePreference(R.string.network_query_error);
+                }
+
+                return Unit.INSTANCE;
+            }
+        });
     }
 
     @Override
@@ -235,12 +239,8 @@
         super.onStart();
 
         updateForbiddenPlmns();
-        if (isProgressBarVisible()) {
-            return;
-        }
-        if (mWaitingForNumberOfScanResults <= 0) {
-            startNetworkQuery();
-        }
+        setProgressBarVisible(true);
+        mUpdateScanResult = true;
     }
 
     /**
@@ -256,14 +256,6 @@
     }
 
     @Override
-    public void onStop() {
-        if (mWaitingForNumberOfScanResults <= 0) {
-            stopNetworkQuery();
-        }
-        super.onStop();
-    }
-
-    @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference == mSelectedPreference) {
             Log.d(TAG, "onPreferenceTreeClick: preference is mSelectedPreference. Do nothing.");
@@ -274,7 +266,7 @@
             return false;
         }
 
-        stopNetworkQuery();
+        mUpdateScanResult = false;
 
         // Refresh the last selected item in case users reselect network.
         clearPreferenceSummary();
@@ -293,8 +285,6 @@
         // Disable the screen until network is manually set
         enablePreferenceScreen(false);
 
-        mRequestIdManualNetworkSelect = getNewRequestId();
-        mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
         final OperatorInfo operator = mSelectedPreference.getOperatorInfo();
         ThreadUtils.postOnBackgroundThread(() -> {
             final Message msg = mHandler.obtainMessage(
@@ -328,7 +318,6 @@
             switch (msg.what) {
                 case EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE:
                     final boolean isSucceed = (boolean) msg.obj;
-                    stopNetworkQuery();
                     setProgressBarVisible(false);
                     enablePreferenceScreen(true);
 
@@ -340,86 +329,15 @@
                         Log.e(TAG, "No preference to update!");
                     }
                     break;
-                case EVENT_NETWORK_SCAN_RESULTS:
-                    scanResultHandler((List<CellInfo>) msg.obj);
-                    break;
-
-                case EVENT_NETWORK_SCAN_ERROR:
-                    stopNetworkQuery();
-                    Log.i(TAG, "Network scan failure " + msg.arg1 + ":"
-                            + " scan request 0x" + Long.toHexString(mRequestIdManualNetworkScan)
-                            + ", waiting for scan results = " + mWaitingForNumberOfScanResults
-                            + ", select request 0x"
-                            + Long.toHexString(mRequestIdManualNetworkSelect));
-                    if (mRequestIdManualNetworkScan < mRequestIdManualNetworkSelect) {
-                        break;
-                    }
-                    if (!isPreferenceScreenEnabled()) {
-                        clearPreferenceSummary();
-                        enablePreferenceScreen(true);
-                    } else {
-                        addMessagePreference(R.string.network_query_error);
-                    }
-                    break;
-
-                case EVENT_NETWORK_SCAN_COMPLETED:
-                    stopNetworkQuery();
-                    Log.d(TAG, "Network scan complete:"
-                            + " scan request 0x" + Long.toHexString(mRequestIdManualNetworkScan)
-                            + ", waiting for scan results = " + mWaitingForNumberOfScanResults
-                            + ", select request 0x"
-                            + Long.toHexString(mRequestIdManualNetworkSelect));
-                    if (mRequestIdManualNetworkScan < mRequestIdManualNetworkSelect) {
-                        break;
-                    }
-                    if (!isPreferenceScreenEnabled()) {
-                        clearPreferenceSummary();
-                        enablePreferenceScreen(true);
-                    } else if (mCellInfoList == null) {
-                        // In case the scan timeout before getting any results
-                        addMessagePreference(R.string.empty_networks_list);
-                    }
-                    break;
             }
-            return;
         }
     };
 
-    @VisibleForTesting
-    List<CellInfo> doAggregation(List<CellInfo> cellInfoListInput) {
-        if (!mIsAggregationEnabled) {
-            Log.d(TAG, "no aggregation");
-            return new ArrayList<>(cellInfoListInput);
-        }
-        ArrayList<CellInfo> aggregatedList = new ArrayList<>();
-        for (CellInfo cellInfo : cellInfoListInput) {
-            String plmn = CellInfoUtil.getNetworkTitle(cellInfo.getCellIdentity());
-            Class className = cellInfo.getClass();
-
-            Optional<CellInfo> itemInTheList = aggregatedList.stream().filter(
-                    item -> {
-                        String itemPlmn = CellInfoUtil.getNetworkTitle(item.getCellIdentity());
-                        return itemPlmn.equals(plmn) && item.getClass().equals(className);
-                    })
-                    .findFirst();
-            if (itemInTheList.isPresent()) {
-                if (cellInfo.isRegistered() && !itemInTheList.get().isRegistered()) {
-                    // Adding the registered cellinfo item into list. If there are two registered
-                    // cellinfo items, then select first one from source list.
-                    aggregatedList.set(aggregatedList.indexOf(itemInTheList.get()), cellInfo);
-                }
-                continue;
-            }
-            aggregatedList.add(cellInfo);
-        }
-
-        return filterOutSatellitePlmn(aggregatedList);
-    }
-
     /* We do not want to expose carrier satellite plmns to the user when manually scan the
        cellular network. Therefore, it is needed to filter out satellite plmns from current cell
        info list  */
-    private List<CellInfo> filterOutSatellitePlmn(List<CellInfo> cellInfoList) {
+    @VisibleForTesting
+    List<CellInfo> filterOutSatellitePlmn(List<CellInfo> cellInfoList) {
         List<String> aggregatedSatellitePlmn = getSatellitePlmnsForCarrierWrapper();
         if (!mShouldFilterOutSatellitePlmn.get() || aggregatedSatellitePlmn.isEmpty()) {
             return cellInfoList;
@@ -451,39 +369,10 @@
         }
     }
 
-    private final NetworkScanHelper.NetworkScanCallback mCallback =
-            new NetworkScanHelper.NetworkScanCallback() {
-                public void onResults(List<CellInfo> results) {
-                    final Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_RESULTS, results);
-                    msg.sendToTarget();
-                }
-
-                public void onComplete() {
-                    final Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_COMPLETED);
-                    msg.sendToTarget();
-                }
-
-                public void onError(int error) {
-                    final Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_ERROR, error,
-                            0 /* arg2 */);
-                    msg.sendToTarget();
-                }
-            };
-
     @Keep
     @VisibleForTesting
     protected void scanResultHandler(List<CellInfo> results) {
-        if (mRequestIdManualNetworkScan < mRequestIdManualNetworkSelect) {
-            Log.d(TAG, "CellInfoList (drop): "
-                    + CellInfoUtil.cellInfoListToString(new ArrayList<>(results)));
-            return;
-        }
-        mWaitingForNumberOfScanResults--;
-        if ((mWaitingForNumberOfScanResults <= 0) && (!isResumed())) {
-            stopNetworkQuery();
-        }
-
-        mCellInfoList = doAggregation(results);
+        mCellInfoList = filterOutSatellitePlmn(results);
         Log.d(TAG, "CellInfoList: " + CellInfoUtil.cellInfoListToString(mCellInfoList));
         if (mCellInfoList != null && mCellInfoList.size() != 0) {
             final NetworkOperatorPreference connectedPref = updateAllPreferenceCategory();
@@ -642,11 +531,6 @@
         }
     }
 
-    private long getNewRequestId() {
-        return Math.max(mRequestIdManualNetworkSelect,
-                mRequestIdManualNetworkScan) + 1;
-    }
-
     private boolean isProgressBarVisible() {
         if (mProgressHeader == null) {
             return false;
@@ -667,29 +551,8 @@
         mPreferenceCategory.addPreference(mStatusMessagePreference);
     }
 
-    private void startNetworkQuery() {
-        setProgressBarVisible(true);
-        if (mNetworkScanHelper != null) {
-            mRequestIdManualNetworkScan = getNewRequestId();
-            mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
-            mNetworkScanHelper.startNetworkScan(
-                    mUseNewApi
-                            ? NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS
-                            : NetworkScanHelper.NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS);
-        }
-    }
-
-    private void stopNetworkQuery() {
-        setProgressBarVisible(false);
-        if (mNetworkScanHelper != null) {
-            mWaitingForNumberOfScanResults = 0;
-            mNetworkScanHelper.stopNetworkQuery();
-        }
-    }
-
     @Override
     public void onDestroy() {
-        stopNetworkQuery();
         mNetworkScanExecutor.shutdown();
         super.onDestroy();
     }
diff --git a/src/com/android/settings/network/telephony/SubscriptionRepository.kt b/src/com/android/settings/network/telephony/SubscriptionRepository.kt
index e44b577..1da6a96 100644
--- a/src/com/android/settings/network/telephony/SubscriptionRepository.kt
+++ b/src/com/android/settings/network/telephony/SubscriptionRepository.kt
@@ -32,9 +32,24 @@
 
 private const val TAG = "SubscriptionRepository"
 
-fun Context.isSubscriptionEnabledFlow(subId: Int) = subscriptionsChangedFlow().map {
-    val subscriptionManager = getSystemService(SubscriptionManager::class.java)
+class SubscriptionRepository(private val context: Context) {
+    /**
+     * Return a list of subscriptions that are available and visible to the user.
+     *
+     * @return list of user selectable subscriptions.
+     */
+    fun getSelectableSubscriptionInfoList(): List<SubscriptionInfo> =
+        context.getSelectableSubscriptionInfoList()
 
+    fun isSubscriptionEnabledFlow(subId: Int) = context.isSubscriptionEnabledFlow(subId)
+}
+
+val Context.subscriptionManager: SubscriptionManager?
+    get() = getSystemService(SubscriptionManager::class.java)
+
+fun Context.requireSubscriptionManager(): SubscriptionManager = subscriptionManager!!
+
+fun Context.isSubscriptionEnabledFlow(subId: Int) = subscriptionsChangedFlow().map {
     subscriptionManager?.isSubscriptionEnabled(subId) ?: false
 }.flowOn(Dispatchers.Default)
 
@@ -43,7 +58,7 @@
 }.flowOn(Dispatchers.Default)
 
 fun Context.subscriptionsChangedFlow() = callbackFlow {
-    val subscriptionManager = getSystemService(SubscriptionManager::class.java)!!
+    val subscriptionManager = requireSubscriptionManager()
 
     val listener = object : SubscriptionManager.OnSubscriptionsChangedListener() {
         override fun onSubscriptionsChanged() {
@@ -58,3 +73,35 @@
 
     awaitClose { subscriptionManager.removeOnSubscriptionsChangedListener(listener) }
 }.conflate().onEach { Log.d(TAG, "subscriptions changed") }.flowOn(Dispatchers.Default)
+
+/**
+ * Return a list of subscriptions that are available and visible to the user.
+ *
+ * @return list of user selectable subscriptions.
+ */
+fun Context.getSelectableSubscriptionInfoList(): List<SubscriptionInfo> {
+    val subscriptionManager = requireSubscriptionManager()
+    val availableList = subscriptionManager.getAvailableSubscriptionInfoList() ?: return emptyList()
+    val visibleList = availableList.filter { subInfo ->
+        // Opportunistic subscriptions are considered invisible
+        // to users so they should never be returned.
+        SubscriptionUtil.isSubscriptionVisible(subscriptionManager, this, subInfo)
+    }
+    // Multiple subscriptions in a group should only have one representative.
+    // It should be the current active primary subscription if any, or any primary subscription.
+    val groupUuidToSelectedIdMap = visibleList
+        .groupBy { it.groupUuid }
+        .mapValues { (_, subInfos) ->
+            subInfos.filter { it.simSlotIndex != SubscriptionManager.INVALID_SIM_SLOT_INDEX }
+                .ifEmpty { subInfos }
+                .minOf { it.subscriptionId }
+        }
+
+    return visibleList
+        .filter { subInfo ->
+            val groupUuid = subInfo.groupUuid ?: return@filter true
+            groupUuidToSelectedIdMap[groupUuid] == subInfo.subscriptionId
+        }
+        .sortedBy { it.subscriptionId }
+        .also { Log.d(TAG, "getSelectableSubscriptionInfoList: $it") }
+}
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt
index b0ea6a6..0ee1d87 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt
@@ -22,10 +22,7 @@
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
 import android.telephony.ims.ImsMmTelManager
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.Preference
 import androidx.preference.PreferenceScreen
 import com.android.settings.R
@@ -33,7 +30,6 @@
 import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 /**
@@ -81,17 +77,12 @@
 
     override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
         wifiCallingRepositoryFactory(mSubId).wifiCallingReadyFlow()
-            .collectLatestWithLifecycle(viewLifecycleOwner) {
-                preference.isVisible = it
-                callingPreferenceCategoryController.updateChildVisible(preferenceKey, it)
+            .collectLatestWithLifecycle(viewLifecycleOwner) { isReady ->
+                preference.isVisible = isReady
+                callingPreferenceCategoryController.updateChildVisible(preferenceKey, isReady)
+                if (isReady) update()
             }
 
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                update()
-            }
-        }
-
         callStateFlowFactory(mSubId).collectLatestWithLifecycle(viewLifecycleOwner) {
             preference.isEnabled = (it == TelephonyManager.CALL_STATE_IDLE)
         }
diff --git a/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt b/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt
new file mode 100644
index 0000000..2067b8c
--- /dev/null
+++ b/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.scan
+
+import android.content.Context
+import android.telephony.AccessNetworkConstants.AccessNetworkType
+import android.telephony.CellInfo
+import android.telephony.NetworkScanRequest
+import android.telephony.PhoneCapability
+import android.telephony.RadioAccessSpecifier
+import android.telephony.TelephonyManager
+import android.telephony.TelephonyScanManager
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LifecycleOwner
+import com.android.settings.network.telephony.CellInfoUtil
+import com.android.settings.network.telephony.CellInfoUtil.getNetworkTitle
+import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+
+class NetworkScanRepository(context: Context, subId: Int) {
+    sealed interface NetworkScanResult
+
+    data class NetworkScanCellInfos(val cellInfos: List<CellInfo>) : NetworkScanResult
+    data object NetworkScanComplete : NetworkScanResult
+    data class NetworkScanError(val error: Int) : NetworkScanResult
+
+    private val telephonyManager =
+        context.getSystemService(TelephonyManager::class.java)!!.createForSubscriptionId(subId)
+
+    /** TODO: Move this to UI layer, when UI layer migrated to Kotlin. */
+    fun launchNetworkScan(lifecycleOwner: LifecycleOwner, onResult: (NetworkScanResult) -> Unit) {
+        networkScanFlow().collectLatestWithLifecycle(lifecycleOwner, action = onResult)
+    }
+
+    data class CellInfoScanKey(
+        val title: String?,
+        val className: String,
+        val isRegistered: Boolean,
+    ) {
+        constructor(cellInfo: CellInfo) : this(
+            title = cellInfo.cellIdentity.getNetworkTitle(),
+            className = cellInfo.javaClass.name,
+            isRegistered = cellInfo.isRegistered,
+        )
+    }
+
+    fun networkScanFlow(): Flow<NetworkScanResult> = callbackFlow {
+        val callback = object : TelephonyScanManager.NetworkScanCallback() {
+            override fun onResults(results: List<CellInfo>) {
+                val cellInfos = results.distinctBy { CellInfoScanKey(it) }
+                trySend(NetworkScanCellInfos(cellInfos))
+                Log.d(TAG, "CellInfoList: ${CellInfoUtil.cellInfoListToString(cellInfos)}")
+            }
+
+            override fun onComplete() {
+                trySend(NetworkScanComplete)
+                close()
+                Log.d(TAG, "onComplete")
+            }
+
+            override fun onError(error: Int) {
+                trySend(NetworkScanError(error))
+                close()
+                Log.d(TAG, "onError: $error")
+            }
+        }
+
+        val networkScan = telephonyManager.requestNetworkScan(
+            createNetworkScan(),
+            Dispatchers.Default.asExecutor(),
+            callback,
+        )
+
+        awaitClose { networkScan.stopScan() }
+    }.flowOn(Dispatchers.Default)
+
+    /** Create network scan for allowed network types. */
+    private fun createNetworkScan(): NetworkScanRequest {
+        val allowedNetworkTypes = getAllowedNetworkTypes()
+        Log.d(TAG, "createNetworkScan: allowedNetworkTypes = $allowedNetworkTypes")
+        val radioAccessSpecifiers = allowedNetworkTypes
+            .map { RadioAccessSpecifier(it, null, null) }
+            .toTypedArray()
+        return NetworkScanRequest(
+            NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
+            radioAccessSpecifiers,
+            NetworkScanRequest.MIN_SEARCH_PERIODICITY_SEC, // one shot, not used
+            MAX_SEARCH_TIME_SEC,
+            true,
+            INCREMENTAL_RESULTS_PERIODICITY_SEC,
+            null,
+        )
+    }
+
+    private fun getAllowedNetworkTypes(): List<Int> {
+        val networkTypeBitmap3gpp: Long =
+            telephonyManager.getAllowedNetworkTypesBitmask() and
+                TelephonyManager.NETWORK_STANDARDS_FAMILY_BITMASK_3GPP
+        return buildList {
+            // If the allowed network types are unknown or if they are of the right class, scan for
+            // them; otherwise, skip them to save scan time and prevent users from being shown
+            // networks that they can't connect to.
+            if (networkTypeBitmap3gpp == 0L
+                || networkTypeBitmap3gpp and TelephonyManager.NETWORK_CLASS_BITMASK_2G != 0L
+            ) {
+                add(AccessNetworkType.GERAN)
+            }
+            if (networkTypeBitmap3gpp == 0L
+                || networkTypeBitmap3gpp and TelephonyManager.NETWORK_CLASS_BITMASK_3G != 0L
+            ) {
+                add(AccessNetworkType.UTRAN)
+            }
+            if (networkTypeBitmap3gpp == 0L
+                || networkTypeBitmap3gpp and TelephonyManager.NETWORK_CLASS_BITMASK_4G != 0L
+            ) {
+                add(AccessNetworkType.EUTRAN)
+            }
+            // If a device supports 5G stand-alone then the code below should be re-enabled; however
+            // a device supporting only non-standalone mode cannot perform PLMN selection and camp
+            // on a 5G network, which means that it shouldn't scan for 5G at the expense of battery
+            // as part of the manual network selection process.
+            //
+            if (networkTypeBitmap3gpp == 0L
+                || (networkTypeBitmap3gpp and TelephonyManager.NETWORK_CLASS_BITMASK_5G != 0L &&
+                    hasNrSaCapability())
+            ) {
+                add(AccessNetworkType.NGRAN)
+                Log.d(TAG, "radioAccessSpecifiers add NGRAN.")
+            }
+        }
+    }
+
+    private fun hasNrSaCapability(): Boolean {
+        val phoneCapability = telephonyManager.getPhoneCapability()
+        return PhoneCapability.DEVICE_NR_CAPABILITY_SA in phoneCapability.deviceNrCapabilities
+    }
+
+    companion object {
+        private const val TAG = "NetworkScanRepository"
+
+        @VisibleForTesting
+        val MAX_SEARCH_TIME_SEC = 300
+
+        @VisibleForTesting
+        val INCREMENTAL_RESULTS_PERIODICITY_SEC = 3
+    }
+}
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index ab5fc39..29d6d30 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -21,34 +21,27 @@
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED;
 
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 
+import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
 /**
  * A tri-state preference allowing a user to specify what gets to bubble.
  */
-public class BubblePreference extends Preference implements View.OnClickListener {
+public class BubblePreference extends Preference implements RadioGroup.OnCheckedChangeListener {
     RestrictedPreferenceHelper mHelper;
 
     private int mSelectedPreference;
 
-    private Context mContext;
-
-    private ButtonViewHolder mBubbleAllButton;
-    private ButtonViewHolder mBubbleSelectedButton;
-    private ButtonViewHolder mBubbleNoneButton;
-
     private boolean mSelectedVisible;
 
     public BubblePreference(Context context) {
@@ -64,16 +57,16 @@
     }
 
     public BubblePreference(Context context, AttributeSet attrs,
-            int defStyleAttr, int defStyleRes) {
+                            int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         mHelper = new RestrictedPreferenceHelper(context, this, attrs);
         mHelper.useAdminDisabledSummary(true);
-        mContext = context;
         setLayoutResource(R.layout.bubble_preference);
     }
 
     public void setSelectedPreference(int preference) {
         mSelectedPreference = preference;
+        notifyChanged();
     }
 
     public int getSelectedPreference() {
@@ -92,9 +85,8 @@
     }
 
     @Override
-    public void onBindViewHolder(final PreferenceViewHolder holder) {
+    public void onBindViewHolder(@NonNull final PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
-
         final boolean disabledByAdmin = mHelper.isDisabledByAdmin();
         View summary = holder.findViewById(android.R.id.summary);
         if (disabledByAdmin) {
@@ -105,74 +97,34 @@
         }
         holder.itemView.setClickable(false);
 
-        View bubbleAll = holder.findViewById(R.id.bubble_all);
-        ImageView bubbleAllImage = (ImageView) holder.findViewById(R.id.bubble_all_icon);
-        TextView bubbleAllText = (TextView) holder.findViewById(R.id.bubble_all_label);
-        mBubbleAllButton = new ButtonViewHolder(bubbleAll, bubbleAllImage, bubbleAllText,
-                BUBBLE_PREFERENCE_ALL);
-        mBubbleAllButton.setSelected(mContext, mSelectedPreference == BUBBLE_PREFERENCE_ALL);
-        bubbleAll.setTag(BUBBLE_PREFERENCE_ALL);
-        bubbleAll.setOnClickListener(this);
-        bubbleAll.setVisibility(disabledByAdmin ? View.GONE : View.VISIBLE);
+        RadioButton bubbleAllButton = (RadioButton) holder.findViewById(R.id.bubble_all);
+        bubbleAllButton.setChecked(mSelectedPreference == BUBBLE_PREFERENCE_ALL);
+        bubbleAllButton.setTag(BUBBLE_PREFERENCE_ALL);
+        bubbleAllButton.setVisibility(disabledByAdmin ? View.GONE : View.VISIBLE);
 
-        View bubbleSelected = holder.findViewById(R.id.bubble_selected);
-        ImageView bubbleSelectedImage = (ImageView) holder.findViewById(R.id.bubble_selected_icon);
-        TextView bubbleSelectedText = (TextView) holder.findViewById(R.id.bubble_selected_label);
-        mBubbleSelectedButton = new ButtonViewHolder(bubbleSelected, bubbleSelectedImage,
-                bubbleSelectedText, BUBBLE_PREFERENCE_SELECTED);
-        mBubbleSelectedButton.setSelected(mContext,
-                mSelectedPreference == BUBBLE_PREFERENCE_SELECTED);
-        bubbleSelected.setTag(BUBBLE_PREFERENCE_SELECTED);
-        bubbleSelected.setOnClickListener(this);
-        bubbleSelected.setVisibility((!mSelectedVisible || disabledByAdmin)
-                ? View.GONE : View.VISIBLE);
+        RadioButton bubbleSelectedButton = (RadioButton) holder.findViewById(R.id.bubble_selected);
+        bubbleSelectedButton.setChecked(mSelectedPreference == BUBBLE_PREFERENCE_SELECTED);
+        bubbleSelectedButton.setTag(BUBBLE_PREFERENCE_SELECTED);
+        int selectedButtonVisibility =
+                (!mSelectedVisible || disabledByAdmin) ? View.GONE : View.VISIBLE;
+        bubbleSelectedButton.setVisibility(selectedButtonVisibility);
 
-        View bubbleNone = holder.findViewById(R.id.bubble_none);
-        ImageView bubbleNoneImage = (ImageView) holder.findViewById(R.id.bubble_none_icon);
-        TextView bubbleNoneText = (TextView) holder.findViewById(R.id.bubble_none_label);
-        mBubbleNoneButton = new ButtonViewHolder(bubbleNone, bubbleNoneImage, bubbleNoneText,
-                BUBBLE_PREFERENCE_NONE);
-        mBubbleNoneButton.setSelected(mContext, mSelectedPreference == BUBBLE_PREFERENCE_NONE);
-        bubbleNone.setTag(BUBBLE_PREFERENCE_NONE);
-        bubbleNone.setOnClickListener(this);
-        bubbleNone.setVisibility(disabledByAdmin ? View.GONE : View.VISIBLE);
+        RadioButton bubbleNoneButton = (RadioButton) holder.findViewById(R.id.bubble_none);
+        bubbleNoneButton.setChecked(mSelectedPreference == BUBBLE_PREFERENCE_NONE);
+        bubbleNoneButton.setTag(BUBBLE_PREFERENCE_NONE);
+        bubbleNoneButton.setVisibility(disabledByAdmin ? View.GONE : View.VISIBLE);
+
+        RadioGroup bublesRadioGroup = (RadioGroup) holder.findViewById(R.id.radio_group);
+        bublesRadioGroup.setOnCheckedChangeListener(this);
     }
 
     @Override
-    public void onClick(View v) {
-        final int selected = (int) v.getTag();
-        callChangeListener(selected);
-
-        mBubbleAllButton.setSelected(mContext, selected == BUBBLE_PREFERENCE_ALL);
-        mBubbleSelectedButton.setSelected(mContext, selected == BUBBLE_PREFERENCE_SELECTED);
-        mBubbleNoneButton.setSelected(mContext, selected == BUBBLE_PREFERENCE_NONE);
-    }
-
-    private class ButtonViewHolder {
-        private View mView;
-        private ImageView mImageView;
-        private TextView mTextView;
-        private int mId;
-
-        ButtonViewHolder(View v, ImageView iv, TextView tv, int identifier) {
-            mView = v;
-            mImageView = iv;
-            mTextView = tv;
-            mId = identifier;
+    public void onCheckedChanged(@NonNull RadioGroup group, int checkedId) {
+        View v = group.findViewById(checkedId);
+        if (v == null || v.getTag() == null) {
+            return;
         }
-
-        void setSelected(Context context, boolean selected) {
-            mView.setBackground(mContext.getDrawable(selected
-                ? R.drawable.notification_importance_button_background_selected
-                : R.drawable.notification_importance_button_background_unselected));
-            mView.setSelected(selected);
-
-            int colorResId = selected
-                    ? R.attr.notification_importance_button_foreground_color_selected
-                    : R.attr.notification_importance_button_foreground_color_unselected;
-            ColorStateList stateList = Utils.getColorAttr(context, colorResId);
-            mImageView.setImageTintList(stateList);
-            mTextView.setTextColor(stateList);
-        }
+        int selectedTag = (int) v.getTag();
+        callChangeListener(selectedTag);
     }
 }
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 631c735..a645300 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -416,6 +416,7 @@
             public String getHint(Context context, boolean isAlpha, int type, ProfileType profile) {
                 if (isAlpha) {
                     if (android.os.Flags.allowPrivateProfile()
+                            && android.multiuser.Flags.enablePrivateSpaceFeatures()
                             && profile.equals(ProfileType.Private)) {
                         return context.getString(alphaHintForPrivateProfile);
                     } else if (type == TYPE_FINGERPRINT) {
@@ -433,6 +434,7 @@
                     }
                 } else {
                     if (android.os.Flags.allowPrivateProfile()
+                            && android.multiuser.Flags.enablePrivateSpaceFeatures()
                             && profile.equals(ProfileType.Private)) {
                         return context.getString(numericHintForPrivateProfile);
                     } else if (type == TYPE_FINGERPRINT) {
@@ -1147,7 +1149,9 @@
                     /*flags=*/0).getSystemService(UserManager.class);
             if (userManager.isManagedProfile()) {
                 return ProfileType.Managed;
-            } else if (android.os.Flags.allowPrivateProfile() && userManager.isPrivateProfile()) {
+            } else if (android.os.Flags.allowPrivateProfile()
+                    && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                    && userManager.isPrivateProfile()) {
                 return ProfileType.Private;
             } else if (userManager.isProfile()) {
                 return ProfileType.Other;
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 8d0aebe..c331991 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -478,7 +478,9 @@
                         .getString(SET_WORK_PROFILE_PATTERN_HEADER,
                                 () -> getString(
                                         R.string.lockpassword_choose_your_profile_pattern_header));
-            } else if (android.os.Flags.allowPrivateProfile() && isPrivateProfile()) {
+            } else if (android.os.Flags.allowPrivateProfile()
+                    && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                    && isPrivateProfile()) {
                 msg = getString(R.string.private_space_choose_your_pattern_header);
             } else {
                 msg = getString(R.string.lockpassword_choose_your_pattern_header);
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index f2ebd1f..cf80513 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -300,6 +300,7 @@
                 launchedCDC = true;
             }
         } else if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && userProperties != null
                 && userProperties.isAuthAlwaysRequiredToDisableQuietMode()
                 && isInternalActivity()) {
@@ -413,7 +414,8 @@
 
     private boolean doesUserStateEnforceStrongAuth(int userId) {
         if (android.os.Flags.allowPrivateProfile()
-                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
+                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             // Check if CE storage for user is locked since biometrics can't unlock fbe/keystore of
             // the profile user using verifyTiedProfileChallenge. Biometrics can still be used if
             // the user is stopped with delayed locking (i.e., with storage unlocked), so the user
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialUtils.java b/src/com/android/settings/password/ConfirmDeviceCredentialUtils.java
index 32e7489..e3182a4 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialUtils.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialUtils.java
@@ -105,7 +105,8 @@
 
     private static boolean isBiometricUnlockEnabledForPrivateSpace() {
         return android.os.Flags.allowPrivateProfile()
-                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace();
+                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures();
     }
 
     /**
diff --git a/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java b/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
index 1f0f7bb..7f0118c 100644
--- a/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
+++ b/src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
@@ -104,7 +104,8 @@
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
-        if (android.os.Flags.allowPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(savedInstanceState);
         }
     }
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceController.java b/src/com/android/settings/privatespace/HidePrivateSpaceController.java
index a53055c..903defa 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceController.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceController.java
@@ -38,7 +38,10 @@
     @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsController.java b/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsController.java
index 1a89d37..6cb54a1 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsController.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsController.java
@@ -52,6 +52,7 @@
     public int getAvailabilityStatus() {
         if (!android.os.Flags.allowPrivateProfile()
                 || !android.multiuser.Flags.enablePsSensitiveNotificationsToggle()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()
                 || !mPrivateSpaceMaintainer.doesPrivateSpaceExist()) {
             return UNSUPPORTED_ON_DEVICE;
         }
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
index 124978a..c41267f 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
@@ -27,7 +27,8 @@
 
     @Override
     public void onCreate(Bundle icicle) {
-        if (android.os.Flags.allowPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(icicle);
         }
     }
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java b/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
index 42627af..a366b70 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java
@@ -36,7 +36,10 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java b/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
index 12a7440..f2a50dc 100644
--- a/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
+++ b/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
@@ -59,7 +59,8 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (!android.os.Flags.allowPrivateProfile()) {
+        if (!android.os.Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return;
         }
         setTheme(SetupWizardUtils.getTheme(this, getIntent()));
diff --git a/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java b/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
index 63b1dc9..53d6b22 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivity.java
@@ -77,7 +77,8 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (Flags.allowPrivateProfile()) {
+        if (Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             ThemeHelper.trySetDynamicColor(this);
             mPrivateSpaceMaintainer =
                     new Injector().injectPrivateSpaceMaintainer(getApplicationContext());
diff --git a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
index 726567e..32db8b6 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
@@ -32,7 +32,8 @@
 
     @Override
     public void onCreate(Bundle icicle) {
-        if (android.os.Flags.allowPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(icicle);
             if (icicle == null
                     && getIntent().getBooleanExtra(EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED, false)) {
diff --git a/src/com/android/settings/privatespace/PrivateSpaceEducation.java b/src/com/android/settings/privatespace/PrivateSpaceEducation.java
index 4c99873..cf22895 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceEducation.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceEducation.java
@@ -43,7 +43,8 @@
             LayoutInflater inflater,
             @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
-        if (!android.os.Flags.allowPrivateProfile()) {
+        if (!android.os.Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return null;
         }
         GlifLayout rootView =
diff --git a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
index 2d38ae2..3fb9b15 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
@@ -78,7 +78,8 @@
      */
     @VisibleForTesting
     public final synchronized boolean createPrivateSpace() {
-        if (!Flags.allowPrivateProfile()) {
+        if (!Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return false;
         }
         // Check if Private space already exists
@@ -146,7 +147,8 @@
 
     /** Returns true if the Private space exists. */
     public synchronized boolean doesPrivateSpaceExist() {
-        if (!Flags.allowPrivateProfile()) {
+        if (!Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return false;
         }
         if (mUserHandle != null) {
@@ -322,6 +324,7 @@
 
     private boolean isPrivateSpaceAutoLockSupported() {
         return android.os.Flags.allowPrivateProfile()
-                && android.multiuser.Flags.supportAutolockForPrivateSpace();
+                && android.multiuser.Flags.supportAutolockForPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures();
     }
 }
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java b/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
index 6729830..4e1741a 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
@@ -51,7 +51,8 @@
             return;
         }
 
-        if (!Flags.allowPrivateProfile()) {
+        if (!Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             // Setting null safetySourceData so that an old entry gets cleared out and this way
             // provide a response since SC always expects one on rescan.
             SafetyCenterManagerWrapper.get().setSafetySourceData(
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
index 4a1e29b..399c2c8 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
@@ -51,7 +51,8 @@
             LayoutInflater inflater,
             @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
-        if (!android.os.Flags.allowPrivateProfile()) {
+        if (!android.os.Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return null;
         }
         GlifLayout rootView =
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java b/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
index 78c96dc..ec7132a 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSetupActivity.java
@@ -42,7 +42,8 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (!android.os.Flags.allowPrivateProfile()) {
+        if (!android.os.Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return;
         }
         setTheme(SetupWizardUtils.getTheme(this, getIntent()));
diff --git a/src/com/android/settings/privatespace/SetupSuccessFragment.java b/src/com/android/settings/privatespace/SetupSuccessFragment.java
index 13de1fc..cf63b22 100644
--- a/src/com/android/settings/privatespace/SetupSuccessFragment.java
+++ b/src/com/android/settings/privatespace/SetupSuccessFragment.java
@@ -47,7 +47,8 @@
             LayoutInflater inflater,
             @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
-        if (!android.os.Flags.allowPrivateProfile()) {
+        if (!android.os.Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return null;
         }
         GlifLayout rootView =
diff --git a/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java b/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
index a7a12a4..3416e14 100644
--- a/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
+++ b/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
@@ -40,7 +40,8 @@
     @Override
     public int getAvailabilityStatus() {
         return android.os.Flags.allowPrivateProfile()
-                        && android.multiuser.Flags.supportAutolockForPrivateSpace()
+                && android.multiuser.Flags.supportAutolockForPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
diff --git a/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java b/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
index 4380c53..cb332d1 100644
--- a/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
+++ b/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragment.java
@@ -47,7 +47,8 @@
     @Override
     public void onCreate(@NonNull Bundle icicle) {
         if (android.os.Flags.allowPrivateProfile()
-                && android.multiuser.Flags.supportAutolockForPrivateSpace()) {
+                && android.multiuser.Flags.supportAutolockForPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(icicle);
         }
     }
diff --git a/src/com/android/settings/privatespace/delete/DeletePrivateSpaceController.java b/src/com/android/settings/privatespace/delete/DeletePrivateSpaceController.java
index af4535e..a2fc6f8 100644
--- a/src/com/android/settings/privatespace/delete/DeletePrivateSpaceController.java
+++ b/src/com/android/settings/privatespace/delete/DeletePrivateSpaceController.java
@@ -34,7 +34,10 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java b/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java
index a4109b8..b483aa3 100644
--- a/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java
+++ b/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteActivity.java
@@ -35,7 +35,8 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (!android.os.Flags.allowPrivateProfile()) {
+        if (!android.os.Flags.allowPrivateProfile()
+                || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             return;
         }
         setTheme(SetupWizardUtils.getTheme(this, getIntent()));
diff --git a/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java b/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java
index 7dd3a5b..bcc220f 100644
--- a/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java
+++ b/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragment.java
@@ -56,7 +56,8 @@
 
     @Override
     public void onCreate(@Nullable Bundle icicle) {
-        if (android.os.Flags.allowPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(icicle);
         }
     }
diff --git a/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java b/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java
index 3a16641..33f0a3e 100644
--- a/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java
+++ b/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragment.java
@@ -62,7 +62,8 @@
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
-        if (android.os.Flags.allowPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(savedInstanceState);
         }
     }
diff --git a/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java b/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
index 2e3f284..04f4894 100644
--- a/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
+++ b/src/com/android/settings/privatespace/onelock/FaceFingerprintUnlockController.java
@@ -42,6 +42,7 @@
     protected boolean isUserSupported() {
         return android.os.Flags.allowPrivateProfile()
                 && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && mProfileUserId != UserHandle.USER_NULL;
     }
 
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
index dc00885..827f0b7 100644
--- a/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceBiometricSettings.java
@@ -34,7 +34,8 @@
     @Override
     public void onAttach(Context context) {
         if (android.os.Flags.allowPrivateProfile()
-                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
+                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onAttach(context);
             UserHandle privateProfileHandle =
                     PrivateSpaceMaintainer.getInstance(context).getPrivateProfileHandle();
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
index b841d9a..583a093 100644
--- a/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceFacePreferenceController.java
@@ -45,6 +45,7 @@
     protected boolean isUserSupported() {
         return android.os.Flags.allowPrivateProfile()
                 && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && getUserId() != UserHandle.USER_NULL;
     }
 
@@ -63,7 +64,8 @@
     @Override
     public int getAvailabilityStatus() {
         return android.os.Flags.allowPrivateProfile()
-                        && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
index d484904..f88c9fa 100644
--- a/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceFingerprintPreferenceController.java
@@ -47,6 +47,7 @@
     protected boolean isUserSupported() {
         return android.os.Flags.allowPrivateProfile()
                 && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 && getUserId() != UserHandle.USER_NULL;
     }
 
@@ -65,7 +66,8 @@
     @Override
     public int getAvailabilityStatus() {
         return android.os.Flags.allowPrivateProfile()
-                        && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
diff --git a/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java b/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
index efbe9f9..e0f376e 100644
--- a/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
+++ b/src/com/android/settings/privatespace/onelock/PrivateSpaceLockController.java
@@ -74,7 +74,8 @@
 
     @Override
     public boolean isAvailable() {
-        return android.os.Flags.allowPrivateProfile();
+        return android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures();
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockController.java b/src/com/android/settings/privatespace/onelock/UseOneLockController.java
index 31634b9..1af36b3 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockController.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockController.java
@@ -45,7 +45,10 @@
     }
     @Override
     public int getAvailabilityStatus() {
-        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
index fd7d02b..680f5c7 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
@@ -95,7 +95,8 @@
 
     @Override
     public boolean isAvailable() {
-        return android.os.Flags.allowPrivateProfile();
+        return android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures();
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
index 413e02a..ce017e3 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockSettingsFragment.java
@@ -39,7 +39,8 @@
 
     @Override
     public void onCreate(Bundle icicle) {
-        if (android.os.Flags.allowPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {
             super.onCreate(icicle);
         }
     }
diff --git a/src/com/android/settings/safetycenter/BiometricsSafetySource.java b/src/com/android/settings/safetycenter/BiometricsSafetySource.java
index 8e1c786..c93ced1 100644
--- a/src/com/android/settings/safetycenter/BiometricsSafetySource.java
+++ b/src/com/android/settings/safetycenter/BiometricsSafetySource.java
@@ -62,7 +62,9 @@
         }
         final Context profileParentContext =
                 context.createContextAsUser(profileParentUserHandle, 0);
-        if (android.os.Flags.allowPrivateProfile() && userManager.isPrivateProfile()) {
+        if (android.os.Flags.allowPrivateProfile()
+                && android.multiuser.Flags.enablePrivateSpaceFeatures()
+                && userManager.isPrivateProfile()) {
             // SC always expects a response from the source if the broadcast has been sent for this
             // source, therefore, we need to send a null SafetySourceData.
             SafetyCenterManagerWrapper.get().setSafetySourceData(
diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
index 15cd1ba..3241d71 100644
--- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
+++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
@@ -62,6 +62,7 @@
 import com.android.settingslib.spaprivileged.template.app.AppListItemModel
 import com.android.settingslib.spaprivileged.template.app.AppListPage
 import com.google.common.annotations.VisibleForTesting
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
@@ -130,8 +131,10 @@
     val canDisplay: Boolean,
 ) : AppRecord
 
-class UserAspectRatioAppListModel(private val context: Context)
-    : AppListModel<UserAspectRatioAppListItemModel> {
+class UserAspectRatioAppListModel(
+    private val context: Context,
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+) : AppListModel<UserAspectRatioAppListItemModel> {
 
     private val packageManager = context.packageManager
     private val userAspectRatioManager = UserAspectRatioManager(context)
@@ -203,7 +206,7 @@
             flow {
                 emit(userAspectRatioManager.getUserMinAspectRatioEntry(record.userOverride,
                     record.app.packageName, record.app.userId))
-            }.flowOn(Dispatchers.IO)
+            }.flowOn(ioDispatcher)
         }.collectAsStateWithLifecycle(initialValue = stringResource(R.string.summary_placeholder))
         return { summary }
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java
index d6a2492..404dbe5 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java
@@ -98,7 +98,20 @@
     @Test
     @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void createTutorialPages_turnOnTwoFingerTripleTapShortcut_hasOnePage() {
-        mShortcutTypes |= UserShortcutType.TWOFINGERTRIPLETAP;
+        mShortcutTypes |= UserShortcutType.TWOFINGER_DOUBLETAP;
+
+        final AlertDialog alertDialog =
+                createAccessibilityTutorialDialog(mContext, mShortcutTypes);
+
+        assertThat(createShortcutTutorialPages(mContext,
+                mShortcutTypes)).hasSize(/* expectedSize= */ 1);
+        assertThat(alertDialog).isNotNull();
+    }
+
+    @Test
+    @RequiresFlagsEnabled(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void createTutorialPages_turnOnQuickSettingShortcut_hasOnePage() {
+        mShortcutTypes |= UserShortcutType.QUICK_SETTINGS;
 
         final AlertDialog alertDialog =
                 createAccessibilityTutorialDialog(mContext, mShortcutTypes);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
index 4607a59..f108b8e 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
@@ -28,15 +28,24 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.app.Activity;
+import android.app.Application;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.icu.text.CaseMap;
 import android.os.Bundle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.Flags;
 import android.widget.PopupWindow;
 
 import androidx.annotation.Nullable;
@@ -46,9 +55,14 @@
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SubSettings;
+import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
 import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -60,13 +74,14 @@
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.Locale;
+
 /** Tests for {@link AccessibilityShortcutPreferenceFragment} */
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         com.android.settings.testutils.shadow.ShadowFragment.class,
 })
 public class AccessibilityShortcutPreferenceFragmentTest {
-
     private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
     private static final String PLACEHOLDER_CLASS_NAME = PLACEHOLDER_PACKAGE_NAME + ".placeholder";
     private static final String PLACEHOLDER_TILE_CLASS_NAME =
@@ -83,7 +98,8 @@
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
     private static final String HARDWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
-
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private TestAccessibilityShortcutPreferenceFragment mFragment;
     private PreferenceScreen mScreen;
     private Context mContext = ApplicationProvider.getApplicationContext();
@@ -206,6 +222,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     @Config(shadows = ShadowFragment.class)
     public void restoreValueFromSavedInstanceState_showTooltipView() {
         mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
@@ -223,6 +240,15 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    @Config(shadows = ShadowFragment.class)
+    public void showQuickSettingsTooltipIfNeeded_qsFlagOn_dontShowTooltipView() {
+        mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT);
+
+        assertThat(getLatestPopupWindow()).isNull();
+    }
+
+    @Test
     @Config(shadows = ShadowFragment.class)
     public void showGeneralCategory_shouldInitCategory() {
         final Bundle savedInstanceState = new Bundle();
@@ -238,6 +264,50 @@
         assertThat(mFragment.getGeneralCategoryDescription(null)).isNotNull();
     }
 
+    @Test
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_EDIT_SHORTCUTS_IN_FULL_SCREEN)
+    public void onSettingsClicked_editShortcutsFullScreenFlagOn_showFullScreenEditShortcutScreen() {
+        Activity activity = Robolectric.setupActivity(FragmentActivity.class);
+        when(mFragment.getContext()).thenReturn(activity);
+        Context context = mFragment.getContext();
+        final ShortcutPreference shortcutPreference =
+                new ShortcutPreference(context, /* attrs= */ null);
+
+        mFragment.onSettingsClicked(shortcutPreference);
+
+        Intent intent = shadowOf(
+                (Application) context.getApplicationContext()).getNextStartedActivity();
+        assertThat(intent).isNotNull();
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
+        assertThat(intent.getComponent()).isEqualTo(
+                new ComponentName(context, SubSettings.class));
+        assertThat(intent.getExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+                .isEqualTo(EditShortcutsPreferenceFragment.class.getName());
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
+        final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
+                PLACEHOLDER_COMPONENT_NAME.flattenToString(),
+                UserShortcutType.HARDWARE | UserShortcutType.QUICK_SETTINGS);
+        putUserShortcutTypeIntoSharedPreference(mContext, userPreferredShortcut);
+        final ShortcutPreference shortcutPreference =
+                new ShortcutPreference(mContext, /* attrs= */ null);
+        shortcutPreference.setChecked(true);
+        shortcutPreference.setSettingsEditable(true);
+        mFragment.mShortcutPreference = shortcutPreference;
+        String expected = CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(),
+                /* iter= */ null,
+                mContext.getString(
+                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings)
+                        + ", "
+                        + mContext.getString(R.string.accessibility_shortcut_hardware_keyword));
+
+        String summary = mFragment.getShortcutTypeSummary(mContext).toString();
+        assertThat(summary).isEqualTo(expected);
+    }
+
     private void callEmptyOnClicked(DialogInterface dialog, int which) {}
 
     private void putStringIntoSettings(String key, String componentName) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index 7825677..2d5deeb 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -18,6 +18,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.ComponentName;
 import android.content.Context;
@@ -25,20 +29,30 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Build;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
 
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.internal.accessibility.util.ShortcutUtils;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import com.android.settings.testutils.AccessibilityTestUtils;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
+import java.util.Set;
 import java.util.StringJoiner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -55,14 +69,18 @@
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
     private static final String HARDWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
+    private static final String QUICK_SETTINGS_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_QS_TARGETS;
 
     private static final String PLACEHOLDER_SETTING_FEATURE = "placeholderSettingFeature";
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     private Context mContext;
 
     @Before
     public void setUp() {
-        mContext = ApplicationProvider.getApplicationContext();
+        mContext = spy(ApplicationProvider.getApplicationContext());
     }
 
     @Test
@@ -151,11 +169,12 @@
     public void getUserShortcutTypeFromSettings_putOneValue_hasValue() {
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
 
-        final int shortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
+        final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
                 MOCK_COMPONENT_NAME);
 
-        assertThat(
-                (shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE).isTrue();
+        assertThat(shortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE
+        );
     }
 
     @Test
@@ -163,16 +182,34 @@
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
         setShortcut(UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
 
-        final int shortcutType = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
+        final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
                 MOCK_COMPONENT_NAME);
 
-        assertThat(
-                (shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE).isTrue();
-        assertThat(
-                (shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE).isTrue();
+        assertThat(shortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE
+                        | UserShortcutType.HARDWARE
+        );
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void getUserShortcutTypeFromSettings_threeShortcutTypesChosen() {
+        setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+        setShortcut(UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
+        setShortcut(UserShortcutType.QUICK_SETTINGS, MOCK_COMPONENT_NAME.flattenToString());
+
+        final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
+                MOCK_COMPONENT_NAME);
+
+        assertThat(shortcutTypes).isEqualTo(
+                UserShortcutType.SOFTWARE
+                        | UserShortcutType.HARDWARE
+                        | UserShortcutType.QUICK_SETTINGS
+        );
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInAllValuesToSettings_optInValue_haveMatchString() {
         clearShortcuts();
         int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
@@ -187,6 +224,24 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void optInAllValuesToSettings_optInValue_callsA11yManager() {
+        AccessibilityManager a11yManager =
+                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
+        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
+        int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE
+                | UserShortcutType.QUICK_SETTINGS;
+
+        AccessibilityUtil.optInAllValuesToSettings(mContext, shortcutTypes, MOCK_COMPONENT_NAME);
+
+        verify(a11yManager).enableShortcutsForTargets(
+                /* enable= */ true, shortcutTypes,
+                shortcutTargets, UserHandle.myUserId());
+        verifyNoMoreInteractions(a11yManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInValueToSettings_optInValue_haveMatchString() {
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
 
@@ -199,6 +254,23 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void optInValueToSettings_optInValue_callsA11yManager() {
+        AccessibilityManager a11yManager =
+                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
+        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME2.flattenToString());
+
+        AccessibilityUtil.optInValueToSettings(
+                mContext, UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME2);
+
+        verify(a11yManager).enableShortcutsForTargets(
+                /* enable= */ true, UserShortcutType.HARDWARE,
+                shortcutTargets, UserHandle.myUserId());
+        verifyNoMoreInteractions(a11yManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInValueToSettings_optInTwoValues_haveMatchString() {
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
 
@@ -213,6 +285,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutAllValuesToSettings_optOutValue_emptyString() {
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
         setShortcut(UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
@@ -227,6 +300,27 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void optOutAllValuesToSettings_optOutValue_callsA1yManager() {
+        AccessibilityManager a11yManager =
+                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
+        int shortcutTypes =
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE
+                        | UserShortcutType.QUICK_SETTINGS;
+        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
+
+        AccessibilityUtil.optOutAllValuesFromSettings(mContext, shortcutTypes,
+                MOCK_COMPONENT_NAME);
+
+        verify(a11yManager).enableShortcutsForTargets(
+                /* enable= */ false,
+                shortcutTypes,
+                shortcutTargets, UserHandle.myUserId());
+        verifyNoMoreInteractions(a11yManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutValueFromSettings_optOutValue_emptyString() {
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
 
@@ -237,6 +331,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutValueFromSettings_optOutValue_haveMatchString() {
         setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString(),
                 MOCK_COMPONENT_NAME2.flattenToString());
@@ -248,6 +343,55 @@
                 MOCK_COMPONENT_NAME.flattenToString());
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void optOutValueFromSettings_optOutValue_callsA11yManager() {
+        AccessibilityManager a11yManager =
+                AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
+        Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
+
+        AccessibilityUtil.optOutValueFromSettings(
+                mContext, UserShortcutType.QUICK_SETTINGS, MOCK_COMPONENT_NAME);
+
+        verify(a11yManager).enableShortcutsForTargets(
+                /* enable= */ false, UserShortcutType.QUICK_SETTINGS,
+                shortcutTargets, UserHandle.myUserId());
+        verifyNoMoreInteractions(a11yManager);
+    }
+
+    @Test
+    public void convertKeyFromSettings_shortcutTypeSoftware() {
+        assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.SOFTWARE))
+                .isEqualTo(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
+    }
+
+    @Test
+    public void convertKeyFromSettings_shortcutTypeHardware() {
+        assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.HARDWARE))
+                .isEqualTo(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
+    }
+
+    @Test
+    public void convertKeyFromSettings_shortcutTypeTripleTap() {
+        assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.TRIPLETAP))
+                .isEqualTo(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void convertKeyFromSettings_shortcutTypeMultiFingersMultiTap() {
+        assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.TWOFINGER_DOUBLETAP))
+                .isEqualTo(
+                        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void convertKeyFromSettings_shortcutTypeQuickSettings() {
+        assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.QUICK_SETTINGS))
+                .isEqualTo(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
+    }
+
     private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {
         final ApplicationInfo applicationInfo = new ApplicationInfo();
         final ServiceInfo serviceInfo = new ServiceInfo();
@@ -287,12 +431,12 @@
             shortcutComponents.add(componentName);
         }
         Settings.Secure.putString(mContext.getContentResolver(),
-                shortcutType == UserShortcutType.SOFTWARE ? SOFTWARE_SHORTCUT_KEY
-                        : HARDWARE_SHORTCUT_KEY, shortcutComponents.toString());
+                ShortcutUtils.convertToKey(shortcutType), shortcutComponents.toString());
     }
 
     private void clearShortcuts() {
         Settings.Secure.putString(mContext.getContentResolver(), SOFTWARE_SHORTCUT_KEY, "");
         Settings.Secure.putString(mContext.getContentResolver(), HARDWARE_SHORTCUT_KEY, "");
+        Settings.Secure.putString(mContext.getContentResolver(), QUICK_SETTINGS_SHORTCUT_KEY, "");
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
index cf12e34..2d5905e 100644
--- a/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
@@ -84,6 +84,9 @@
     public void getAvailabilityStatus_featureSupported_available() {
         mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
         when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(true);
+        when(mResources.getFloat(
+                com.android.internal.R.dimen.config_keyboardHapticFeedbackFixedAmplitude))
+                .thenReturn(0.8f);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
index 9155113..1a82a25 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
@@ -31,10 +31,13 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.Flags;
 import android.widget.PopupWindow;
 
 import androidx.fragment.app.FragmentActivity;
@@ -49,6 +52,7 @@
 import com.android.settings.widget.SettingsMainSwitchPreference;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -65,6 +69,8 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowFragment.class)
 public class ToggleColorInversionPreferenceFragmentTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private final Context mContext = ApplicationProvider.getApplicationContext();
     private TestToggleColorInversionPreferenceFragment mFragment;
     private PreferenceScreen mScreen;
@@ -131,6 +137,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, OFF);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
index 94db63b..850d1d79 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
@@ -35,10 +35,13 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.Flags;
 import android.widget.PopupWindow;
 
 import androidx.fragment.app.FragmentActivity;
@@ -54,6 +57,7 @@
 import com.android.settingslib.widget.SelectorWithWidgetPreference;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -70,6 +74,8 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowFragment.class)
 public class ToggleDaltonizerPreferenceFragmentTest {
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private final Context mContext = ApplicationProvider.getApplicationContext();
     private TestToggleDaltonizerPreferenceFragment mFragment;
     private PreferenceScreen mScreen;
@@ -154,6 +160,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 70c7cd6..e963bd0 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -34,10 +34,11 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.icu.text.CaseMap;
 import android.os.Bundle;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -76,6 +77,8 @@
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.Locale;
+
 /** Tests for {@link ToggleFeaturePreferenceFragment} */
 @RunWith(RobolectricTestRunner.class)
 @LooperMode(LooperMode.Mode.LEGACY)
@@ -83,9 +86,8 @@
         ShadowFragment.class,
 })
 public class ToggleFeaturePreferenceFragmentTest {
-
     @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
     private static final String PLACEHOLDER_CLASS_NAME = PLACEHOLDER_PACKAGE_NAME + ".placeholder";
@@ -295,6 +297,7 @@
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     @Config(shadows = ShadowFragment.class)
     public void onPreferenceToggledOnEnabledService_showTooltipView() {
         mFragment.onPreferenceToggled(
@@ -304,7 +307,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(com.android.settings.accessibility.Flags.FLAG_REMOVE_QS_TOOLTIP_IN_SUW)
+    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_REMOVE_QS_TOOLTIP_IN_SUW)
     @Config(shadows = ShadowFragment.class)
     public void onPreferenceToggledOnEnabledService_inSuw_toolTipViewShouldNotShow() {
         Intent suwIntent = new Intent();
@@ -318,6 +321,7 @@
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     @Config(shadows = ShadowFragment.class)
     public void onPreferenceToggledOnEnabledService_tooltipViewShown_notShowTooltipView() {
         mFragment.onPreferenceToggled(
@@ -348,7 +352,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
+    @EnableFlags(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
     public void createAppInfoPreference_withValidComponentName() {
         when(mPackageManager.isPackageAvailable(PLACEHOLDER_PACKAGE_NAME)).thenReturn(true);
         mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
@@ -363,7 +367,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
+    @EnableFlags(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
     public void createAppInfoPreference_noComponentName_shouldBeNull() {
         mFragment.mComponentName = null;
 
@@ -373,7 +377,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
+    @EnableFlags(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
     public void createAppInfoPreference_withUnavailablePackage_shouldBeNull() {
         when(mPackageManager.isPackageAvailable(PLACEHOLDER_PACKAGE_NAME)).thenReturn(false);
         mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
@@ -384,7 +388,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
+    @EnableFlags(Flags.FLAG_ACCESSIBILITY_SHOW_APP_INFO_BUTTON)
     public void createAppInfoPreference_inSetupWizard_shouldBeNull() {
         when(mFragment.isAnySetupWizard()).thenReturn(true);
         mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
@@ -421,6 +425,40 @@
                 .isEqualTo(PLACEHOLDER_COMPONENT_NAME.flattenToString());
     }
 
+    @Test
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    @Config(shadows = ShadowFragment.class)
+    public void showQuickSettingsTooltipIfNeeded_qsFlagOn_dontShowTooltipView() {
+        mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT);
+
+        assertThat(getLatestPopupWindow()).isNull();
+    }
+
+    @Test
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
+        final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
+                PLACEHOLDER_COMPONENT_NAME.flattenToString(),
+                UserShortcutType.HARDWARE | UserShortcutType.QUICK_SETTINGS);
+        putUserShortcutTypeIntoSharedPreference(mContext, userPreferredShortcut);
+        final ShortcutPreference shortcutPreference =
+                new ShortcutPreference(mContext, /* attrs= */ null);
+        shortcutPreference.setChecked(true);
+        shortcutPreference.setSettingsEditable(true);
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
+        String expected = CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(),
+                /* iter= */ null,
+                mContext.getString(
+                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings)
+                        + ", "
+                        + mContext.getString(R.string.accessibility_shortcut_hardware_keyword));
+
+        String summary = mFragment.getShortcutTypeSummary(mContext).toString();
+
+        assertThat(summary).isEqualTo(expected);
+    }
+
     private void putSecureStringIntoSettings(String key, String componentName) {
         Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index b459faa..3d24fbb 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -30,6 +30,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.settings.SettingsEnums;
@@ -39,13 +40,16 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.database.ContentObserver;
+import android.icu.text.CaseMap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.DeviceConfig;
 import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
@@ -57,6 +61,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
+import com.android.settings.testutils.AccessibilityTestUtils;
 import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settings.testutils.shadow.ShadowStorageManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -80,6 +85,8 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 
 /** Tests for {@link ToggleScreenMagnificationPreferenceFragment}. */
 @RunWith(RobolectricTestRunner.class)
@@ -92,7 +99,7 @@
 public class ToggleScreenMagnificationPreferenceFragmentTest {
 
     @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
     private static final String PLACEHOLDER_PACKAGE_NAME = "com.mock.example";
     private static final String PLACEHOLDER_CLASS_NAME =
@@ -122,13 +129,15 @@
 
     private FragmentController<ToggleScreenMagnificationPreferenceFragment> mFragController;
     private Context mContext;
+    private AccessibilityManager mAccessibilityManager;
     private Resources mSpyResources;
     private ShadowPackageManager mShadowPackageManager;
 
     @Before
     public void setUpTestFragment() {
 
-        mContext = ApplicationProvider.getApplicationContext();
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mAccessibilityManager = AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
 
         // Set up the fragment that support window magnification feature
         mSpyResources = spy(mContext.getResources());
@@ -319,26 +328,27 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void hasMagnificationValuesInSettings_twoFingerTripleTapIsOn_isTrue() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
 
         assertThat(ToggleScreenMagnificationPreferenceFragment.hasMagnificationValuesInSettings(
-                mContext, UserShortcutType.TWOFINGERTRIPLETAP)).isTrue();
+                mContext, UserShortcutType.TWOFINGER_DOUBLETAP)).isTrue();
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void hasMagnificationValuesInSettings_twoFingerTripleTapIsOff_isFalse() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, OFF);
 
         assertThat(ToggleScreenMagnificationPreferenceFragment.hasMagnificationValuesInSettings(
-                mContext, UserShortcutType.TWOFINGERTRIPLETAP)).isFalse();
+                mContext, UserShortcutType.TWOFINGER_DOUBLETAP)).isFalse();
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInAllValuesToSettings_optInValue_haveMatchString() {
         int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP;
 
@@ -351,9 +361,36 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void optInAllValuesToSettings_optInValue_callA11yManager() {
+        int shortcutTypes =
+                UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP | UserShortcutType.HARDWARE
+                        | UserShortcutType.QUICK_SETTINGS;
+        Set<String> shortcutTargets = Set.of(MAGNIFICATION_CONTROLLER_NAME);
+
+        ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
+                shortcutTypes);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true, UserShortcutType.SOFTWARE,
+                shortcutTargets, UserHandle.myUserId());
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true, UserShortcutType.HARDWARE,
+                shortcutTargets, UserHandle.myUserId());
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true, UserShortcutType.QUICK_SETTINGS,
+                shortcutTargets, UserHandle.myUserId());
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true, UserShortcutType.TRIPLETAP,
+                shortcutTargets, UserHandle.myUserId());
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInAllValuesToSettings_twoFingerTripleTap_haveMatchString() {
-        int shortcutTypes = UserShortcutType.TWOFINGERTRIPLETAP;
+        int shortcutTypes = UserShortcutType.TWOFINGER_DOUBLETAP;
 
         ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
                 shortcutTypes);
@@ -363,6 +400,7 @@
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInAllValuesToSettings_existOtherValue_optInValue_haveMatchString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
 
@@ -374,6 +412,7 @@
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optInAllValuesToSettings_software_sizeValueIsNull_putLargeSizeValue() {
         ShadowSettings.ShadowSecure.reset();
 
@@ -441,6 +480,7 @@
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutAllValuesToSettings_optOutValue_emptyString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
         putStringIntoSettings(HARDWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
@@ -457,19 +497,46 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void optOutAllValuesToSettings_optOutValue_callA11yManager() {
+        Set<String> shortcutTargets = Set.of(MAGNIFICATION_CONTROLLER_NAME);
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
+        setMagnificationTripleTapEnabled(/* enabled= */ true);
+        int shortcutTypes =
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP;
+
+        ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
+                mContext, shortcutTypes);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false, UserShortcutType.SOFTWARE,
+                shortcutTargets, UserHandle.myUserId());
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false, UserShortcutType.HARDWARE,
+                shortcutTargets, UserHandle.myUserId());
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false, UserShortcutType.TRIPLETAP,
+                shortcutTargets, UserHandle.myUserId());
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutAllValuesToSettings_twoFingerTripleTap_settingsValueIsOff() {
         Settings.Secure.putInt(mContext.getContentResolver(),
                 TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
 
         ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
-                mContext, UserShortcutType.TWOFINGERTRIPLETAP);
+                mContext, UserShortcutType.TWOFINGER_DOUBLETAP);
 
         assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                 TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON)).isEqualTo(OFF);
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void optOutValueFromSettings_existOtherValue_optOutValue_haveMatchString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY,
                 PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
@@ -526,7 +593,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void updateShortcutPreferenceData_hasTwoFingerTripleTapInSettings_assignToVariable() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
@@ -536,14 +603,14 @@
 
         final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
                 MAGNIFICATION_CONTROLLER_NAME);
-        assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGERTRIPLETAP);
+        assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void updateShortcutPreferenceData_hasTwoFingerTripleTapInSharedPref_assignToVariable() {
         final PreferredShortcut tripleTapShortcut = new PreferredShortcut(
-                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TWOFINGERTRIPLETAP);
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TWOFINGER_DOUBLETAP);
         putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
         mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
 
@@ -551,7 +618,7 @@
 
         final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
                 MAGNIFICATION_CONTROLLER_NAME);
-        assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGERTRIPLETAP);
+        assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
     }
 
     @Test
@@ -590,7 +657,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void setupMagnificationEditShortcutDialog_twoFingerTripleTapOn_checkboxIsSavedValue() {
         ToggleScreenMagnificationPreferenceFragment fragment =
                 mFragController.create(R.id.main_content, /* bundle= */
@@ -598,7 +665,7 @@
         final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
                 null);
         final PreferredShortcut twoFingerTripleTapShortcut = new PreferredShortcut(
-                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TWOFINGERTRIPLETAP);
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TWOFINGER_DOUBLETAP);
         fragment.mShortcutPreference = shortcutPreference;
 
         PreferredShortcuts.saveUserShortcutType(mContext, twoFingerTripleTapShortcut);
@@ -607,7 +674,7 @@
                 createEditShortcutDialog(fragment.getActivity()));
 
         final int checkboxValue = fragment.getShortcutTypeCheckBoxValue();
-        assertThat(checkboxValue).isEqualTo(UserShortcutType.TWOFINGERTRIPLETAP);
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
     }
 
     @Test
@@ -632,10 +699,10 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void restoreValueFromSavedInstanceState_twoFingerTripleTap_assignToVariable() {
         final Bundle fragmentState =
-                createFragmentSavedInstanceState(UserShortcutType.TWOFINGERTRIPLETAP);
+                createFragmentSavedInstanceState(UserShortcutType.TWOFINGER_DOUBLETAP);
         ToggleScreenMagnificationPreferenceFragment fragment = mFragController.get();
         // Had to use reflection to pass the savedInstanceState when launching the fragment
         ReflectionHelpers.setField(fragment, "mSavedFragmentState", fragmentState);
@@ -649,8 +716,8 @@
 
         final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
                 MAGNIFICATION_CONTROLLER_NAME);
-        assertThat(value).isEqualTo(UserShortcutType.TWOFINGERTRIPLETAP);
-        assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGERTRIPLETAP);
+        assertThat(value).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
+        assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
     }
 
     @Test
@@ -789,7 +856,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void getSummary_magnificationGestureEnabled_returnShortcutOnWithSummary() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
@@ -803,7 +870,7 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void getSummary_magnificationGestureDisabled_returnShortcutOffWithSummary() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, OFF);
@@ -817,6 +884,33 @@
                                 mContext.getText(R.string.magnification_feature_summary)));
     }
 
+    @Test
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
+        final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME,
+                UserShortcutType.HARDWARE | UserShortcutType.QUICK_SETTINGS);
+        putUserShortcutTypeIntoSharedPreference(mContext, userPreferredShortcut);
+        final ShortcutPreference shortcutPreference =
+                new ShortcutPreference(mContext, /* attrs= */ null);
+        shortcutPreference.setChecked(true);
+        shortcutPreference.setSettingsEditable(true);
+        ToggleScreenMagnificationPreferenceFragment fragment =
+                mFragController.create(R.id.main_content, /* bundle= */
+                        null).start().resume().get();
+        fragment.mShortcutPreference = shortcutPreference;
+        String expected = CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(),
+                /* iter= */ null,
+                mContext.getString(
+                        R.string.accessibility_feature_shortcut_setting_summary_quick_settings)
+                        + ", "
+                        + mContext.getString(R.string.accessibility_shortcut_hardware_keyword));
+
+        String summary = fragment.getShortcutTypeSummary(mContext).toString();
+
+        assertThat(summary).isEqualTo(expected);
+    }
+
     private void putStringIntoSettings(String key, String componentName) {
         Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
index 56486d2..526b431 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragmentTest.java
@@ -86,7 +86,10 @@
 /**
  * Tests for {@link EditShortcutsPreferenceFragment}
  */
-@Config(shadows = SettingsShadowResources.class)
+@Config(shadows = {
+        SettingsShadowResources.class,
+        com.android.settings.testutils.shadow.ShadowAccessibilityManager.class
+})
 @RunWith(RobolectricTestRunner.class)
 public class EditShortcutsPreferenceFragmentTest {
     private static final int METRICS_CATEGORY = 123;
@@ -99,7 +102,8 @@
     @Rule
     public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
 
-    private final Context mContext = ApplicationProvider.getApplicationContext();
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
     private FragmentActivity mActivity;
     private FragmentScenario<EditShortcutsPreferenceFragment> mFragmentScenario;
 
@@ -291,7 +295,7 @@
         mFragmentScenario.onFragment(fragment -> {
             TwoStatePreference preference = fragment.findPreference(
                     mContext.getString(
-                            R.string.accessibility_shortcut_two_fingers_double_tap_pref));
+                            R.string.accessibility_shortcut_two_finger_double_tap_pref));
             assertThat(preference.isChecked()).isTrue();
         });
     }
@@ -476,7 +480,26 @@
                         ));
     }
 
+    @Test
+    public void onQuickSettingsShortcutSettingChanged_preferredShortcutsUpdated() {
+        mFragmentScenario = createFragScenario(/* isInSuw= */ false);
+        mFragmentScenario.moveToState(Lifecycle.State.CREATED);
+        int currentPreferredShortcut =
+                PreferredShortcuts.retrieveUserShortcutType(mContext, TARGET);
+        assertThat(currentPreferredShortcut
+                & ShortcutConstants.UserShortcutType.QUICK_SETTINGS).isEqualTo(0);
 
+        ShortcutUtils.optInValueToSettings(
+                mContext, ShortcutConstants.UserShortcutType.QUICK_SETTINGS, TARGET);
+
+        // Calls onFragment so that the change to Setting is notified to its observer
+        mFragmentScenario.onFragment(fragment ->
+                assertThat(
+                        PreferredShortcuts.retrieveUserShortcutType(
+                                mContext, TARGET)
+                ).isEqualTo(ShortcutConstants.UserShortcutType.QUICK_SETTINGS)
+        );
+    }
 
     private void assertLaunchSubSettingWithCurrentTargetComponents(
             String componentName, boolean isInSuw) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
index 010386c..155cb22 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/GestureShortcutOptionControllerTest.java
@@ -16,9 +16,10 @@
 
 package com.android.settings.accessibility.shortcuts;
 
+import static com.android.settings.testutils.AccessibilityTestUtils.setupMockAccessibilityManager;
+
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -148,8 +149,7 @@
     }
 
     private void enableTouchExploration(boolean enable) {
-        AccessibilityManager am = mock(AccessibilityManager.class);
-        when(mContext.getSystemService(AccessibilityManager.class)).thenReturn(am);
+        AccessibilityManager am = setupMockAccessibilityManager(mContext);
         when(am.isTouchExplorationEnabled()).thenReturn(enable);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java
new file mode 100644
index 0000000..6086b17
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/QuickSettingsShortcutOptionControllerTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility.shortcuts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.internal.accessibility.common.ShortcutConstants;
+import com.android.internal.accessibility.util.ShortcutUtils;
+import com.android.settings.R;
+import com.android.settings.testutils.AccessibilityTestUtils;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Tests for {@link QuickSettingsShortcutOptionController}
+ */
+@RunWith(RobolectricTestRunner.class)
+public class QuickSettingsShortcutOptionControllerTest {
+    private static final String PREF_KEY = "prefKey";
+    private static final ComponentName TARGET = new ComponentName("FakePackage", "FakeClass");
+    private static final String TARGET_FLATTEN = TARGET.flattenToString();
+    private static final ComponentName TARGET_TILE =
+            new ComponentName("FakePackage", "FakeTileClass");
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private final Context mContext = spy(ApplicationProvider.getApplicationContext());
+    private QuickSettingsShortcutOptionController mController;
+    private ShortcutOptionPreference mShortcutOptionPreference;
+    private AccessibilityManager mAccessibilityManager;
+
+    private PreferenceScreen mPreferenceScreen;
+
+    @Before
+    public void setUp() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_quickSettingsSupported, true);
+        mAccessibilityManager = AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
+        mController = new QuickSettingsShortcutOptionController(
+                mContext, PREF_KEY);
+        mController.setShortcutTargets(Set.of(TARGET_FLATTEN));
+        mShortcutOptionPreference = new ShortcutOptionPreference(mContext);
+        mShortcutOptionPreference.setKey(PREF_KEY);
+        mPreferenceScreen = new PreferenceManager(mContext).createPreferenceScreen(mContext);
+        mPreferenceScreen.addPreference(mShortcutOptionPreference);
+    }
+
+    @Test
+    public void displayPreference_verifyScreenTextSet() {
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mShortcutOptionPreference.getTitle().toString()).isEqualTo(
+                mContext.getString(
+                        R.string.accessibility_shortcut_edit_dialog_title_quick_settings));
+        assertThat(mShortcutOptionPreference.getSummary().toString()).isEqualTo(
+                mContext.getString(
+                        R.string.accessibility_shortcut_edit_dialog_summary_quick_settings));
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void isShortcutAvailable_a11yQsShortcutFlagDisabled_returnsFalse() {
+        assertThat(mController.isShortcutAvailable()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void isShortcutAvailable_qsNotSupported_returnsFalse() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_quickSettingsSupported, false);
+
+        assertThat(mController.isShortcutAvailable()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void isShortcutAvailable_qsTileProvided_returnsTrue() {
+        when(mAccessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId()))
+                .thenReturn(Map.of(TARGET, TARGET_TILE));
+
+        assertThat(mController.isShortcutAvailable()).isTrue();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void isShortcutAvailable_qsTileNotProvided_returnsFalse() {
+        when(mAccessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId()))
+                .thenReturn(Collections.emptyMap());
+
+        assertThat(mController.isShortcutAvailable()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void isShortcutAvailable_qsTileProvided_invalidUseCase_returnFalse() {
+        AccessibilityServiceInfo mockStandardA11yService =
+                AccessibilityTestUtils.createAccessibilityServiceInfo(
+                        mContext, TARGET, /* isAlwaysOnService= */ false);
+        when(mAccessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId()))
+                .thenReturn(Map.of(TARGET, TARGET_TILE));
+        // setup target as a standard a11y service
+        when(mAccessibilityManager.getInstalledAccessibilityServiceList())
+                .thenReturn(List.of(mockStandardA11yService));
+
+        assertThat(mController.isShortcutAvailable()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void isShortcutAvailable_qsTileProvided_validUseCase_returnTrue() {
+        AccessibilityServiceInfo mockAlwaysOnA11yService =
+                AccessibilityTestUtils.createAccessibilityServiceInfo(
+                        mContext, TARGET, /* isAlwaysOnService= */ true);
+        when(mAccessibilityManager.getA11yFeatureToTileMap(UserHandle.myUserId()))
+                .thenReturn(Map.of(TARGET, TARGET_TILE));
+        // setup target as a always-on a11y service
+        when(mAccessibilityManager.getInstalledAccessibilityServiceList())
+                .thenReturn(List.of(mockAlwaysOnA11yService));
+
+
+        assertThat(mController.isShortcutAvailable()).isTrue();
+    }
+
+    @Test
+    public void isChecked_targetUseQsShortcut_returnTrue() {
+        ShortcutUtils.optInValueToSettings(
+                mContext, ShortcutConstants.UserShortcutType.QUICK_SETTINGS, TARGET_FLATTEN);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_targetNotUseQsShortcut_returnFalse() {
+        ShortcutUtils.optOutValueFromSettings(
+                mContext, ShortcutConstants.UserShortcutType.QUICK_SETTINGS, TARGET_FLATTEN);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
index 1f7e019..1eeb944 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/SoftwareShortcutOptionPreferenceControllerTest.java
@@ -22,6 +22,8 @@
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
@@ -30,14 +32,15 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.os.Build;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
 
 import androidx.fragment.app.FragmentActivity;
 
@@ -48,18 +51,18 @@
 import com.android.settings.SubSettings;
 import com.android.settings.accessibility.AccessibilityButtonFragment;
 import com.android.settings.accessibility.FloatingMenuSizePreferenceController;
+import com.android.settings.testutils.AccessibilityTestUtils;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
-import org.xmlpull.v1.XmlPullParserException;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -77,18 +80,23 @@
             new ComponentName("FakePackage", "StandardA11yService");
     private static final String SOFTWARE_SHORTCUT_SETTING_NAME =
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
-
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private Context mContext;
+    private AccessibilityManager mAccessibilityManager;
     private TestSoftwareShortcutOptionPreferenceController mController;
 
     @Before
     public void setUp() {
         mContext = spy(Robolectric.buildActivity(FragmentActivity.class).get());
+        mAccessibilityManager = AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
 
-        AccessibilityServiceInfo mAlwaysOnServiceInfo = createAccessibilityServiceInfo(
-                TARGET_ALWAYS_ON_A11Y_SERVICE, /* isAlwaysOnService= */ true);
-        AccessibilityServiceInfo mStandardServiceInfo = createAccessibilityServiceInfo(
-                TARGET_STANDARD_A11Y_SERVICE, /* isAlwaysOnService= */ false);
+        AccessibilityServiceInfo mAlwaysOnServiceInfo =
+                AccessibilityTestUtils.createAccessibilityServiceInfo(
+                        mContext, TARGET_ALWAYS_ON_A11Y_SERVICE, /* isAlwaysOnService= */ true);
+        AccessibilityServiceInfo mStandardServiceInfo =
+                AccessibilityTestUtils.createAccessibilityServiceInfo(
+                        mContext, TARGET_STANDARD_A11Y_SERVICE, /* isAlwaysOnService= */ false);
         AccessibilityManager am = mock(AccessibilityManager.class);
         when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE)).thenReturn(am);
         when(am.getInstalledAccessibilityServiceList()).thenReturn(
@@ -170,6 +178,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcut_shortcutTurnedOn() {
         String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
         mController.setShortcutTargets(Set.of(target));
@@ -185,6 +194,27 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_enableShortcut_callA11yManager() {
+        String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
+        mController.setShortcutTargets(Set.of(target));
+        assertThat(ShortcutUtils.isComponentIdExistingInSettings(
+                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target
+        )).isFalse();
+
+        mController.enableShortcutForTargets(true);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true,
+                ShortcutConstants.UserShortcutType.SOFTWARE,
+                Set.of(target),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableShortcut_shortcutTurnedOff() {
         String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
         ShortcutUtils.optInValueToSettings(
@@ -202,6 +232,29 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_disableShortcut_callA11yManager() {
+        String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
+        ShortcutUtils.optInValueToSettings(
+                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target);
+        assertThat(ShortcutUtils.isComponentIdExistingInSettings(
+                mContext, ShortcutConstants.UserShortcutType.SOFTWARE, target
+        )).isTrue();
+        mController.setShortcutTargets(Set.of(target));
+
+        mController.enableShortcutForTargets(false);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false,
+                ShortcutConstants.UserShortcutType.SOFTWARE,
+                Set.of(target),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcutWithMagnification_menuSizeIncreased() {
         mController.setShortcutTargets(Set.of(TARGET_MAGNIFICATION));
 
@@ -216,6 +269,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcutWithMagnification_userConfigureSmallMenuSize_menuSizeNotChanged() {
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
@@ -233,6 +287,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableAlwaysOnServiceShortcut_turnsOnAlwaysOnService() {
         mController.setShortcutTargets(
                 Set.of(TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString()));
@@ -244,6 +299,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableAlwaysOnServiceShortcut_turnsOffAlwaysOnService() {
         mController.setShortcutTargets(
                 Set.of(TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString()));
@@ -255,6 +311,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableStandardServiceShortcut_wontTurnOnService() {
         mController.setShortcutTargets(
                 Set.of(TARGET_STANDARD_A11Y_SERVICE.flattenToString()));
@@ -266,6 +323,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableStandardServiceShortcutWithServiceOn_wontTurnOffService() {
         mController.setShortcutTargets(
                 Set.of(TARGET_STANDARD_A11Y_SERVICE.flattenToString()));
@@ -288,32 +346,6 @@
         assertThat(intent.getExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(page);
     }
 
-    private AccessibilityServiceInfo createAccessibilityServiceInfo(
-            ComponentName componentName, boolean isAlwaysOnService) {
-        final ApplicationInfo applicationInfo = new ApplicationInfo();
-        applicationInfo.targetSdkVersion = Build.VERSION_CODES.R;
-        final ServiceInfo serviceInfo = new ServiceInfo();
-        applicationInfo.packageName = componentName.getPackageName();
-        serviceInfo.packageName = componentName.getPackageName();
-        serviceInfo.name = componentName.getClassName();
-        serviceInfo.applicationInfo = applicationInfo;
-
-        final ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.serviceInfo = serviceInfo;
-        try {
-            final AccessibilityServiceInfo info = new AccessibilityServiceInfo(resolveInfo,
-                    mContext);
-            info.setComponentName(componentName);
-            if (isAlwaysOnService) {
-                info.flags |= AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON;
-            }
-            return info;
-        } catch (XmlPullParserException | IOException e) {
-            // Do nothing
-        }
-        return null;
-    }
-
     private static class TestSoftwareShortcutOptionPreferenceController
             extends SoftwareShortcutOptionPreferenceController {
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
index 800640a..b5daac5 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TripleTapShortcutOptionControllerTest.java
@@ -21,19 +21,32 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.icu.text.MessageFormat;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil;
+import com.android.settings.testutils.AccessibilityTestUtils;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -50,13 +63,17 @@
             "com.android.server.accessibility.MagnificationController";
     private static final String TARGET_FAKE =
             new ComponentName("FakePackage", "FakeClass").flattenToString();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private final Context mContext = spy(ApplicationProvider.getApplicationContext());
     private TripleTapShortcutOptionController mController;
     private ShortcutOptionPreference mShortcutOptionPreference;
+    private AccessibilityManager mAccessibilityManager;
     private PreferenceScreen mPreferenceScreen;
 
     @Before
     public void setUp() {
+        mAccessibilityManager = AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
         mController = new TripleTapShortcutOptionController(mContext, PREF_KEY);
         mController.setShortcutTargets(Set.of(TARGET_MAGNIFICATION));
         mShortcutOptionPreference = new ShortcutOptionPreference(mContext);
@@ -147,19 +164,26 @@
 
     @Test
     public void isChecked_tripleTapConfigured_returnTrue() {
-        mController.enableShortcutForTargets(true);
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
+                AccessibilityUtil.State.ON);
 
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
     public void isChecked_tripleTapNotConfigured_returnFalse() {
-        mController.enableShortcutForTargets(false);
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
+                AccessibilityUtil.State.OFF);
 
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcut_settingUpdated() {
         mController.enableShortcutForTargets(true);
 
@@ -172,6 +196,21 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_enableShortcut_callA11yManager() {
+        mController.enableShortcutForTargets(true);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true,
+                ShortcutConstants.UserShortcutType.TRIPLETAP,
+                Set.of(TARGET_MAGNIFICATION),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableShortcut_settingUpdated() {
         mController.enableShortcutForTargets(false);
 
@@ -182,4 +221,18 @@
                         AccessibilityUtil.State.OFF)
         ).isEqualTo(AccessibilityUtil.State.OFF);
     }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_disableShortcut_callA11yManager() {
+        mController.enableShortcutForTargets(false);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false,
+                ShortcutConstants.UserShortcutType.TRIPLETAP,
+                Set.of(TARGET_MAGNIFICATION),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java
similarity index 62%
rename from tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java
rename to tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java
index d27560b..716dcdb 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingersDoubleTapShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/TwoFingerDoubleTapShortcutOptionControllerTest.java
@@ -18,22 +18,29 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.icu.text.MessageFormat;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
+import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.server.accessibility.Flags;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil;
+import com.android.settings.testutils.AccessibilityTestUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -44,26 +51,28 @@
 import java.util.Set;
 
 /**
- * Tests for {@link TwoFingersDoubleTapShortcutOptionController}
+ * Tests for {@link TwoFingerDoubleTapShortcutOptionController}
  */
 @RunWith(RobolectricTestRunner.class)
-public class TwoFingersDoubleTapShortcutOptionControllerTest {
+public class TwoFingerDoubleTapShortcutOptionControllerTest {
     private static final String PREF_KEY = "prefKey";
     private static final String TARGET_MAGNIFICATION =
             "com.android.server.accessibility.MagnificationController";
     private static final String TARGET_FAKE =
             new ComponentName("FakePackage", "FakeClass").flattenToString();
     @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private TwoFingersDoubleTapShortcutOptionController mController;
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    private final Context mContext = spy(ApplicationProvider.getApplicationContext());
+    private AccessibilityManager mAccessibilityManager;
+    private TwoFingerDoubleTapShortcutOptionController mController;
     private ShortcutOptionPreference mShortcutOptionPreference;
 
     private PreferenceScreen mPreferenceScreen;
 
     @Before
     public void setUp() {
-        mController = new TwoFingersDoubleTapShortcutOptionController(mContext, PREF_KEY);
+        mAccessibilityManager = AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
+        mController = new TwoFingerDoubleTapShortcutOptionController(mContext, PREF_KEY);
         mController.setShortcutTargets(Set.of(TARGET_MAGNIFICATION));
         mShortcutOptionPreference = new ShortcutOptionPreference(mContext);
         mShortcutOptionPreference.setKey(PREF_KEY);
@@ -84,30 +93,30 @@
                         2));
     }
 
-    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     @Test
+    @DisableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void isShortcutAvailable_featureFlagTurnedOff_returnFalse() {
         assertThat(mController.isShortcutAvailable()).isFalse();
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     @Test
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void isShortcutAvailable_multipleTargets_returnFalse() {
         mController.setShortcutTargets(Set.of(TARGET_FAKE, TARGET_MAGNIFICATION));
 
         assertThat(mController.isShortcutAvailable()).isFalse();
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     @Test
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void isShortcutAvailable_magnificationTargetOnly_returnTrue() {
         mController.setShortcutTargets(Set.of(TARGET_MAGNIFICATION));
 
         assertThat(mController.isShortcutAvailable()).isTrue();
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     @Test
+    @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
     public void isShortcutAvailable_nonMagnificationTarget_returnFalse() {
         mController.setShortcutTargets(Set.of(TARGET_FAKE));
 
@@ -116,19 +125,26 @@
 
     @Test
     public void isChecked_twoFingersDoubleTapConfigured_returnTrue() {
-        mController.enableShortcutForTargets(true);
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
+                AccessibilityUtil.State.ON);
 
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
     public void isChecked_twoFingersDoubleTapNotConfigured_returnFalse() {
-        mController.enableShortcutForTargets(false);
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
+                AccessibilityUtil.State.OFF);
 
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableShortcut_settingUpdated() {
         mController.enableShortcutForTargets(true);
 
@@ -141,6 +157,21 @@
     }
 
     @Test
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_enableShortcut_callA11yManager() {
+        mController.enableShortcutForTargets(true);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true,
+                ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP,
+                Set.of(TARGET_MAGNIFICATION),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableShortcut_settingUpdated() {
         mController.enableShortcutForTargets(false);
 
@@ -151,4 +182,18 @@
                         AccessibilityUtil.State.OFF)
         ).isEqualTo(AccessibilityUtil.State.OFF);
     }
+
+    @Test
+    @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_disableShortcut_callA11yManager() {
+        mController.enableShortcutForTargets(false);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false,
+                ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP,
+                Set.of(TARGET_MAGNIFICATION),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
index 48a90a7..511503a 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/VolumeKeysShortcutOptionControllerTest.java
@@ -18,8 +18,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.content.ComponentName;
 import android.content.Context;
+import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.Flags;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -28,8 +38,10 @@
 import com.android.internal.accessibility.common.ShortcutConstants;
 import com.android.internal.accessibility.util.ShortcutUtils;
 import com.android.settings.R;
+import com.android.settings.testutils.AccessibilityTestUtils;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -45,7 +57,11 @@
     private static final String PREF_KEY = "prefKey";
     private static final String TARGET =
             new ComponentName("FakePackage", "FakeClass").flattenToString();
-    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private final Context mContext = spy(ApplicationProvider.getApplicationContext());
+    private AccessibilityManager mAccessibilityManager;
     private VolumeKeysShortcutOptionController mController;
     private ShortcutOptionPreference mShortcutOptionPreference;
 
@@ -53,6 +69,7 @@
 
     @Before
     public void setUp() {
+        mAccessibilityManager = AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
         mController = new VolumeKeysShortcutOptionController(
                 mContext, PREF_KEY);
         mController.setShortcutTargets(Set.of(TARGET));
@@ -94,6 +111,7 @@
     }
 
     @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_enableVolumeKeysShortcut_shortcutSet() {
         mController.enableShortcutForTargets(true);
 
@@ -103,6 +121,21 @@
     }
 
     @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_enableVolumeKeysShortcut_callA11yManager() {
+        mController.enableShortcutForTargets(true);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ true,
+                ShortcutConstants.UserShortcutType.HARDWARE,
+                Set.of(TARGET),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
     public void enableShortcutForTargets_disableVolumeKeysShortcut_shortcutNotSet() {
         mController.enableShortcutForTargets(false);
 
@@ -110,4 +143,18 @@
                 ShortcutUtils.isComponentIdExistingInSettings(
                         mContext, ShortcutConstants.UserShortcutType.HARDWARE, TARGET)).isFalse();
     }
+
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void enableShortcutForTargets_disableVolumeKeysShortcut_callA11yManager() {
+        mController.enableShortcutForTargets(false);
+
+        verify(mAccessibilityManager).enableShortcutsForTargets(
+                /* enable= */ false,
+                ShortcutConstants.UserShortcutType.HARDWARE,
+                Set.of(TARGET),
+                UserHandle.myUserId()
+        );
+        verifyNoMoreInteractions(mAccessibilityManager);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java
index f3b105b..ce03a6d 100644
--- a/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java
@@ -16,16 +16,19 @@
 
 package com.android.settings.applications.appcompat;
 
+import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_3_2;
 import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_APP_DEFAULT;
 import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_FULLSCREEN;
 import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_UNSET;
 
 import static com.android.settings.applications.AppInfoBase.ARG_PACKAGE_NAME;
+import static com.android.settings.applications.appcompat.UserAspectRatioDetails.KEY_HEADER_BUTTONS;
 import static com.android.settings.applications.appcompat.UserAspectRatioDetails.KEY_PREF_3_2;
 import static com.android.settings.applications.appcompat.UserAspectRatioDetails.KEY_PREF_DEFAULT;
 import static com.android.settings.applications.appcompat.UserAspectRatioDetails.KEY_PREF_FULLSCREEN;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -99,6 +102,31 @@
     }
 
     @Test
+    public void testOrderOfOptionsFollowsConfig() {
+        doReturn(true).when(mUserAspectRatioManager)
+                .hasAspectRatioOption(anyInt(), anyString());
+        doReturn(0).when(mUserAspectRatioManager)
+                .getUserMinAspectRatioOrder(USER_MIN_ASPECT_RATIO_3_2);
+        doReturn(1).when(mUserAspectRatioManager)
+                .getUserMinAspectRatioOrder(USER_MIN_ASPECT_RATIO_FULLSCREEN);
+        doReturn(2).when(mUserAspectRatioManager)
+                .getUserMinAspectRatioOrder(USER_MIN_ASPECT_RATIO_UNSET);
+        rule.getScenario().onActivity(a -> doReturn(a).when(mFragment).getActivity());
+        final Bundle args = new Bundle();
+        args.putString(ARG_PACKAGE_NAME, anyString());
+        mFragment.setArguments(args);
+        mFragment.onCreate(Bundle.EMPTY);
+
+        final int topOfList = mFragment.findPreference(KEY_HEADER_BUTTONS).getOrder();
+
+        assertTrue(topOfList < mFragment.findPreference(KEY_PREF_3_2).getOrder());
+        assertTrue(mFragment.findPreference(KEY_PREF_3_2).getOrder()
+                < mFragment.findPreference(KEY_PREF_FULLSCREEN).getOrder());
+        assertTrue(mFragment.findPreference(KEY_PREF_FULLSCREEN).getOrder()
+                < mFragment.findPreference(KEY_PREF_DEFAULT).getOrder());
+    }
+
+    @Test
     public void onRadioButtonClicked_prefChange_shouldStopActivity() throws RemoteException {
         doReturn(USER_MIN_ASPECT_RATIO_UNSET).when(mFragment)
                 .getSelectedUserMinAspectRatio(anyString());
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
index 1aedce5..6df8b8e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
@@ -253,6 +253,24 @@
     }
 
     @Test
+    public void intro_CheckNullPropsReturnsErrorString() {
+        setupFingerprintEnrollIntroWith(newTokenOnlyIntent());
+        when(mFingerprintManager.getSensorPropertiesInternal()).thenReturn(null);
+        final int result = mFingerprintEnrollIntroduction.checkMaxEnrolled();
+
+        assertThat(result).isEqualTo(R.string.fingerprint_intro_error_unknown);
+    }
+
+    @Test
+    public void intro_CheckEmptyPropsReturnsErrorString() {
+        setupFingerprintEnrollIntroWith(newTokenOnlyIntent());
+        when(mFingerprintManager.getSensorPropertiesInternal()).thenReturn(List.of());
+        final int result = mFingerprintEnrollIntroduction.checkMaxEnrolled();
+
+        assertThat(result).isEqualTo(R.string.fingerprint_intro_error_unknown);
+    }
+
+    @Test
     public void intro_CheckGenerateChallenge() {
         setupFingerprintEnrollIntroWith(newGkPwHandleAndFromSettingsIntent());
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java
index b6af0f9..3ab0e69 100644
--- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.dashboard.profileselector;
 
 import static android.content.Intent.EXTRA_USER_ID;
+import static android.content.pm.UserInfo.FLAG_MAIN;
 import static android.os.UserManager.USER_TYPE_FULL_SYSTEM;
 import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
 import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;
@@ -174,7 +175,8 @@
 
     @Test
     public void getTabId_setPrivateId_getCorrectTab() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         final Bundle bundle = new Bundle();
         bundle.putInt(EXTRA_USER_ID, 11);
         mUserManager.setPrivateProfile(11, "private", 0);
@@ -204,9 +206,10 @@
 
     @Test
     public void testGetFragments_whenOnlyPersonal_returnsOneFragment() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mUserManager.addProfile(
-                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PRIMARY_USER_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         Fragment[] fragments = ProfileSelectFragment.getFragments(
                 mContext,
                 null /* bundle */,
@@ -219,7 +222,7 @@
     @Test
     public void testGetFragments_whenPrivateDisabled_returnsOneFragment() {
         mUserManager.addProfile(
-                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PRIMARY_USER_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         mUserManager.addProfile(
                 new UserInfo(11, PRIVATE_USER_NAME, null, 0, USER_TYPE_PROFILE_PRIVATE));
         Fragment[] fragments = ProfileSelectFragment.getFragments(
@@ -239,9 +242,10 @@
 
     @Test
     public void testGetFragments_whenPrivateEnabled_returnsTwoFragments() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mUserManager.addProfile(
-                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PRIMARY_USER_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         mUserManager.addProfile(
                 new UserInfo(11, PRIVATE_USER_NAME, null, 0, USER_TYPE_PROFILE_PRIVATE));
         Fragment[] fragments = ProfileSelectFragment.getFragments(
@@ -261,9 +265,10 @@
 
     @Test
     public void testGetFragments_whenManagedProfile_returnsTwoFragments() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mUserManager.addProfile(
-                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PRIMARY_USER_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         mUserManager.addProfile(
                 new UserInfo(10, MANAGED_USER_NAME, null, 0, USER_TYPE_PROFILE_MANAGED));
         Fragment[] fragments = ProfileSelectFragment.getFragments(
@@ -283,9 +288,10 @@
 
     @Test
     public void testGetFragments_whenAllProfiles_returnsThreeFragments() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mUserManager.addProfile(
-                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PRIMARY_USER_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         mUserManager.addProfile(
                 new UserInfo(10, MANAGED_USER_NAME, null, 0, USER_TYPE_PROFILE_MANAGED));
         mUserManager.addProfile(
@@ -307,9 +313,10 @@
 
     @Test
     public void testGetFragments_whenAvailableBundle_returnsFragmentsWithCorrectBundles() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mUserManager.addProfile(
-                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PRIMARY_USER_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         mUserManager.addProfile(
                 new UserInfo(10, MANAGED_USER_NAME, null, 0, USER_TYPE_PROFILE_MANAGED));
         mUserManager.addProfile(
diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java
index 22fec8f..3cc47a8 100644
--- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.dashboard.profileselector;
 
+import static android.content.pm.UserInfo.FLAG_MAIN;
 import static android.os.UserManager.USER_TYPE_FULL_SYSTEM;
 import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
 import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;
@@ -60,7 +61,7 @@
     public void setUp() {
         mUserManager = ShadowUserManager.getShadow();
         mUserManager.addProfile(
-                new UserInfo(0, PERSONAL_PROFILE_NAME, null, 0, USER_TYPE_FULL_SYSTEM));
+                new UserInfo(0, PERSONAL_PROFILE_NAME, null, FLAG_MAIN, USER_TYPE_FULL_SYSTEM));
         mUserManager.addProfile(
                 new UserInfo(1, WORK_PROFILE_NAME, null, 0, USER_TYPE_PROFILE_MANAGED));
         mUserManager.addProfile(
diff --git a/tests/robotests/src/com/android/settings/development/quarantine/QuarantinedAppsScreenControllerTest.java b/tests/robotests/src/com/android/settings/development/quarantine/QuarantinedAppsScreenControllerTest.java
deleted file mode 100644
index a93e529..0000000
--- a/tests/robotests/src/com/android/settings/development/quarantine/QuarantinedAppsScreenControllerTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import static org.mockito.AdditionalMatchers.aryEq;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.SuspendDialogInfo;
-import android.os.UserHandle;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class QuarantinedAppsScreenControllerTest {
-    private static final String PREF_KEY = "quarantined_apps_screen";
-    private static final String TEST_PACKAGE = "com.example.test.pkg";
-    private static final int TEST_APP_ID = 1234;
-    private static final int TEST_USER_ID = 10;
-
-    private Context mContext;
-    private QuarantinedAppsScreenController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        mController = new QuarantinedAppsScreenController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void testOnPreferenceChange() {
-        final Context userContext = mock(Context.class);
-        doReturn(userContext).when(mContext).createContextAsUser(
-                eq(UserHandle.of(TEST_USER_ID)), anyInt());
-        final PackageManager packageManager = mock(PackageManager.class);
-        doReturn(packageManager).when(userContext).getPackageManager();
-
-        final AppEntry entry = createAppEntry(TEST_PACKAGE, TEST_APP_ID, TEST_USER_ID);
-        final QuarantinedAppPreference preference = new QuarantinedAppPreference(mContext, entry);
-
-        mController.onPreferenceChange(preference, true);
-        verify(packageManager).setPackagesSuspended(aryEq(new String[] {TEST_PACKAGE}), eq(true),
-                isNull(), isNull(), any(SuspendDialogInfo.class),
-                eq(PackageManager.FLAG_SUSPEND_QUARANTINED));
-
-        mController.onPreferenceChange(preference, false);
-        verify(packageManager).setPackagesSuspended(aryEq(new String[] {TEST_PACKAGE}), eq(false),
-                isNull(), isNull(), isNull(),
-                eq(PackageManager.FLAG_SUSPEND_QUARANTINED));
-    }
-
-    private AppEntry createAppEntry(String packageName, int appId, int userId) {
-        final AppEntry entry = mock(AppEntry.class);
-        entry.info = createApplicationInfo(packageName, appId, userId);
-        entry.extraInfo = false;
-        return entry;
-    }
-
-    private ApplicationInfo createApplicationInfo(String packageName, int appId, int userId) {
-        final ApplicationInfo info = new ApplicationInfo();
-        info.packageName = packageName;
-        info.uid = UserHandle.getUid(userId, appId);
-        return info;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java b/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java
index 8cda2d9..5d895d9 100644
--- a/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/AccessibilityTestUtils.java
@@ -20,11 +20,25 @@
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.os.Build;
 import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
 
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+
 /**
  * Utility class for common methods used in the accessibility feature related tests
  */
@@ -47,4 +61,39 @@
                     NAV_BAR_MODE_3BUTTON);
         }
     }
+
+    /**
+     * Returns a mock {@link AccessibilityManager}
+     */
+    public static AccessibilityManager setupMockAccessibilityManager(Context mockContext) {
+        AccessibilityManager am = mock(AccessibilityManager.class);
+        when(mockContext.getSystemService(AccessibilityManager.class)).thenReturn(am);
+        return am;
+    }
+
+    public static AccessibilityServiceInfo createAccessibilityServiceInfo(
+            Context context, ComponentName componentName, boolean isAlwaysOnService) {
+        final ApplicationInfo applicationInfo = new ApplicationInfo();
+        applicationInfo.targetSdkVersion = Build.VERSION_CODES.R;
+        final ServiceInfo serviceInfo = new ServiceInfo();
+        applicationInfo.packageName = componentName.getPackageName();
+        serviceInfo.packageName = componentName.getPackageName();
+        serviceInfo.name = componentName.getClassName();
+        serviceInfo.applicationInfo = applicationInfo;
+
+        final ResolveInfo resolveInfo = new ResolveInfo();
+        resolveInfo.serviceInfo = serviceInfo;
+        try {
+            final AccessibilityServiceInfo info = new AccessibilityServiceInfo(resolveInfo,
+                    context);
+            info.setComponentName(componentName);
+            if (isAlwaysOnService) {
+                info.flags |= AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON;
+            }
+            return info;
+        } catch (XmlPullParserException | IOException e) {
+            // Do nothing
+        }
+        return null;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
new file mode 100644
index 0000000..d6e17d4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.annotation.UserIdInt;
+import android.content.ComponentName;
+import android.view.accessibility.AccessibilityManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Shadow of {@link AccessibilityManager} with the hidden methods
+ */
+@Implements(AccessibilityManager.class)
+public class ShadowAccessibilityManager extends org.robolectric.shadows.ShadowAccessibilityManager {
+    /**
+     * Implements a hidden method {@link AccessibilityManager.getA11yFeatureToTileMap} and returns
+     * an empty map.
+     */
+    @Implementation
+    public Map<ComponentName, ComponentName> getA11yFeatureToTileMap(@UserIdInt int userId) {
+        return Collections.emptyMap();
+    }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
index 5f80855..7124b6a 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
@@ -120,7 +120,7 @@
             on { loadFirstCycle() } doReturn usageData
         }
         controller.onViewCreated(TestLifecycleOwner())
-        waitUntil { preference.summary != null }
+        waitUntil { !preference.summary.isNullOrBlank() }
 
         controller.handlePreferenceTreeClick(preference)
 
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.kt
new file mode 100644
index 0000000..ca37082
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony
+
+import android.content.Context
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.isOff
+import androidx.compose.ui.test.isOn
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settingslib.spa.testutils.waitUntilExists
+import kotlinx.coroutines.flow.flowOf
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doNothing
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+import org.mockito.kotlin.whenever
+
+@RunWith(AndroidJUnit4::class)
+class MobileNetworkSwitchControllerTest {
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    private val mockSubscriptionManager = mock<SubscriptionManager> {
+        on { isSubscriptionEnabled(SUB_ID) } doReturn true
+    }
+
+    private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+        on { subscriptionManager } doReturn mockSubscriptionManager
+        doNothing().whenever(mock).startActivity(any())
+    }
+
+    private val mockSubscriptionRepository = mock<SubscriptionRepository> {
+        on { getSelectableSubscriptionInfoList() } doReturn listOf(SubInfo)
+        on { isSubscriptionEnabledFlow(SUB_ID) } doReturn flowOf(false)
+    }
+
+    private val controller = MobileNetworkSwitchController(
+        context = context,
+        preferenceKey = TEST_KEY,
+        subscriptionRepository = mockSubscriptionRepository,
+    ).apply { init(SUB_ID) }
+
+    @Test
+    fun isVisible_pSimAndCanDisablePhysicalSubscription_returnTrue() {
+        val pSimSubInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID)
+            setEmbedded(false)
+        }.build()
+        mockSubscriptionManager.stub {
+            on { canDisablePhysicalSubscription() } doReturn true
+        }
+        mockSubscriptionRepository.stub {
+            on { getSelectableSubscriptionInfoList() } doReturn listOf(pSimSubInfo)
+        }
+
+        setContent()
+
+        composeTestRule.onNodeWithText(context.getString(R.string.mobile_network_use_sim_on))
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun isVisible_pSimAndCannotDisablePhysicalSubscription_returnFalse() {
+        val pSimSubInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID)
+            setEmbedded(false)
+        }.build()
+        mockSubscriptionManager.stub {
+            on { canDisablePhysicalSubscription() } doReturn false
+        }
+        mockSubscriptionRepository.stub {
+            on { getSelectableSubscriptionInfoList() } doReturn listOf(pSimSubInfo)
+        }
+
+        setContent()
+
+        composeTestRule.onNodeWithText(context.getString(R.string.mobile_network_use_sim_on))
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun isVisible_eSim_returnTrue() {
+        val eSimSubInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID)
+            setEmbedded(true)
+        }.build()
+        mockSubscriptionRepository.stub {
+            on { getSelectableSubscriptionInfoList() } doReturn listOf(eSimSubInfo)
+        }
+
+        setContent()
+
+        composeTestRule.onNodeWithText(context.getString(R.string.mobile_network_use_sim_on))
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun isChecked_subscriptionEnabled_switchIsOn() {
+        mockSubscriptionRepository.stub {
+            on { isSubscriptionEnabledFlow(SUB_ID) } doReturn flowOf(true)
+        }
+
+        setContent()
+
+        composeTestRule.waitUntilExists(
+            hasText(context.getString(R.string.mobile_network_use_sim_on)) and isOn()
+        )
+    }
+
+    @Test
+    fun isChecked_subscriptionNotEnabled_switchIsOff() {
+        mockSubscriptionRepository.stub {
+            on { isSubscriptionEnabledFlow(SUB_ID) } doReturn flowOf(false)
+        }
+
+        setContent()
+
+        composeTestRule.waitUntilExists(
+            hasText(context.getString(R.string.mobile_network_use_sim_on)) and isOff()
+        )
+    }
+
+    private fun setContent() {
+        composeTestRule.setContent {
+            CompositionLocalProvider(LocalContext provides context) {
+                controller.Content()
+            }
+        }
+    }
+
+    private companion object {
+        const val TEST_KEY = "test_key"
+        const val SUB_ID = 123
+
+        val SubInfo: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+            setId(SUB_ID)
+            setEmbedded(true)
+        }.build()
+    }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt
index a59bf93..80b3175 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt
@@ -17,12 +17,14 @@
 package com.android.settings.network.telephony
 
 import android.content.Context
+import android.telephony.SubscriptionInfo
 import android.telephony.SubscriptionManager
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
 import com.android.settingslib.spa.testutils.toListWithTimeout
 import com.google.common.truth.Truth.assertThat
+import java.util.UUID
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
@@ -47,16 +49,16 @@
     }
 
     private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
-        on { getSystemService(SubscriptionManager::class.java) } doReturn mockSubscriptionManager
+        on { subscriptionManager } doReturn mockSubscriptionManager
     }
 
     @Test
     fun isSubscriptionEnabledFlow() = runBlocking {
         mockSubscriptionManager.stub {
-            on { isSubscriptionEnabled(SUB_ID) } doReturn true
+            on { isSubscriptionEnabled(SUB_ID_1) } doReturn true
         }
 
-        val isEnabled = context.isSubscriptionEnabledFlow(SUB_ID).firstWithTimeoutOrNull()
+        val isEnabled = context.isSubscriptionEnabledFlow(SUB_ID_1).firstWithTimeoutOrNull()
 
         assertThat(isEnabled).isTrue()
     }
@@ -80,7 +82,69 @@
         assertThat(listDeferred.await()).hasSize(2)
     }
 
+    @Test
+    fun getSelectableSubscriptionInfoList_sortedBySubId() {
+        mockSubscriptionManager.stub {
+            on { getAvailableSubscriptionInfoList() } doReturn listOf(
+                SubscriptionInfo.Builder().apply {
+                    setId(SUB_ID_2)
+                }.build(),
+                SubscriptionInfo.Builder().apply {
+                    setId(SUB_ID_1)
+                }.build(),
+            )
+        }
+
+        val subInfos = context.getSelectableSubscriptionInfoList()
+
+        assertThat(subInfos.map { it.subscriptionId }).containsExactly(SUB_ID_1, SUB_ID_2).inOrder()
+    }
+
+    @Test
+    fun getSelectableSubscriptionInfoList_sameGroupAndOneHasSlot_returnTheOneWithSimSlotIndex() {
+        mockSubscriptionManager.stub {
+            on { getAvailableSubscriptionInfoList() } doReturn listOf(
+                SubscriptionInfo.Builder().apply {
+                    setId(SUB_ID_1)
+                    setGroupUuid(GROUP_UUID)
+                }.build(),
+                SubscriptionInfo.Builder().apply {
+                    setId(SUB_ID_2)
+                    setGroupUuid(GROUP_UUID)
+                    setSimSlotIndex(SIM_SLOT_INDEX)
+                }.build(),
+            )
+        }
+
+        val subInfos = context.getSelectableSubscriptionInfoList()
+
+        assertThat(subInfos.map { it.subscriptionId }).containsExactly(SUB_ID_2)
+    }
+
+    @Test
+    fun getSelectableSubscriptionInfoList_sameGroupAndNonHasSlot_returnTheOneWithMinimumSubId() {
+        mockSubscriptionManager.stub {
+            on { getAvailableSubscriptionInfoList() } doReturn listOf(
+                SubscriptionInfo.Builder().apply {
+                    setId(SUB_ID_2)
+                    setGroupUuid(GROUP_UUID)
+                }.build(),
+                SubscriptionInfo.Builder().apply {
+                    setId(SUB_ID_1)
+                    setGroupUuid(GROUP_UUID)
+                }.build(),
+            )
+        }
+
+        val subInfos = context.getSelectableSubscriptionInfoList()
+
+        assertThat(subInfos.map { it.subscriptionId }).containsExactly(SUB_ID_1)
+    }
+
     private companion object {
-        const val SUB_ID = 1
+        const val SUB_ID_1 = 1
+        const val SUB_ID_2 = 2
+        val GROUP_UUID = UUID.randomUUID().toString()
+        const val SIM_SLOT_INDEX = 1
     }
 }
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/scan/NetworkScanRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/scan/NetworkScanRepositoryTest.kt
new file mode 100644
index 0000000..070c779
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/scan/NetworkScanRepositoryTest.kt
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.scan
+
+import android.content.Context
+import android.telephony.AccessNetworkConstants.AccessNetworkType
+import android.telephony.CellIdentityCdma
+import android.telephony.CellIdentityGsm
+import android.telephony.CellIdentityLte
+import android.telephony.CellInfoCdma
+import android.telephony.CellInfoGsm
+import android.telephony.CellInfoLte
+import android.telephony.NetworkScan
+import android.telephony.NetworkScanRequest
+import android.telephony.PhoneCapability
+import android.telephony.TelephonyManager
+import android.telephony.TelephonyManager.NETWORK_CLASS_BITMASK_5G
+import android.telephony.TelephonyScanManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanCellInfos
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanComplete
+import com.android.settings.network.telephony.scan.NetworkScanRepository.NetworkScanError
+import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
+import com.android.settingslib.spa.testutils.toListWithTimeout
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+import org.mockito.kotlin.verify
+
+@RunWith(AndroidJUnit4::class)
+class NetworkScanRepositoryTest {
+
+    private var callback: TelephonyScanManager.NetworkScanCallback? = null
+
+    private val mockTelephonyManager = mock<TelephonyManager> {
+        on { createForSubscriptionId(SUB_ID) } doReturn mock
+        on { requestNetworkScan(any(), any(), any()) } doAnswer {
+            callback = it.arguments[2] as TelephonyScanManager.NetworkScanCallback
+            mock<NetworkScan>()
+        }
+    }
+
+    private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+        on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
+    }
+
+    private val repository = NetworkScanRepository(context, SUB_ID)
+
+    @Test
+    fun networkScanFlow_initial() = runBlocking {
+        val result = repository.networkScanFlow().firstWithTimeoutOrNull()
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun networkScanFlow_onResults(): Unit = runBlocking {
+        val cellInfos = listOf(CellInfoCdma().apply { cellIdentity = CELL_IDENTITY_CDMA })
+        val listDeferred = async {
+            repository.networkScanFlow().toListWithTimeout()
+        }
+        delay(100)
+
+        callback?.onResults(cellInfos)
+
+        assertThat(listDeferred.await()).containsExactly(NetworkScanCellInfos(cellInfos))
+    }
+
+    @Test
+    fun networkScanFlow_onComplete(): Unit = runBlocking {
+        val listDeferred = async {
+            repository.networkScanFlow().toListWithTimeout()
+        }
+        delay(100)
+
+        callback?.onComplete()
+
+        assertThat(listDeferred.await()).containsExactly(NetworkScanComplete)
+    }
+
+    @Test
+    fun networkScanFlow_onError(): Unit = runBlocking {
+        val listDeferred = async {
+            repository.networkScanFlow().toListWithTimeout()
+        }
+        delay(100)
+
+        callback?.onError(1)
+
+        assertThat(listDeferred.await()).containsExactly(NetworkScanError(1))
+    }
+
+    @Test
+    fun networkScanFlow_hasDuplicateItems(): Unit = runBlocking {
+        val cellInfos = listOf(
+            createCellInfoLte("123", false),
+            createCellInfoLte("123", false),
+            createCellInfoLte("124", true),
+            createCellInfoLte("124", true),
+            createCellInfoGsm("123", false),
+            createCellInfoGsm("123", false),
+        )
+        val listDeferred = async {
+            repository.networkScanFlow().toListWithTimeout()
+        }
+        delay(100)
+
+        callback?.onResults(cellInfos)
+
+        assertThat(listDeferred.await()).containsExactly(
+            NetworkScanCellInfos(
+                listOf(
+                    createCellInfoLte("123", false),
+                    createCellInfoLte("124", true),
+                    createCellInfoGsm("123", false),
+                )
+            )
+        )
+    }
+
+
+    @Test
+    fun networkScanFlow_noDuplicateItems(): Unit = runBlocking {
+        val cellInfos = listOf(
+            createCellInfoLte("123", false),
+            createCellInfoLte("123", true),
+            createCellInfoLte("124", false),
+            createCellInfoLte("124", true),
+            createCellInfoGsm("456", false),
+            createCellInfoGsm("456", true),
+        )
+        val listDeferred = async {
+            repository.networkScanFlow().toListWithTimeout()
+        }
+        delay(100)
+
+        callback?.onResults(cellInfos)
+
+        assertThat(listDeferred.await()).containsExactly(
+            NetworkScanCellInfos(
+                listOf(
+                    createCellInfoLte("123", false),
+                    createCellInfoLte("123", true),
+                    createCellInfoLte("124", false),
+                    createCellInfoLte("124", true),
+                    createCellInfoGsm("456", false),
+                    createCellInfoGsm("456", true),
+                )
+            )
+        )
+    }
+
+    @Test
+    fun createNetworkScan_deviceHasNrSa_requestNgran(): Unit = runBlocking {
+        mockTelephonyManager.stub {
+            on { getAllowedNetworkTypesBitmask() } doReturn NETWORK_CLASS_BITMASK_5G
+            on { getPhoneCapability() } doReturn
+                createPhoneCapability(intArrayOf(PhoneCapability.DEVICE_NR_CAPABILITY_SA))
+        }
+
+        repository.networkScanFlow().firstWithTimeoutOrNull()
+
+        verify(mockTelephonyManager).requestNetworkScan(argThat<NetworkScanRequest> {
+            specifiers.any { it.radioAccessNetwork == AccessNetworkType.NGRAN }
+        }, any(), any())
+    }
+
+    @Test
+    fun createNetworkScan_deviceNoNrSa_noNgran(): Unit = runBlocking {
+        mockTelephonyManager.stub {
+            on { getAllowedNetworkTypesBitmask() } doReturn NETWORK_CLASS_BITMASK_5G
+            on { getPhoneCapability() } doReturn
+                createPhoneCapability(intArrayOf(PhoneCapability.DEVICE_NR_CAPABILITY_NSA))
+        }
+
+        repository.networkScanFlow().firstWithTimeoutOrNull()
+
+        verify(mockTelephonyManager).requestNetworkScan(argThat<NetworkScanRequest> {
+            specifiers.none { it.radioAccessNetwork == AccessNetworkType.NGRAN }
+        }, any(), any())
+    }
+
+    private companion object {
+        const val SUB_ID = 1
+        const val LONG = "Long"
+        const val SHORT = "Short"
+
+        val CELL_IDENTITY_CDMA = CellIdentityCdma(
+            /* nid = */ 1,
+            /* sid = */ 2,
+            /* bid = */ 3,
+            /* lon = */ 4,
+            /* lat = */ 5,
+            /* alphal = */ LONG,
+            /* alphas = */ SHORT,
+        )
+
+        private fun createCellInfoLte(alphaLong: String, registered: Boolean): CellInfoLte {
+            val cellIdentityLte = CellIdentityLte(
+                /* ci = */ 1,
+                /* pci = */ 2,
+                /* tac = */ 3,
+                /* earfcn = */ 4,
+                /* bands = */ intArrayOf(1, 2),
+                /* bandwidth = */ 10000,
+                /* mccStr = */ null,
+                /* mncStr = */ null,
+                /* alphal = */ alphaLong,
+                /* alphas = */ null,
+                /* additionalPlmns = */ emptyList(),
+                /* csgInfo = */ null,
+            )
+            return CellInfoLte().apply {
+                cellIdentity = cellIdentityLte
+                isRegistered = registered
+            }
+        }
+
+        private fun createCellInfoGsm(alphaLong: String, registered: Boolean): CellInfoGsm {
+            val cellIdentityGsm = CellIdentityGsm(
+                /* lac = */ 1,
+                /* cid = */ 2,
+                /* arfcn = */ 3,
+                /* bsic = */ 4,
+                /* mccStr = */ "123",
+                /* mncStr = */ "01",
+                /* alphal = */ alphaLong,
+                /* alphas = */ null,
+                /* additionalPlmns = */ emptyList(),
+            )
+            return CellInfoGsm().apply {
+                cellIdentity = cellIdentityGsm
+                isRegistered = registered
+            }
+        }
+
+        private fun createPhoneCapability(deviceNrCapabilities: IntArray) =
+            PhoneCapability.Builder().setDeviceNrCapabilities(deviceNrCapabilities).build()
+    }
+}
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
index dfacca8..b859df4 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
@@ -32,7 +32,11 @@
 import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
 import com.android.settingslib.spaprivileged.template.app.AppListItemModel
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -45,6 +49,8 @@
 class UserAspectRatioAppsPageProviderTest {
     @get:Rule
     val composeTestRule = createComposeRule()
+    private val testDispatcher = StandardTestDispatcher()
+    private val testScope = TestScope(testDispatcher)
 
     private val context: Context = ApplicationProvider.getApplicationContext()
     private val fakeNavControllerWrapper = FakeNavControllerWrapper()
@@ -137,33 +143,37 @@
         }
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun aspectRatioAppListModel_getSummaryDefault() {
-        val summary = getSummary(USER_MIN_ASPECT_RATIO_UNSET)
+    fun aspectRatioAppListModel_getSummaryDefault() = testScope.runTest {
+        val summary = setSummary(USER_MIN_ASPECT_RATIO_UNSET)
+        advanceUntilIdle()
 
-        assertThat(summary).isEqualTo(context.getString(R.string.user_aspect_ratio_app_default))
+        assertThat(summary()).isEqualTo(context.getString(R.string.user_aspect_ratio_app_default))
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun aspectRatioAppListModel_getSummaryWhenSplitScreen() {
-        val summary = getSummary(USER_MIN_ASPECT_RATIO_SPLIT_SCREEN)
+    fun aspectRatioAppListModel_getSummaryWhenSplitScreen() = testScope.runTest {
+        val summary = setSummary(USER_MIN_ASPECT_RATIO_SPLIT_SCREEN)
+        advanceUntilIdle()
 
-        assertThat(summary).isEqualTo(context.getString(R.string.user_aspect_ratio_half_screen))
+        assertThat(summary()).isEqualTo(context.getString(R.string.user_aspect_ratio_half_screen))
     }
 
-    private fun getSummary(userOverride: Int): String {
-        val listModel = UserAspectRatioAppListModel(context)
+    private fun setSummary(userOverride: Int): () -> String {
+        val listModel = UserAspectRatioAppListModel(context, testDispatcher)
+        val record = UserAspectRatioAppListItemModel(
+            app = APP,
+            userOverride = userOverride,
+            suggested = false,
+            canDisplay = true,
+        )
         lateinit var summary: () -> String
         composeTestRule.setContent {
-            summary = listModel.getSummary(option = 0,
-                record = UserAspectRatioAppListItemModel(
-                    app = APP,
-                    userOverride = userOverride,
-                    suggested = false,
-                    canDisplay = true,
-                ))
+            summary =  listModel.getSummary(option = 0, record = record)
         }
-        return summary()
+        return summary
     }
 
 
diff --git a/tests/uitests/src/com/android/settings/ui/SecuritySettingsTest.kt b/tests/uitests/src/com/android/settings/ui/SecuritySettingsTest.kt
index b5a4fe9..b792959 100644
--- a/tests/uitests/src/com/android/settings/ui/SecuritySettingsTest.kt
+++ b/tests/uitests/src/com/android/settings/ui/SecuritySettingsTest.kt
@@ -49,7 +49,8 @@
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+            android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES)
     fun privateSpace_ifFlagON() {
         device.assertHasTexts(listOf("Private Space"))
     }
diff --git a/tests/uitests/src/com/android/settings/ui/privatespace/PrivateSpaceAuthenticationActivityTest.kt b/tests/uitests/src/com/android/settings/ui/privatespace/PrivateSpaceAuthenticationActivityTest.kt
index 8eadd9d..14feb49 100644
--- a/tests/uitests/src/com/android/settings/ui/privatespace/PrivateSpaceAuthenticationActivityTest.kt
+++ b/tests/uitests/src/com/android/settings/ui/privatespace/PrivateSpaceAuthenticationActivityTest.kt
@@ -38,7 +38,8 @@
 
 
 @RunWith(AndroidJUnit4::class)
-@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)
+@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+        android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES)
 class PrivateSpaceAuthenticationActivityTest {
     private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
 
diff --git a/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
index e3c07ef..4ef63d0 100644
--- a/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
+++ b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
@@ -25,16 +25,22 @@
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
+import android.view.accessibility.Flags;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.internal.accessibility.common.ShortcutConstants;
+import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
 import com.android.internal.accessibility.util.ShortcutUtils;
 
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -54,7 +60,8 @@
             CLASS_NAME_2);
     private static final ContentResolver sContentResolver =
             ApplicationProvider.getApplicationContext().getContentResolver();
-
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
     private final Context mContext = ApplicationProvider.getApplicationContext();
 
     @Before
@@ -166,11 +173,48 @@
                 .isEqualTo(target2ShortcutTypes);
     }
 
+    @Test
+    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void updatePreferredShortcutFromSettings_colorInversionWithQsAndSoftwareShortcut_preferredShortcutsMatches() {
+        String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString();
+        Settings.Secure.putString(sContentResolver,
+                Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, target);
+        Settings.Secure.putString(sContentResolver,
+                Settings.Secure.ACCESSIBILITY_QS_TARGETS, target);
+
+        PreferredShortcuts.updatePreferredShortcutsFromSettings(mContext, Set.of(target));
+
+        int savedPreferredShortcut = PreferredShortcuts.retrieveUserShortcutType(
+                mContext, target);
+        assertThat(savedPreferredShortcut).isEqualTo(
+                UserShortcutType.SOFTWARE | UserShortcutType.QUICK_SETTINGS);
+
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+    public void updatePreferredShortcutFromSettings_colorInversionWithQsAndHardwareShortcut_qsShortcutNotSaved() {
+        String target = COLOR_INVERSION_COMPONENT_NAME.flattenToString();
+        Settings.Secure.putString(sContentResolver,
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, target);
+        Settings.Secure.putString(sContentResolver,
+                Settings.Secure.ACCESSIBILITY_QS_TARGETS, target);
+        assertThat(!android.view.accessibility.Flags.a11yQsShortcut()).isTrue();
+
+        PreferredShortcuts.updatePreferredShortcutsFromSettings(mContext, Set.of(target));
+
+        int savedPreferredShortcut = PreferredShortcuts.retrieveUserShortcutType(
+                mContext, target);
+        assertThat(savedPreferredShortcut).isEqualTo(UserShortcutType.HARDWARE);
+    }
+
     private static void clearShortcuts() {
         Settings.Secure.putString(sContentResolver,
                 Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, "");
         Settings.Secure.putString(sContentResolver,
                 Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, "");
+        Settings.Secure.putString(sContentResolver,
+                Settings.Secure.ACCESSIBILITY_QS_TARGETS, "");
         Settings.Secure.putInt(
                 sContentResolver,
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
@@ -179,5 +223,7 @@
                 sContentResolver,
                 Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
                 AccessibilityUtil.State.OFF);
+
+        PreferredShortcuts.clearPreferredShortcuts(ApplicationProvider.getApplicationContext());
     }
 }
diff --git a/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java b/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
index a671a45..3a330f2 100644
--- a/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java
@@ -310,7 +310,8 @@
         when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);
         mSetFlagsRule.enableFlags(
                 android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mCombinedBiometricStatusUtils.getPrivateProfileSettingsClassName())
                 .isEqualTo(Settings.PrivateSpaceBiometricSettingsActivity.class.getName());
diff --git a/tests/unit/src/com/android/settings/development/quarantine/QuarantinedAppStateBridgeTest.java b/tests/unit/src/com/android/settings/development/quarantine/QuarantinedAppStateBridgeTest.java
deleted file mode 100644
index 707d2b9..0000000
--- a/tests/unit/src/com/android/settings/development/quarantine/QuarantinedAppStateBridgeTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.UserHandle;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class QuarantinedAppStateBridgeTest {
-    private static final String TEST_PACKAGE = "com.example.test.pkg";
-    private static final int TEST_APP_ID = 1234;
-    private static final int TEST_USER_ID_1 = 0;
-    private static final int TEST_USER_ID_2 = 10;
-
-    @Mock
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void updateExtraInfo_packageQuarantined() throws Exception {
-        setPackageQuarantined(TEST_PACKAGE, TEST_USER_ID_1, false);
-        setPackageQuarantined(TEST_PACKAGE, TEST_USER_ID_2, true);
-
-        final QuarantinedAppStateBridge bridge =
-                new QuarantinedAppStateBridge(mContext, null, null);
-        final AppEntry entry = mock(AppEntry.class);
-
-        bridge.updateExtraInfo(entry, TEST_PACKAGE, UserHandle.getUid(TEST_USER_ID_2, TEST_APP_ID));
-        assertThat(entry.extraInfo).isEqualTo(true);
-    }
-
-    @Test
-    public void updateExtraInfo_packageNotQuarantined() throws Exception {
-        setPackageQuarantined(TEST_PACKAGE, TEST_USER_ID_1, false);
-        setPackageQuarantined(TEST_PACKAGE, TEST_USER_ID_2, false);
-
-        final QuarantinedAppStateBridge bridge =
-                new QuarantinedAppStateBridge(mContext, null, null);
-        final AppEntry entry = mock(AppEntry.class);
-
-        bridge.updateExtraInfo(entry, TEST_PACKAGE, UserHandle.getUid(TEST_USER_ID_2, TEST_APP_ID));
-        assertThat(entry.extraInfo).isEqualTo(false);
-    }
-
-    private void setPackageQuarantined(String packageName, int userId, boolean quarantined)
-            throws Exception {
-        final Context userContext = mock(Context.class);
-        when(mContext.createContextAsUser(eq(UserHandle.of(userId)), anyInt()))
-                .thenReturn(userContext);
-        final PackageManager packageManager = mock(PackageManager.class);
-        when(userContext.getPackageManager()).thenReturn(packageManager);
-        when(packageManager.isPackageQuarantined(packageName)).thenReturn(quarantined);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/development/quarantine/QuarantinedAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/quarantine/QuarantinedAppsPreferenceControllerTest.java
deleted file mode 100644
index 33e4392..0000000
--- a/tests/unit/src/com/android/settings/development/quarantine/QuarantinedAppsPreferenceControllerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.settings.development.quarantine;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static org.junit.Assert.assertEquals;
-
-import android.content.Context;
-import android.content.pm.Flags;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class QuarantinedAppsPreferenceControllerTest {
-
-    private static final String PREF_KEY = "quarantined_apps";
-
-    @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
-
-    @Mock
-    private Context mContext;
-    private QuarantinedAppsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new QuarantinedAppsPreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    @RequiresFlagsEnabled(Flags.FLAG_QUARANTINED_ENABLED)
-    public void testAvailabilityStatus_flagEnabled() {
-        assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
-    }
-
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_QUARANTINED_ENABLED)
-    public void testAvailabilityStatus_flagDisabled() {
-        assertEquals(mController.getAvailabilityStatus(), CONDITIONALLY_UNAVAILABLE);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
deleted file mode 100644
index ae10ca8..0000000
--- a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Looper;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyCallback;
-import android.telephony.TelephonyManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import androidx.test.annotation.UiThreadTest;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settings.flags.Flags;
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.widget.SettingsMainSwitchPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-import java.util.Arrays;
-import java.util.concurrent.Executor;
-
-public class MobileNetworkSwitchControllerTest {
-    @Rule
-    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private SubscriptionInfo mSubscription;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-
-    private PreferenceScreen mScreen;
-    private PreferenceManager mPreferenceManager;
-    private SettingsMainSwitchPreference mSwitchBar;
-    private Context mContext;
-    private MobileNetworkSwitchController mController;
-    private int mSubId = 123;
-
-    @Before
-    public void setUp() {
-        mSetFlagsRule.disableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED);
-
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
-                .thenReturn(true);
-
-        when(mSubscription.isEmbedded()).thenReturn(true);
-        when(mSubscription.getSubscriptionId()).thenReturn(mSubId);
-        // Most tests want to have 2 available subscriptions so that the switch bar will show.
-        final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
-        when(sub2.getSubscriptionId()).thenReturn(456);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription, sub2));
-
-        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.createForSubscriptionId(mSubId))
-                .thenReturn(mTelephonyManager);
-
-        final String key = "prefKey";
-        mController = new MobileNetworkSwitchController(mContext, key);
-        mController.init(mSubscription.getSubscriptionId());
-
-        mPreferenceManager = new PreferenceManager(mContext);
-        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
-        mSwitchBar = new SettingsMainSwitchPreference(mContext);
-        mSwitchBar.setKey(key);
-        mSwitchBar.setTitle("123");
-        mScreen.addPreference(mSwitchBar);
-
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view = inflater.inflate(mSwitchBar.getLayoutResource(),
-                new LinearLayout(mContext), false);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(view);
-        mSwitchBar.onBindViewHolder(holder);
-    }
-
-    @After
-    public void cleanUp() {
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
-    }
-
-    @Test
-    @UiThreadTest
-    public void isAvailable_pSIM_isNotAvailable() {
-        when(mSubscription.isEmbedded()).thenReturn(false);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isFalse();
-
-        when(mSubscriptionManager.canDisablePhysicalSubscription()).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-    }
-
-    @Test
-    @UiThreadTest
-    public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {
-        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-    }
-
-    @Test
-    @UiThreadTest
-    public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {
-        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mSwitchBar.isShowing()).isTrue();
-    }
-
-    @Test
-    @UiThreadTest
-    public void displayPreference_subscriptionEnabled_switchIsOn() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isTrue();
-    }
-
-    @Test
-    @UiThreadTest
-    public void displayPreference_subscriptionDisabled_switchIsOff() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isFalse();
-    }
-
-    @Test
-    @UiThreadTest
-    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isTrue();
-
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(intentCaptor.capture());
-
-        // set switch off then should start a Activity.
-        mSwitchBar.setChecked(false);
-
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
-        // Simulate action of back from previous activity.
-        mController.displayPreference(mScreen);
-        Bundle extra = intentCaptor.getValue().getExtras();
-
-        verify(mContext, times(1)).startActivity(any());
-        assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
-        assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable))
-                .isEqualTo(false);
-        assertThat(mSwitchBar.isChecked()).isFalse();
-    }
-
-    @Test
-    @UiThreadTest
-    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {
-        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
-                .thenReturn(false);
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isTrue();
-
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(intentCaptor.capture());
-
-        // set switch off then should start a Activity.
-        mSwitchBar.setChecked(false);
-
-        // Simulate action of back from previous activity.
-        mController.displayPreference(mScreen);
-        Bundle extra = intentCaptor.getValue().getExtras();
-
-        verify(mContext, times(1)).startActivity(any());
-        assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
-        assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable))
-                .isEqualTo(false);
-        assertThat(mSwitchBar.isChecked()).isTrue();
-    }
-
-    @Test
-    @UiThreadTest
-    public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isFalse();
-
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(intentCaptor.capture());
-        mSwitchBar.setChecked(true);
-        Bundle extra = intentCaptor.getValue().getExtras();
-
-        verify(mContext, times(1)).startActivity(any());
-        assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
-        assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable)).isEqualTo(true);
-    }
-    @Test
-    @UiThreadTest
-    public void onResumeAndonPause_registerAndUnregisterTelephonyCallback() {
-        mController.onResume();
-
-        verify(mTelephonyManager)
-                .registerTelephonyCallback(any(Executor.class), any(TelephonyCallback.class));
-
-        mController.onPause();
-        verify(mTelephonyManager)
-                .unregisterTelephonyCallback(any(TelephonyCallback.class));
-    }
-
-    @Test
-    @UiThreadTest
-    public void onPause_doNotRegisterAndUnregisterTelephonyCallback() {
-        mController.onPause();
-        verify(mTelephonyManager, times(0))
-                .unregisterTelephonyCallback(any(TelephonyCallback.class));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkScanHelperTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
deleted file mode 100644
index f046c9a..0000000
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkScanHelperTest.java
+++ /dev/null
@@ -1,260 +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.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.telephony.AccessNetworkConstants;
-import android.telephony.CellInfo;
-import android.telephony.ModemInfo;
-import android.telephony.NetworkScan;
-import android.telephony.NetworkScanRequest;
-import android.telephony.PhoneCapability;
-import android.telephony.RadioAccessSpecifier;
-import android.telephony.TelephonyManager;
-import android.telephony.TelephonyScanManager;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@RunWith(AndroidJUnit4.class)
-public class NetworkScanHelperTest {
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private List<CellInfo> mCellInfos;
-    @Mock
-    private NetworkScanHelper.NetworkScanCallback mNetworkScanCallback;
-
-    private static final long THREAD_EXECUTION_TIMEOUT_MS = 3000L;
-
-    private ExecutorService mNetworkScanExecutor;
-    private NetworkScanHelper mNetworkScanHelper;
-
-    private static final int SCAN_ID = 1234;
-    private static final int SUB_ID = 1;
-
-    private NetworkScan mNetworkScan;
-
-    public class NetworkScanMock extends NetworkScan {
-        NetworkScanMock(int scanId, int subId) {
-            super(scanId, subId);
-        }
-
-        @Override
-        public void stopScan() {
-            return;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mNetworkScanExecutor = Executors.newFixedThreadPool(1);
-
-        mNetworkScanHelper = new NetworkScanHelper(mTelephonyManager,
-                mNetworkScanCallback, mNetworkScanExecutor);
-
-        mNetworkScan = spy(new NetworkScanMock(SCAN_ID, SUB_ID));
-    }
-
-    @Test
-    public void startNetworkScan_incrementalAndSuccess_completionWithResult() {
-        when(mCellInfos.size()).thenReturn(1);
-
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                TelephonyScanManager.NetworkScanCallback callback =
-                        (TelephonyScanManager.NetworkScanCallback)
-                        (invocation.getArguments()[2]);
-                callback.onResults(mCellInfos);
-                callback.onComplete();
-                return mNetworkScan;
-            }
-        }).when(mTelephonyManager).requestNetworkScan(
-                any(NetworkScanRequest.class), any(Executor.class),
-                any(TelephonyScanManager.NetworkScanCallback.class));
-
-        ArgumentCaptor<List<CellInfo>> argument = ArgumentCaptor.forClass(List.class);
-
-        startNetworkScan_incremental(true);
-
-        verify(mNetworkScanCallback, times(1)).onResults(argument.capture());
-        List<CellInfo> actualResult = argument.getValue();
-        assertThat(actualResult.size()).isEqualTo(mCellInfos.size());
-        verify(mNetworkScanCallback, times(1)).onComplete();
-    }
-
-    @Test
-    public void startNetworkScan_incrementalAndImmediateFailure_failureWithErrorCode() {
-        doReturn(null).when(mTelephonyManager).requestNetworkScan(
-                any(NetworkScanRequest.class), any(Executor.class),
-                any(TelephonyScanManager.NetworkScanCallback.class));
-
-        startNetworkScan_incremental(true);
-
-        verify(mNetworkScanCallback, times(1)).onError(anyInt());
-    }
-
-    @Test
-    public void startNetworkScan_incrementalAndFailure_failureWithErrorCode() {
-        doAnswer(new Answer() {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                TelephonyScanManager.NetworkScanCallback callback =
-                        (TelephonyScanManager.NetworkScanCallback)
-                        (invocation.getArguments()[2]);
-                callback.onError(NetworkScan.ERROR_MODEM_ERROR);
-                return mNetworkScan;
-            }
-        }).when(mTelephonyManager).requestNetworkScan(
-                any(NetworkScanRequest.class), any(Executor.class),
-                any(TelephonyScanManager.NetworkScanCallback.class));
-
-        startNetworkScan_incremental(true);
-
-        verify(mNetworkScanCallback, times(1)).onError(anyInt());
-    }
-
-    @Test
-    public void startNetworkScan_incrementalAndAbort_doStop() {
-        doReturn(mNetworkScan).when(mTelephonyManager).requestNetworkScan(
-                any(NetworkScanRequest.class), any(Executor.class),
-                any(TelephonyScanManager.NetworkScanCallback.class));
-
-        startNetworkScan_incremental(false);
-
-        verify(mNetworkScan, times(1)).stopScan();
-    }
-
-    @Test
-    public void createNetworkScanForPreferredAccessNetworks_deviceNoNrSa_noNgran() {
-        int[] deviceNrCapabilities = new int[]{PhoneCapability.DEVICE_NR_CAPABILITY_NSA};
-        PhoneCapability phoneCapability = createPhoneCapability(deviceNrCapabilities);
-        doReturn(TelephonyManager.NETWORK_CLASS_BITMASK_2G
-                | TelephonyManager.NETWORK_CLASS_BITMASK_3G
-                | TelephonyManager.NETWORK_CLASS_BITMASK_4G
-                | TelephonyManager.NETWORK_CLASS_BITMASK_5G).when(
-                mTelephonyManager).getPreferredNetworkTypeBitmask();
-        doReturn(phoneCapability).when(mTelephonyManager).getPhoneCapability();
-        List<RadioAccessSpecifier> radioAccessSpecifiers = new ArrayList<>();
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.GERAN, null,
-                        null));
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.UTRAN, null,
-                        null));
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.EUTRAN, null,
-                        null));
-        NetworkScanRequest expectedNetworkScanRequest = createNetworkScanRequest(
-                radioAccessSpecifiers);
-
-        assertEquals(expectedNetworkScanRequest,
-                mNetworkScanHelper.createNetworkScanForPreferredAccessNetworks());
-    }
-
-    @Test
-    public void createNetworkScanForPreferredAccessNetworks_deviceHasNrSa_hasNgran() {
-        int[] deviceNrCapabilities = new int[]{PhoneCapability.DEVICE_NR_CAPABILITY_NSA,
-                PhoneCapability.DEVICE_NR_CAPABILITY_SA};
-        PhoneCapability phoneCapability = createPhoneCapability(deviceNrCapabilities);
-        doReturn(TelephonyManager.NETWORK_CLASS_BITMASK_2G
-                | TelephonyManager.NETWORK_CLASS_BITMASK_3G
-                | TelephonyManager.NETWORK_CLASS_BITMASK_4G
-                | TelephonyManager.NETWORK_CLASS_BITMASK_5G).when(
-                mTelephonyManager).getPreferredNetworkTypeBitmask();
-        doReturn(phoneCapability).when(mTelephonyManager).getPhoneCapability();
-        List<RadioAccessSpecifier> radioAccessSpecifiers = new ArrayList<>();
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.GERAN, null,
-                        null));
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.UTRAN, null,
-                        null));
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.EUTRAN, null,
-                        null));
-        radioAccessSpecifiers.add(
-                new RadioAccessSpecifier(AccessNetworkConstants.AccessNetworkType.NGRAN, null,
-                        null));
-        NetworkScanRequest expectedNetworkScanRequest = createNetworkScanRequest(
-                radioAccessSpecifiers);
-
-        assertEquals(expectedNetworkScanRequest,
-                mNetworkScanHelper.createNetworkScanForPreferredAccessNetworks());
-    }
-
-    private PhoneCapability createPhoneCapability(int[] deviceNrCapabilities) {
-        int maxActiveVoiceCalls = 1;
-        int maxActiveData = 2;
-        ModemInfo modemInfo = new ModemInfo(1, 2, true, false);
-        List<ModemInfo> logicalModemList = new ArrayList<>();
-        logicalModemList.add(modemInfo);
-        return new PhoneCapability(maxActiveVoiceCalls, maxActiveData,
-                logicalModemList, false, deviceNrCapabilities);
-    }
-
-    private NetworkScanRequest createNetworkScanRequest(
-            List<RadioAccessSpecifier> radioAccessSpecifiers) {
-        return new NetworkScanRequest(
-                NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
-                radioAccessSpecifiers.toArray(
-                        new RadioAccessSpecifier[radioAccessSpecifiers.size()]),
-                mNetworkScanHelper.SEARCH_PERIODICITY_SEC,
-                mNetworkScanHelper.MAX_SEARCH_TIME_SEC,
-                mNetworkScanHelper.INCREMENTAL_RESULTS,
-                mNetworkScanHelper.INCREMENTAL_RESULTS_PERIODICITY_SEC,
-                null /* List of PLMN ids (MCC-MNC) */);
-    }
-
-    private void startNetworkScan_incremental(boolean waitForCompletion) {
-        mNetworkScanHelper.startNetworkScan(
-                NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS);
-        if (!waitForCompletion) {
-            mNetworkScanHelper.stopNetworkQuery();
-        }
-    }
-
-}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
index 512e484..a4657ce 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -83,7 +83,6 @@
 
     public Context mContext;
     public PreferenceCategory mPreferenceCategory;
-    public boolean mIsAggregationEnabled = true;
 
     private TargetClass mNetworkSelectSettings;
 
@@ -104,7 +103,6 @@
         doReturn(mCellId2).when(mCellInfo2).getCellIdentity();
         doReturn(mock(CellSignalStrength.class)).when(mCellInfo2).getCellSignalStrength();
         doReturn(CARRIER_NAME2).when(mCellId2).getOperatorAlphaLong();
-        mIsAggregationEnabled = true;
         mNetworkSelectSettings = spy(new TargetClass(this));
 
         PersistableBundle config = new PersistableBundle();
@@ -177,11 +175,6 @@
         }
 
         @Override
-        protected boolean enableAggregation(Context context) {
-            return mTestEnv.mIsAggregationEnabled;
-        }
-
-        @Override
         protected int getSubId() {
             return SUB_ID;
         }
@@ -212,84 +205,7 @@
     }
 
     @Test
-    public void doAggregation_hasDuplicateItemsDiffCellIdCase1_removeSamePlmnRatItem() {
-        mNetworkSelectSettings.onCreateInitialization();
-        List<CellInfo> testList = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createLteCellInfo(true, 1234, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
-        List<CellInfo> expected = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
-    }
-
-    @Test
-    public void doAggregation_hasDuplicateItemsDiffCellIdCase2_removeSamePlmnRatItem() {
-        mNetworkSelectSettings.onCreateInitialization();
-        List<CellInfo> testList = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
-                createLteCellInfo(false, 1234, "123", "232", "CarrierB"),
-                createGsmCellInfo(false, 1234, "123", "232", "CarrierB"));
-        List<CellInfo> expected = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
-                createLteCellInfo(false, 1234, "123", "232", "CarrierB"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
-    }
-
-    @Test
-    public void doAggregation_hasDuplicateItemsDiffMccMncCase1_removeSamePlmnRatItem() {
-        mNetworkSelectSettings.onCreateInitialization();
-        List<CellInfo> testList = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createLteCellInfo(true, 123, "456", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
-        List<CellInfo> expected = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
-    }
-
-    @Test
-    public void doAggregation_hasDuplicateItemsDiffMccMncCase2_removeSamePlmnRatItem() {
-        mNetworkSelectSettings.onCreateInitialization();
-        List<CellInfo> testList = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
-                createLteCellInfo(false, 1234, "123", "232", "CarrierB"),
-                createGsmCellInfo(false, 123, "456", "232", "CarrierB"));
-        List<CellInfo> expected = Arrays.asList(
-                createLteCellInfo(true, 123, "123", "232", "CarrierA"),
-                createGsmCellInfo(false, 123, "123", "232", "CarrierB"),
-                createLteCellInfo(false, 1234, "123", "232", "CarrierB"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
-    }
-
-    @Test
-    public void doAggregation_hasDuplicateItemsDiffMccMncCase3_removeSamePlmnRatItem() {
-        PersistableBundle config = new PersistableBundle();
-        config.putBoolean(
-                CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL, false);
-        doReturn(config).when(mCarrierConfigManager).getConfigForSubId(eq(SUB_ID),
-                eq(CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL),
-                eq(CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL));
-
-        mNetworkSelectSettings.onCreateInitialization();
-        List<CellInfo> testList = Arrays.asList(
-                createLteCellInfo(false, 123, "123", "232", "CarrierA"),
-                createLteCellInfo(false, 124, "123", "233", "CarrierA"),
-                createLteCellInfo(true, 125, "123", "234", "CarrierA"),
-                createGsmCellInfo(false, 126, "456", "232", "CarrierA"));
-        List<CellInfo> expected = Arrays.asList(
-                createLteCellInfo(true, 125, "123", "234", "CarrierA"),
-                createGsmCellInfo(false, 126, "456", "232", "CarrierA"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
-    }
-
-    @Test
-    public void doAggregation_filterOutSatellitePlmn_whenKeyIsTrue() {
+    public void filterOutSatellitePlmn_filterOutSatellitePlmn_whenKeyIsTrue() {
         PersistableBundle config = new PersistableBundle();
         config.putBoolean(
                 CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL, true);
@@ -313,11 +229,11 @@
         List<CellInfo> expected = Arrays.asList(
                 createGsmCellInfo(false, 123, "123", "233", "CarrierB"),
                 createLteCellInfo(false, 1234, "123", "234", "CarrierC"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+        assertThat(mNetworkSelectSettings.filterOutSatellitePlmn(testList)).isEqualTo(expected);
     }
 
     @Test
-    public void doAggregation_filterOutSatellitePlmn_whenNoSatellitePlmnIsAvailable() {
+    public void filterOutSatellitePlmn_filterOutSatellitePlmn_whenNoSatellitePlmnIsAvailable() {
         PersistableBundle config = new PersistableBundle();
         config.putBoolean(
                 CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL, true);
@@ -345,17 +261,17 @@
                 createGsmCellInfo(false, 123, "123", "233", "CarrierB"),
                 createLteCellInfo(false, 1234, "123", "234", "CarrierC"),
                 createGsmCellInfo(false, 12345, "123", "235", "CarrierD"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+        assertThat(mNetworkSelectSettings.filterOutSatellitePlmn(testList)).isEqualTo(expected);
 
         // Expect no filter out when KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL is false.
         config.putBoolean(
                 CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL, false);
         mNetworkSelectSettings.onCreateInitialization();
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+        assertThat(mNetworkSelectSettings.filterOutSatellitePlmn(testList)).isEqualTo(expected);
     }
 
     @Test
-    public void doAggregation_filterOutSatellitePlmn_whenKeyIsFalse() {
+    public void filterOutSatellitePlmn_filterOutSatellitePlmn_whenKeyIsFalse() {
         PersistableBundle config = new PersistableBundle();
         config.putBoolean(
                 CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL, true);
@@ -381,7 +297,7 @@
                 createGsmCellInfo(false, 123, "123", "233", "CarrierB"),
                 createLteCellInfo(false, 1234, "123", "234", "CarrierC"),
                 createGsmCellInfo(false, 12345, "123", "235", "CarrierD"));
-        assertThat(mNetworkSelectSettings.doAggregation(testList)).isEqualTo(expected);
+        assertThat(mNetworkSelectSettings.filterOutSatellitePlmn(testList)).isEqualTo(expected);
     }
 
     private CellInfoLte createLteCellInfo(boolean registered, int cellId, String mcc, String mnc,
diff --git a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
index f1da363..857135f 100644
--- a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
@@ -75,7 +75,8 @@
     public void getAvailabilityStatus_whenFlagsEnabled_returnsAvailable() {
         mSetFlagsRule.enableFlags(
                 android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(true);
     }
@@ -83,18 +84,33 @@
     /** Tests that the controller is not available when Biometrics flag is not enabled. */
     @Test
     public void getAvailabilityStatus_whenBiometricFlagDisabled_returnsFalse() {
-        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mSetFlagsRule.disableFlags(
                 android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
 
         assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);
     }
 
-    /** Tests that the controller is not available when private feature flag is not enabled. */
+    /**
+     * Tests that the controller is not available when the main private space flag is not
+     * enabled.
+     */
     @Test
-    public void getAvailabilityStatus_whenPrivateFlagDisabled_returnsFalse() {
+    public void getAvailabilityStatus_whenPsMainFlagDisabled_returnsFalse() {
         mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
         mSetFlagsRule.enableFlags(
+                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
+
+        assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);
+    }
+
+    /** Tests that the controller is not available when private features flag is not enabled. */
+    @Test
+    public void getAvailabilityStatus_whenPsFeaturesFlagDisabled_returnsFalse() {
+        mSetFlagsRule.disableFlags(android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
+        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
                 android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
 
         assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);
@@ -106,7 +122,8 @@
         doReturn(false).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         mSetFlagsRule.enableFlags(
                 android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mFaceFingerprintUnlockController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isFalse();
@@ -119,7 +136,8 @@
         doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         mSetFlagsRule.enableFlags(
                 android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mFaceFingerprintUnlockController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isTrue();
diff --git a/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceControllerTest.java b/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceControllerTest.java
index 0abe314..b71547b 100644
--- a/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceControllerTest.java
@@ -40,7 +40,8 @@
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)
+@RequiresFlagsEnabled({Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+        android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES})
 public class HidePrivateSpaceControllerTest {
     @Rule
     public final CheckFlagsRule mCheckFlagsRule =
diff --git a/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsControllerTest.java b/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsControllerTest.java
index 1430dfd..88503a5 100644
--- a/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSensitiveNotificationsControllerTest.java
@@ -67,7 +67,8 @@
 
         mSetFlagsRule.enableFlags(
                 android.multiuser.Flags.FLAG_ENABLE_PS_SENSITIVE_NOTIFICATIONS_TOGGLE);
-        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateProfileId = PrivateSpaceMaintainer.getInstance(
                 mContext).getPrivateProfileHandle().getIdentifier();
@@ -143,7 +144,8 @@
     public void getAvailabilityStatus_flagDisabled() {
         mSetFlagsRule.disableFlags(
                 android.multiuser.Flags.FLAG_ENABLE_PS_SENSITIVE_NOTIFICATIONS_TOGGLE);
-        mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1);
         Settings.Secure.putInt(mContext.getContentResolver(),
diff --git a/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSummaryControllerTest.java b/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSummaryControllerTest.java
index 39f7b9c..ed072d3 100644
--- a/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSummaryControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/HidePrivateSpaceSummaryControllerTest.java
@@ -40,7 +40,8 @@
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)
+@RequiresFlagsEnabled({Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+        android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES})
 public class HidePrivateSpaceSummaryControllerTest {
     @Rule
     public final CheckFlagsRule mCheckFlagsRule =
diff --git a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivityTest.java b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivityTest.java
index 4c6feea..8a7bd70 100644
--- a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivityTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceAuthenticationActivityTest.java
@@ -88,7 +88,8 @@
     /** Tests that when Private does not exist setup flow is started. */
     //TODO(b/307729746) Plan to add more tests for complete setup flow
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)
+    @RequiresFlagsEnabled({Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+            android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES})
     public void whenPrivateProfileDoesNotExist_triggersSetupFlow() {
         when(mPrivateSpaceMaintainer.doesPrivateSpaceExist()).thenReturn(false);
 
diff --git a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java
index 0d9db7e..c203a3c 100644
--- a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java
@@ -80,7 +80,8 @@
     /** Tests that the controller is always available. */
     @Test
     public void getAvailabilityStatus_returnsAvailable() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mPrivateSpaceLockController.isAvailable()).isEqualTo(true);
     }
@@ -89,7 +90,8 @@
     @Test
     public void getSummary_whenScreenLock() {
         doReturn(false).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateSpaceLockController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isFalse();
@@ -103,7 +105,8 @@
                 .when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         doReturn(CREDENTIAL_TYPE_PATTERN)
                 .when(mLockPatternUtils).getCredentialTypeForUser(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateSpaceLockController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isTrue();
@@ -115,7 +118,8 @@
     public void getSummary_whenProfileLockPin() {
         doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         doReturn(CREDENTIAL_TYPE_PIN).when(mLockPatternUtils).getCredentialTypeForUser(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateSpaceLockController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isTrue();
@@ -129,7 +133,8 @@
                 .when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         doReturn(CREDENTIAL_TYPE_PASSWORD)
                 .when(mLockPatternUtils).getCredentialTypeForUser(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateSpaceLockController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isTrue();
diff --git a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
index 8510b11..50f67d3 100644
--- a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceMaintainerTest.java
@@ -148,7 +148,8 @@
     public void createPrivateSpace_psDoesNotExist_setsDefaultPsSensitiveNotificationsValue() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_ENABLE_PS_SENSITIVE_NOTIFICATIONS_TOGGLE);
+                android.multiuser.Flags.FLAG_ENABLE_PS_SENSITIVE_NOTIFICATIONS_TOGGLE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         PrivateSpaceMaintainer privateSpaceMaintainer =
                 PrivateSpaceMaintainer.getInstance(mContext);
         privateSpaceMaintainer.deletePrivateSpace();
@@ -259,7 +260,8 @@
     public void createPrivateSpace_psDoesNotExist_resetsPSAutoLockSettings() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         final int autoLockOption = 2;
         PrivateSpaceMaintainer privateSpaceMaintainer =
                 PrivateSpaceMaintainer.getInstance(mContext);
@@ -282,7 +284,8 @@
     public void createPrivateSpace_psExists_doesNotResetPSAutoLockSettings() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         final int privateSpaceAutLockValue = 1;
         PrivateSpaceMaintainer privateSpaceMaintainer =
                 PrivateSpaceMaintainer.getInstance(mContext);
diff --git a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceSafetySourceTest.java b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceSafetySourceTest.java
index cf9ea05..940f70d 100644
--- a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceSafetySourceTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceSafetySourceTest.java
@@ -86,7 +86,8 @@
     @Test
     public void onDeviceRebootedEvent_whenSafetyCenterEnabled_setsData() {
         when(mSafetyCenterManagerWrapper.isEnabled(mContext)).thenReturn(true);
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         PrivateSpaceSafetySource.setSafetySourceData(mContext, EVENT_TYPE_DEVICE_REBOOTED);
 
@@ -98,7 +99,8 @@
     @Test
     public void setSafetySourceData_whenFeatureDisabled_setsNullData() {
         when(mSafetyCenterManagerWrapper.isEnabled(mContext)).thenReturn(true);
-        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         PrivateSpaceSafetySource.setSafetySourceData(mContext, EVENT_TYPE_DEVICE_REBOOTED);
 
@@ -113,7 +115,8 @@
     @Test
     public void setSafetySourceData_setsEnabled() {
         when(mSafetyCenterManagerWrapper.isEnabled(mContext)).thenReturn(true);
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         PrivateSpaceSafetySource.setSafetySourceData(mContext, EVENT_TYPE_DEVICE_REBOOTED);
 
@@ -129,7 +132,8 @@
     @Test
     public void setSafetySourceData_setsPsAuthenticatorIntent() {
         when(mSafetyCenterManagerWrapper.isEnabled(mContext)).thenReturn(true);
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         PrivateSpaceSafetySource.setSafetySourceData(mContext, EVENT_TYPE_DEVICE_REBOOTED);
 
diff --git a/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
index 744a8ec..5c2a15c 100644
--- a/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
@@ -74,7 +74,8 @@
     /** Tests that the controller is always available. */
     @Test
     public void getAvailabilityStatus_returnsAvailable() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mUseOneLockController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -87,7 +88,8 @@
                 .when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         doReturn(CREDENTIAL_TYPE_PATTERN)
                 .when(mLockPatternUtils).getCredentialTypeForUser(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mUseOneLockController.updateState(mPreference);
         assertThat(mUseOneLockController.getSummary().toString()).isEqualTo("Pattern");
@@ -99,7 +101,8 @@
         doReturn(true)
                 .when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         doReturn(CREDENTIAL_TYPE_PIN).when(mLockPatternUtils).getCredentialTypeForUser(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mUseOneLockController.updateState(mPreference);
         assertThat(mUseOneLockController.getSummary().toString()).isEqualTo("PIN");
@@ -112,7 +115,8 @@
                 .when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
         doReturn(CREDENTIAL_TYPE_PASSWORD)
                 .when(mLockPatternUtils).getCredentialTypeForUser(anyInt());
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mUseOneLockController.updateState(mPreference);
         assertThat(mUseOneLockController.getSummary().toString()).isEqualTo("Password");
diff --git a/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java b/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
index 01381d8..45c2c75 100644
--- a/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
@@ -75,7 +75,8 @@
     public void getAvailabilityStatus_withAutoLockFlagEnabled_returnsAvailable() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mAutoLockPreferenceController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -83,7 +84,8 @@
     /** Tests that the controller is not available when auto lock flag is off. */
     @Test
     public void getAvailabilityStatus_withAutoLockFlagDisabled_returnsNull() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mSetFlagsRule.disableFlags(android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
 
         assertThat(mAutoLockPreferenceController.getAvailabilityStatus())
@@ -98,7 +100,8 @@
     public void getSummary_whenOptionEveryTimeDeviceLocks_returnsEveryTimeDeviceLocks() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         Settings.Secure.putInt(
                 mContentResolver,
@@ -116,7 +119,8 @@
     public void getSummary_whenOptionAfter5MinutesOfInactivity_returnsAfter5MinutesOfInactivity() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         Settings.Secure.putInt(
                 mContentResolver,
@@ -131,7 +135,8 @@
     public void getSummary_whenOptionNever_returnsNever() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         Settings.Secure.putInt(
                 mContentResolver,
diff --git a/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java b/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
index 971ca40..1c620c0 100644
--- a/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
@@ -94,7 +94,8 @@
     public void verifyMetricsConstant() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.PRIVATE_SPACE_SETTINGS);
     }
 
@@ -103,7 +104,8 @@
     public void getCandidates_returnsCandidateInfoListWithAllKeys() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mFragment.onAttach(mContext);
 
         final List<? extends CandidateInfo> candidates = mFragment.getCandidates();
@@ -120,7 +122,8 @@
     public void getDefaultKey_returnsStoredAutoLockOptionsValue() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mFragment.onAttach(mContext);
 
@@ -144,7 +147,8 @@
     public void setDefaultKey_storesCorrectAutoLockOptionValue() {
         mSetFlagsRule.enableFlags(
                 Flags.FLAG_ALLOW_PRIVATE_PROFILE,
-                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE);
+                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mFragment.onAttach(mContext);
         mFragment.setDefaultKey("2");
diff --git a/tests/unit/src/com/android/settings/privatespace/delete/DeletePrivateSpaceControllerTest.java b/tests/unit/src/com/android/settings/privatespace/delete/DeletePrivateSpaceControllerTest.java
index 371ca24..ed8decd 100644
--- a/tests/unit/src/com/android/settings/privatespace/delete/DeletePrivateSpaceControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/delete/DeletePrivateSpaceControllerTest.java
@@ -58,7 +58,8 @@
     /** Tests that the controller is available when private space flag is enabled. */
     @Test
     public void getAvailabilityStatus_whenPrivateFlagEnabled_returnsAvailable() {
-        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mDeletePrivateSpaceController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -66,7 +67,8 @@
     /** Tests that the controller is not available when private space flag is disabled. */
     @Test
     public void getAvailabilityStatus_whenPrivateFlagDisabled_returnsUnsupportedOnDevice() {
-        mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         assertThat(mDeletePrivateSpaceController.getAvailabilityStatus())
                 .isEqualTo(UNSUPPORTED_ON_DEVICE);
diff --git a/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragmentTest.java b/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragmentTest.java
index 16ccbc4..5c48375 100644
--- a/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragmentTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeleteFragmentTest.java
@@ -39,7 +39,8 @@
     @Test
     @UiThreadTest
     public void verifyMetricsConstant() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         mFragment = spy(new PrivateSpaceDeleteFragment());
         assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.PRIVATE_SPACE_SETTINGS);
     }
diff --git a/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragmentTest.java b/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragmentTest.java
index 5c2ef23..ffc1edf 100644
--- a/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragmentTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragmentTest.java
@@ -77,7 +77,8 @@
     @Test
     @UiThreadTest
     public void verifyMetricsConstant() {
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
         assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.PRIVATE_SPACE_SETTINGS);
     }
 
@@ -87,7 +88,8 @@
     public void deletePrivateSpace_deletesPS() {
         PrivateSpaceDeletionProgressFragment spyFragment = spy(mFragment);
         doNothing().when(spyFragment).showSuccessfulDeletionToast();
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateSpaceMaintainer.createPrivateSpace();
         spyFragment.deletePrivateSpace();
@@ -100,7 +102,8 @@
     public void deletePrivateSpace_onDeletion_showsDeletedToast() {
         PrivateSpaceDeletionProgressFragment spyFragment = spy(mFragment);
         doNothing().when(spyFragment).showSuccessfulDeletionToast();
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         mPrivateSpaceMaintainer.createPrivateSpace();
         spyFragment.deletePrivateSpace();
@@ -123,7 +126,8 @@
         spyFragment.setPrivateSpaceMaintainer(injector);
         doReturn(DELETE_PS_ERROR_INTERNAL).when(mPrivateSpaceMaintainerMock).deletePrivateSpace();
         doNothing().when(spyFragment).showDeletionInternalErrorToast();
-        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         spyFragment.deletePrivateSpace();
 
diff --git a/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java b/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java
index 85bd0e2..cd4c3c6 100644
--- a/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java
+++ b/tests/unit/src/com/android/settings/safetycenter/SafetySourceBroadcastReceiverTest.java
@@ -247,7 +247,8 @@
     @Test
     public void onReceive_onRefresh_withPrivateSpaceFeatureDisabled_setsNullData() {
         when(mSafetyCenterManagerWrapper.isEnabled(mApplicationContext)).thenReturn(true);
-        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,
+                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);
 
         Intent intent =
                 new Intent()