Merge changes from topic 'radio-info-ims' * changes: Add Ims Registration Info to RadioInfo Enable and Disable IMS Provisioning Based on Platform Capability

commit: 7c16338c472ea623d42ca97bbf1827ac7d03abd7 [log] [tgz]
author: Nathan Harold <nharold@google.com> Tue Nov 08 19:47:49 2016 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 19:47:49 2016 +0000
tree: d1fc91e7ffde9481510fff922574fc7ce7c26fe7
parent: 50e19f6e8fcad2f5900f44ee5760560439482624 [diff]
parent: e272c2078ba1626e1f14c57257d9516bd107acea [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b311c1..acff8f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -637,7 +637,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.inputmethod.KeyboardLayoutPickerFragment2" />
+                android:value="com.android.settings.inputmethod.KeyboardLayoutPickerFragment" />
         </activity>
 
         <activity android:name="Settings$PhysicalKeyboardActivity"
@@ -3190,18 +3190,35 @@
         </activity>
 
         <!-- Alias for IME & Language in new IA. Should merge into TargetActivity when launch -->
-        <activity-alias android:name="LanguageAndInputDashboardAlias"
-            android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">
-            <intent-filter android:priority="250">
+        <activity android:name=".Settings$LanguageAndRegionSettingsActivity"
+                  android:label="@string/language_and_region_settings_title"
+                  android:icon="@drawable/ic_settings_language">
+            <intent-filter android:priority="260">
+                <action android:name="com.android.settings.action.SETTINGS"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.ia.system"/>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.language.LanguageAndRegionSettings"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true"/>
+            <!-- Inherit intent-filter from LanguageSettingsActivity -->
+        </activity>
+
+        <activity android:name=".Settings$InputAndGestureSettingsActivity"
+                  android:label="@string/input_gesture_settings_title"
+                  android:icon="@drawable/ic_settings_language">
+            <intent-filter android:priority="255">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.inputmethod.InputAndGestureSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
-        </activity-alias>
+            <!-- Inherit intent-filter from LanguageSettingsActivity -->
+        </activity>
 
         <!-- Alias for Date & Time in new IA. Should merge into TargetActivity when launch -->
         <activity-alias android:name="DateTimeDashboardAlias"

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5d54c47..439be87 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Gekoppelde toestelle"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programme en kennisgewings"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Gebruiker en rekeninge"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Programverstekke"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Taal: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Soekinstellings"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Toestel as MIDI te gebruik"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Hierdie toestel as MIDI te gebruik"</string>
     <string name="usb_use" msgid="3256040963685055320">"Gebruik USB om"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Agtergrondkontrolering"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Volle agtergrondtoegang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gebruik teks van die skerm af"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Programme is nie geïnstalleer nie"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde programme"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Jou berging word nou deur die bergingbestuurder bestuur"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Rekeninge"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Stel op"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d95fb7c..ddeb579 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"የተገናኙ መሣሪያዎች"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ተጠቃሚ እና መለያዎች"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"የመተግበሪያ ነባሪዎች"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ቋንቋ፦ <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ቅንብሮች"</string>
     <string name="search_menu" msgid="6283419262313758339">"የፍለጋ ቅንብሮች"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"መሣሪያን እንደ MIDI ይጠቀሙ"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ይህን መሣሪያ እንደ MIDI ይጠቀሙበት"</string>
     <string name="usb_use" msgid="3256040963685055320">"ዩኤስቢ ይጠቀሙ ለ"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"የዳራ ፍተሻ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"ሙሉ የዳራ መዳረሻ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ከማያ ገጽ ላይ ጽሑፍ ተጠቀም"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"መተግበሪያዎች አልተጫኑም"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"የተጫኑ መተግበሪያዎች"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"የእርስዎ ማከማቻ አሁን በማከማቻ አስተዳዳሪ እየተዳደረ ነው"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"መለያዎች"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"አዋቅር"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8ab3da2..0ef2ffb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -2619,7 +2619,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"الأجهزة المرتبطة"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"التطبيقات والإشعارات"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"المستخدم والحسابات"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"الاعدادات الافتراضية للتطبيق"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"اللغة: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"الإعدادات"</string>
     <string name="search_menu" msgid="6283419262313758339">"إعدادات البحث"</string>
@@ -3066,6 +3067,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"‏يمكنك استخدام الجهاز باعتباره MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏يمكنك استخدام هذا الجهاز باعتباره MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"‏يمكنك استخدام USB في"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"فحص الخلفية"</string>
     <string name="background_check_title" msgid="4534254315824525593">"الوصول الكامل إلى الخلفية"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"استخدام النص من الشاشة"</string>
@@ -3416,8 +3421,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"التطبيقات غير مثبَّتة"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"التطبيقات المثبَّتة"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة السعة التخزينية لجهازك الآن عن طريق مدير السعة التخزينية"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"الحسابات"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"تهيئة"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 94180ac..4831aac 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Qoşulmuş cihazlar"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Tətbiq və bildirişlər"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"İstifadəçi və hesablar"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Tətbiq defoltları"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Defolt tətbiqlər"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Dil: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Axtarış ayarları"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Cihazı MIDI kimi istifadə edin"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu cihazı MIDI kimi istifadə edin"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB istifadə edin"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Arxa fon yoxlaması"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Tam arxa fon girişi"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandan mətn istifadə edin"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Tətbiq quraşdırılmayıb"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Quraşdırılmış tətbiqlər"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Yaddaşınız indi yaddaş meneceri tərəfindən idarə olunur"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Hesablar"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiqurasiya edin"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Hesab datasını avtomatik sinxronlaşdırın"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Şəxsi hesab datasını avtomatik sinxronlaşdırın"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"İş hesab datasını avtomatik sinxronlaşdırın"</string>
 </resources>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 3d4739d..6aecb8e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -2553,7 +2553,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obaveštenja"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Korisnik i nalozi"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Podrazumevane aplikacije"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Jezik: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Podešavanja"</string>
     <string name="search_menu" msgid="6283419262313758339">"Pretražite podešavanja"</string>
@@ -2979,6 +2980,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Korišćenje uređaja u MIDI režimu"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristi ovaj uređaj kao MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Upotrebite USB za:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Provera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Potpun pristup pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa ekrana"</string>
@@ -3311,8 +3316,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacije koje nisu instalirane"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Memorijskim prostorom sada upravlja Menadžer memorijskog prostora"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Nalozi"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurišite"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index be3df42..273ac9d 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Падключаныя прылады"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Праграмы і апавяшчэнні"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Карыстальнік і ўліковыя запісы"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Cтандартныя налады праграмы"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Мова: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Налады"</string>
     <string name="search_menu" msgid="6283419262313758339">"Налады пошуку"</string>
@@ -3008,6 +3009,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Выкарыстоўваць прыладу ў якасці MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Выкарыстоўваць гэту прыладу ў якасці MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Выкарыстоўваць USB, каб"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Фонавая праверка"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Поўны доступ у фоне"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Выкарыстоўваць тэкст з экрана"</string>
@@ -3346,8 +3351,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Праграмы не ўсталяваны"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Усталяваныя праграмы"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ваша сховішча зараз знаходзіцца пад кіраваннем менеджара сховішча"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Уліковыя запісы"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Наладзіць"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 188204b..5ba994e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Свързани устройства"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и известия"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Потребител и профили"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Стандартни настройки на приложението"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Език: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
     <string name="search_menu" msgid="6283419262313758339">"Търсете в настройките"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Използване на устройството като MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Използване на това устройство като MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Използване на USB за"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"проверка на заден план"</string>
     <string name="background_check_title" msgid="4534254315824525593">"пълен достъп до задния план"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Използване на текста от екрана"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Приложения, които не са инсталирани"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Хранилището ви вече се управлява от съответния мениджър"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Профили"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Конфигуриране"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 94dbdc1..d76d388 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml

@@ -244,9 +244,9 @@
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"অন্তত পক্ষে একটি পছন্দের ভাষা রাখুন"</string>
     <string name="locale_not_translated" msgid="516862628177166755">"কিছু অ্যাপ্লিকেশানের মধ্যে নাও উপলব্ধ হতে পারে"</string>
     <string name="action_drag_label_move_up" msgid="9052210023727612540">"উপরে সরান"</string>
-    <string name="action_drag_label_move_down" msgid="7448713844582912157">"নীচে সরান"</string>
+    <string name="action_drag_label_move_down" msgid="7448713844582912157">"নিচে সরান"</string>
     <string name="action_drag_label_move_top" msgid="557081389352288310">"শীর্ষে সরান"</string>
-    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"নীচে সরান"</string>
+    <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"নিচে সরান"</string>
     <string name="action_drag_label_remove" msgid="2861038147166966206">"ভাষা সরান"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"কার্যকলাপ বেছে নিন"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ডিভাইস তথ্য"</string>
@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"সংযুক্ত ডিভাইস"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ্স &amp; বিজ্ঞপ্তি"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ব্যবহারকারি &amp; অ্যাকাউন্টগুলি"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"অ্যাপ ডিফল্টগুলি"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ্স"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ভাষা: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"সেটিংস"</string>
     <string name="search_menu" msgid="6283419262313758339">"অনুসন্ধান সেটিংস"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI হিসাবে ডিভাইসটি ব্যবহার করুন"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI হিসাবে এই ডিভাইসটি ব্যবহার করুন"</string>
     <string name="usb_use" msgid="3256040963685055320">"এটি করতে USB ব্যবহার করুন"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"পটভূমি পরীক্ষা করুন"</string>
     <string name="background_check_title" msgid="4534254315824525593">"সম্পূর্ণ পটভূমি অ্যাক্সেস করুন"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"স্ক্রীন থেকে পাঠ্য ব্যবহার করুন"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"অ্যাপ্স ইনস্টল করা হয়নি"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ইনস্টল করা অ্যাপ্স"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার সঞ্চয়স্থান এখন সঞ্চয়স্থান পরিচালকের দ্বারা পরিচালিত হচ্ছে"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"অ্যাকাউন্ট"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"কনফিগার"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"অ্যাকাউন্টের ডেটা স্বতঃসিঙ্ক"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ব্যক্তিগত অ্যাকাউন্টের ডেটা স্বতঃসিঙ্ক"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"কাজের অ্যাকাউন্টের ডেটা স্বতঃসিঙ্ক"</string>
 </resources>

diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index eb68649..2d52831 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml

@@ -2553,7 +2553,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Korisnik i računi"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Zadane akcije aplikacije"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Jezik: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
     <string name="search_menu" msgid="6283419262313758339">"Postavke pretraživanja"</string>
@@ -2979,6 +2980,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Koristi uređaj za MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uređaj se koristi za rad u MIDI modu"</string>
     <string name="usb_use" msgid="3256040963685055320">"Koristi USB za"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pun pristup pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa ekrana"</string>
@@ -3311,8 +3316,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Neinstalirane aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vašom pohranom sada upravlja upravitelj pohrane"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Računi"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriraj"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 24cb3da..09af14e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuari i comptes"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Valors predeterminats de l\'aplicació"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuració"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configuració de la cerca"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"fer servir el dispositiu com a MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"fer servir aquest dispositiu com a MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilitza l\'USB per"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Comprovació en segon pla"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accés complet en segon pla"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ús del text de la pantalla"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicacions no instal·lades"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacions instal·lades"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ara mateix, el gestor d\'emmagatzematge gestiona el teu emmagatzematge"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Comptes"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configuració"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 883e843..e807af7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Připojená zařízení"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikace a oznámení"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Uživatel a účty"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Výchozí aplikace"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Jazyk: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavení"</string>
     <string name="search_menu" msgid="6283419262313758339">"Nastavení vyhledávání"</string>
@@ -3008,6 +3009,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Režim MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Toto zařízení se použije v režimu MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Účel připojení přes USB:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola pozadí"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Úplný přístup k pozadí"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Použití textu z obrazovky"</string>
@@ -3346,8 +3351,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikace nejsou nainstalovány"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainstalované aplikace"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Úložiště je nyní spravováno správcem úložiště."</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Účty"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurace"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5e22ab2..ff7855f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilsluttede enheder"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps og underretninger"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Bruger og konti"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Appstandarder"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Sprog: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Indstillinger"</string>
     <string name="search_menu" msgid="6283419262313758339">"Søgeindstillinger"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Brug enheden som MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Brug denne enhed som MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Brug USB til"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Baggrundstjek"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fuld baggrundsadgang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Brug tekst fra skærmen"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps, som ikke er installeret"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerede aps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Din lagerplads administreres nu af lageradministratoren"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Konti"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurer"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ddba737..e8143b9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbundene Geräte"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; Benachrichtigungen"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Nutzer &amp; Konten"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"App-Standardeinstellungen"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Sprache: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Einstellungen"</string>
     <string name="search_menu" msgid="6283419262313758339">"Sucheinstellungen"</string>
@@ -2952,6 +2953,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Gerät als MIDI verwenden"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Dieses Gerät als MIDI verwenden"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB für Folgendes verwenden"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Hintergrundprüfung"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Vollständiger Zugriff auf Hintergrund"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Text auf Bildschirm verwenden"</string>
@@ -3278,8 +3283,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Nicht installierte Apps"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installierte Apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Dein Speicher wird jetzt vom Speichermanager verwaltet"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Konten"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurieren"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d267031..03f0d0d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Συνδεδεμένες συσκευές"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμογές και ειδοποιήσεις"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Χρήστης και λογαριασμοί"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Προεπιλογές εφαρμογής"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Γλώσσα: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ρυθμίσεις"</string>
     <string name="search_menu" msgid="6283419262313758339">"Ρυθμίσεις αναζήτησης"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Χρήση συσκευής ως MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Χρήση αυτής της συσκευής ως MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Χρήση USB για"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Έλεγχος παρασκηνίου"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Πλήρης πρόσβαση στο παρασκήνιο"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Χρήση κειμένου από την οθόνη"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Μη εγκατεστημένες εφαρμογές"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Εγκατεστημένες εφαρμογές"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Στο εξής, γίνεται διαχείριση του αποθηκευτικού σας χώρου από τον διαχειριστή αποθηκευτικού χώρου"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Λογαριασμοί"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Διαμόρφωση"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 9406f5b..641f2eeb 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"User &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"App defaults"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default Apps"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Language: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Use device as MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Use this device as MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Use USB to"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto-sync account data"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto-sync personal account data"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Auto-sync work account data"</string>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 804a36d..e98de50 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"User &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"App defaults"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default Apps"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Language: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Use device as MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Use this device as MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Use USB to"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto-sync account data"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto-sync personal account data"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Auto-sync work account data"</string>
 </resources>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 804a36d..e98de50 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Connected devices"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"User &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"App defaults"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default Apps"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Language: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Use device as MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Use this device as MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Use USB to"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Background check"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full background access"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Use text from screen"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installed apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Your storage is now being managed by the storage manager"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configure"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto-sync account data"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto-sync personal account data"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Auto-sync work account data"</string>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2a5e13a..320c200 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps y notificaciones"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuario y cuentas"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Valores predeterminados de apps"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configuración de búsqueda"</string>
@@ -2948,6 +2949,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Usar dispositivo como MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Usar USB para"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Verificación en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso en segundo plano completo"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizar el texto de la pantalla"</string>
@@ -3274,8 +3279,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps no instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tu almacenamiento ahora está a cargo del administrador de almacenamiento"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Cuentas"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configuración"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 584885c..e4e2e4d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -2529,7 +2529,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicaciones y notificaciones"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Cuentas de usuario"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Valores predeterminados de aplicaciones"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
     <string name="search_menu" msgid="6283419262313758339">"Ajustes de búsqueda"</string>
@@ -2948,6 +2949,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utilizar dispositivo como MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizar USB para"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"comprobación de uso en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso completo en segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto de la pantalla"</string>
@@ -3274,8 +3279,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicaciones no instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicaciones instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"El Administrador de Almacenamiento gestiona ahora el almacenamiento"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Cuentas"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 2610e9a..3533f4e 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Rakendused ja märguanded"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Kasutaja ja kontod"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Vaikerakendused"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Vaikerakendused"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Keel: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Seaded"</string>
     <string name="search_menu" msgid="6283419262313758339">"Otsingu seaded"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Seadme kasutamine MIDI-na"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Kasutage seda seadet MIDI-na"</string>
     <string name="usb_use" msgid="3256040963685055320">"Kasutage USB-d järgmiseks."</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Taustakontroll"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Täielik juurdepääs taustale"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekraanil oleva teksti kasutamine"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Rakendused pole installitud"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installitud rakendused"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Teie salvestusruumi haldab nüüd salvestusruumi haldur"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Kontod"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Seadistamine"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Kontoandmete autom. sünkroon."</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Isikl. konto andm. aut. sünkr."</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Töö konto andm. autom. sünkr."</string>
 </resources>

diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index d6500db1..7fbad82 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Konektatutako gailuak"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikazioak eta jakinarazpenak"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Erabiltzailea eta kontuak"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Aplikazio lehenetsiak"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Hizkuntza: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ezarpenak"</string>
     <string name="search_menu" msgid="6283419262313758339">"Bilaketa-ezarpenak"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Gailua MIDI gisa erabiltzeko"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Erabili gailua MIDI gisa"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB konexioaren erabilerak"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Atzeko planoko egiaztapena"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Atzeko planorako sarbide osoa"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Erabili pantailako testua"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Instalatu gabeko aplikazioak"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalatutako aplikazioak"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Biltegi-kudeatzailea ari da biltegia kudeatzen"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Kontuak"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiguratu"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 75b2d11..952e860 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"دستگاه‌های متصل"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"برنامه‌ها و اعلان‌ها"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"حساب‌های کاربر"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"پیش‌فرض‌های برنامه"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"زبان: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"تنظیمات"</string>
     <string name="search_menu" msgid="6283419262313758339">"تنظیمات جستجو"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"‏استفاده از دستگاه به‌عنوان MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏استفاده از این دستگاه به‌عنوان MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"‏استفاده از USB برای"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"بررسی پس‌زمینه"</string>
     <string name="background_check_title" msgid="4534254315824525593">"دسترسی کامل به پس‌زمینه"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"استفاده از نوشتار صفحه"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"برنامه‌های نصب‌نشده"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"برنامه‌های نصب‌شده"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"حافظه شما اکنون توسط مدیر حافظه مدیریت می‌شود"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"حساب‌ها"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"پیکربندی"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0138d90..32fe78e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Yhdistetyt laitteet"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Sovellukset ja ilmoitukset"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Käyttäjä ja tilit"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Oletussovellukset"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Kieli: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Asetukset"</string>
     <string name="search_menu" msgid="6283419262313758339">"Hakuasetukset"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI-tila"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Käytä tätä laitetta MIDI-tilassa."</string>
     <string name="usb_use" msgid="3256040963685055320">"USB:n käyttötila"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Taustatarkistus"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Täydet taustakäyttöoikeudet"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Käytä näytön tekstiä"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Sovelluksia ei asennettu"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Asennetut sovellukset"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tallennustilan hallinta hallitsee nyt tallennustilaasi."</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Tilit"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Määritä"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f52cad2..c598ef3 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Utilisateurs et comptes"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Valeurs par défaut de l\'application"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Langue : <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
     <string name="search_menu" msgid="6283419262313758339">"Paramètres de recherche"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utiliser l\'appareil en tant que MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utiliser la connexion USB pour"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Vérification en arrière-plan"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accès complet à l\'arrière-plan"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utiliser le texte affiché à l\'écran"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Applications non installées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est maintenant géré par le gestionnaire de stockage"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Comptes"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2f85d63..fb8a064 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Utilisateur et comptes"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Valeurs par défaut de l\'application"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Langue : <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
     <string name="search_menu" msgid="6283419262313758339">"Paramètres de recherche"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utiliser l\'appareil en tant que MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utiliser la connexion USB pour"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Vérification en arrière-plan"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accès complet à l\'arrière-plan"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utiliser le texte affiché à l\'écran"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Applications pas installées"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est désormais géré par le gestionnaire d\'espace de stockage."</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Comptes"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index fc6f9c8..ba43906 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacións e notificacións"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuario e contas"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Accións predeterminadas das aplicacións"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configuración de busca"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utilizar o dispositivo como MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliza este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizar a conexión USB para"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Comprobación de uso en segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acceso completo en segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar o texto da pantalla"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicacións non instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacións instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Agora o xestor de almacenamento administra o teu espazo"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 90e369f..0f80642 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml

@@ -2533,7 +2533,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"કનેક્ટ થયેલ ઉપકરણો"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ઍપ્લિકેશનો અને સૂચનાઓ"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"વપરાશકર્તા અને એકાઉન્ટ્સ"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ઍપ્લિકેશન ડિફૉલ્ટ્સ"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ભાષા: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"સેટિંગ્સ"</string>
     <string name="search_menu" msgid="6283419262313758339">"શોધ સેટિંગ્સ"</string>
@@ -2952,6 +2953,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI તરીકે ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI તરીકે આ ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use" msgid="3256040963685055320">"આના માટે USB નો ઉપયોગ કરો"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"પૃષ્ઠભૂમિ તપાસ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"પૂર્ણ પૃષ્ઠભૂમિ ઍક્સેસ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"સ્ક્રીન પરની ટેક્સ્ટનો ઉપયોગ કરો"</string>
@@ -3278,8 +3283,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ઍપ્લિકેશનો ઇન્સ્ટૉલ થયેલ નથી"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનો"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ સંચાલક દ્વારા સંચાલિત કરવામાં આવી રહ્યું છે"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"એકાઉન્ટ્સ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ગોઠવો"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f4653da..5c5d19f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्ट किए गए डिवाइस"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ऐप्लिकेशन और नोटिफ़िकेशन"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"उपयोगकर्ता और खाते"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ऐप्लिकेशन डिफ़ॉल्ट"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"डिफ़ॉल्‍ट ऐप्लिकेशन"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"भाषा: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग"</string>
     <string name="search_menu" msgid="6283419262313758339">"खोज सेटिंग"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"डिवाइस का उपयोग MIDI के रूप में करें"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"इस डिवाइस का उपयोग MIDI के रूप में करें"</string>
     <string name="usb_use" msgid="3256040963685055320">"इसके लिए USB का उपयोग करें"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"पृष्ठभूमि जांच"</string>
     <string name="background_check_title" msgid="4534254315824525593">"पूर्ण पृष्ठभूमि एक्सेस"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीन के लेख का उपयोग करना"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"इंस्टॉल नहीं किए गए ऐप्‍लिकेशन"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"खाते"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फ़िगर करें"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"खाता डेटा स्वतः सिंक करें"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"निजी खाता डेटा स्वतः सिंक करें"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"कार्य खाता डेटा स्वतः सिंक करें"</string>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2853c19..dfa1877 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -2553,7 +2553,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavijesti"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Korisnik i postavke"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Zadane aplikacije"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Jezik: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
     <string name="search_menu" msgid="6283419262313758339">"Postavke pretraživanja"</string>
@@ -2979,6 +2980,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Upotreba uređaja kao MIDI-ja"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Upotrebljavajte uređaj kao MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Odaberite namjenu USB-a"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Potpuni pristup u pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa zaslona"</string>
@@ -3311,8 +3316,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacije nisu instalirane"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vašom pohranom sada upravlja upravitelj pohrane"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Računi"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriranje"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 554d9d5..cd44709 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Társított eszközök"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Alkalmazások és értesítések"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Felhasználó és fiókok"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Alapértelmezett alkalmazások"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Nyelv: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
     <string name="search_menu" msgid="6283419262313758339">"Keresési beállítások"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Készülék használata MIDI-eszközként"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"A készülék használata MIDI-eszközként"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB-kapcsolat használata a következőre:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Háttérellenőrzés"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Teljes hozzáférés a háttérhez"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"A képernyőn megjelenő szöveg használata"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Az alkalmazások nincsenek telepítve"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Telepített alkalmazások"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tárhelyét mostantól a tárhelykezelő kezeli"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Fiókok"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurálás"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 24d6a1e..96261d7 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -165,7 +165,7 @@
     <string name="proxy_port_label" msgid="5655276502233453400">"Պրոքսի միացք"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Շրջանցման պրոքսի"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Վերականգնել լռելյայն կարգավորումները"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Կատարված է:"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Պատրաստ է:"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Պրոքսի հոսթի անունը"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Ուշադրություն"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Լավ"</string>
@@ -632,7 +632,7 @@
     <string name="wifi_display_details" msgid="7791118209992162698">"Ցուցադրել կարգավորումները"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Անլար ցուցադրվող ընտրանքներ"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Մոռանալ"</string>
-    <string name="wifi_display_options_done" msgid="5703116500357822557">"Կատարված է"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Պատրաստ է"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Անուն"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 ԳՀց"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ԳՀց"</string>
@@ -2330,7 +2330,7 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Թույլատրելի"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Պարտադրում"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Ցանցը կարող է վերահսկվել"</string>
-    <string name="done_button" msgid="1991471253042622230">"Կատարված է"</string>
+    <string name="done_button" msgid="1991471253042622230">"Պատրաստ է"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
       <item quantity="one">Հաստատեք կամ հեռացրեք վկայականները</item>
       <item quantity="other">Հաստատեք կամ հեռացրեք վկայականները</item>
@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Կապակցված սարքեր"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Հավելվածներ և ծանուցումներ"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Օգտվող և հաշիվներ"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Հավելվածի կանխադրված կարգավորումներ"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Լեզուն՝ <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Կարգավորումներ"</string>
     <string name="search_menu" msgid="6283419262313758339">"Որոնման կարգավորումներ"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Սարքի օգտագործում որպես MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Այս սարքի օգտագործում որպես MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Օգտագործել USB-ն հետևյալ նպատակով"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Ֆոնային ստուգում"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Լիակատար ֆոնային մուտք"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Օգտվել էկրանի տեքստային բովանդակությունից"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Հավելվածները տեղադրված չեն"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Տեղադրված հավելվածներ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ձեր սարքի հիշողությունն այժմ կառավարվում է հիշողության կառավարիչի կողմից"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Հաշիվներ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Կարգավորում"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 12ce5fa..68a3bf6 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Perangkat yang terhubung"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikasi &amp; notifikasi"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Pengguna &amp; akun"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Aplikasi default"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Bahasa: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setelan"</string>
     <string name="search_menu" msgid="6283419262313758339">"Setelan penelusuran"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Gunakan perangkat sebagai MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Menggunakan perangkat ini sebagai MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Gunakan USB untuk"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Pemeriksaan latar belakang"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Akses penuh latar belakang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gunakan teks dari layar"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikasi tidak terpasang"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikasi terpasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Penyimpanan kini dikelola oleh pengelola penyimpanan"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Akun"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurasikan"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 4d52069..484db75 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tengd tæki"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Forrit og tilkynningar"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Notandi og reikningar"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Sjálfgefnar stillingar forrits"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Tungumál: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Stillingar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Leitarstillingar"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Nota tækið sem MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Nota þetta tæki sem MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Nota USB til að"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrunnsathugun"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fullur bakgrunnsaðgangur"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Nota texta af skjánum"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Forrit ekki uppsett"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Uppsett forrit"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Geymslurýminu þínu er nú stjórnað af geymslustjórnun"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Reikningar"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Stilla"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4f010f7..29ebe41 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -1029,7 +1029,7 @@
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stato delle batteria, della rete e altre informazioni"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Numero di telefono, segnale ecc."</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Memoria"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Spazio di archiviazione"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Spazio di archiviazione"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Impostazioni memoria"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Smonta l\'archivio USB, visualizza lo spazio di archiviazione disponibile"</string>
@@ -1110,7 +1110,7 @@
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configura"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Esplora"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"Libera spazio"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestisci memoria"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestisci archiviazione"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Connessione computer USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connetti come"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimediale (MTP)"</string>
@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivi collegati"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"App e notifiche"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Utente e account"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"App predefinite"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Lingua: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Impostazioni"</string>
     <string name="search_menu" msgid="6283419262313758339">"Impostazioni di ricerca"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utilizzare il dispositivo per la modalità MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizzare questo dispositivo per la modalità MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizza USB per"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Controllo background"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Accesso completo in background"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizza testo sullo schermo"</string>
@@ -3232,7 +3237,7 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Cuffie"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periferica di immissione"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestisci memoria"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestisci archiviazione"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rimuovi foto e video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestione memoria"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"App non installate"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"App installate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Il tuo spazio di archiviazione è ora gestito dalla Gestione memoria"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Account"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurazione"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8bf1a24..86e94ce 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -823,7 +823,7 @@
     <string name="wifi_gateway" msgid="163914742461092086">"שער"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"אורך קידומת של רשת"</string>
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"‏Wi-Fi ישיר"</string>
-    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"פרטי מכשיר"</string>
+    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"מידע מהמכשיר"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"זכור חיבור זה"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"חיפוש מכשירים"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"מחפש…"</string>
@@ -2577,7 +2577,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"מכשירים מחוברים"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"אפליקציות והודעות"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"משתמש וחשבונות"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"אפליקציות ברירות מחדל"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"שפה: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"הגדרות"</string>
     <string name="search_menu" msgid="6283419262313758339">"הגדרות חיפוש"</string>
@@ -3010,6 +3011,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"‏להשתמש במכשיר כהתקן MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏שימוש במכשיר זה כהתקן MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"‏השתמש ב-USB כדי"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"בדיקה ברקע"</string>
     <string name="background_check_title" msgid="4534254315824525593">"גישה מלאה ברקע"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"שימוש בטקסט המופיע במסך"</string>
@@ -3348,8 +3353,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"אפליקציות לא מותקנות"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"חשבונות"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"הגדרה"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 44d8308..a7fb0d1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -2535,7 +2535,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"接続済みの端末"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"アプリと通知"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ユーザーとアカウント"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"デフォルトのアプリ"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"デフォルト アプリ"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"言語: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="6283419262313758339">"検索設定"</string>
@@ -2954,6 +2954,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"この端末を MIDI として利用する"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"この端末を MIDI として利用する際に使用します"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB 接続の用途"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"バックグラウンド チェック"</string>
     <string name="background_check_title" msgid="4534254315824525593">"バックグラウンドへのフルアクセス"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"画面のテキストを使用"</string>
@@ -3002,7 +3006,7 @@
     <string name="system_alert_window_settings" msgid="1757821151143694951">"他のアプリの上に重ねて表示"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"アプリ"</string>
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"他のアプリの上に重ねて描画"</string>
-    <string name="permit_draw_overlay" msgid="6606018549732046201">"他のアプリの上に重ねて描画することを許可"</string>
+    <string name="permit_draw_overlay" msgid="6606018549732046201">"他のアプリ上に重ねて描画することを許可"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"アプリが上に重ねて描画する権限"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"この権限により、アプリは使用中の他のアプリの上に重ねて表示できるようになります。これにより、他のアプリのインターフェースを使用する際に邪魔になったり、他のアプリに表示されていると思われるものが変更されたりする場合があります。"</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr バーチャル リアリティ リスナー ステレオ ヘルパー サービス"</string>
@@ -3280,8 +3284,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"アプリがインストールされていません"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"インストール済みアプリ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"お使いのストレージの管理はストレージ マネージャが行うようになりました"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"アカウント"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"設定"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"アカウント データを自動同期"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"個人用アカウント データを自動同期"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"仕事用アカウント データを自動同期"</string>
 </resources>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 5ff4296..ea62bca 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"დაკავშირებული მოწყობილობები"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"აპები და შეტყობინებები"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"მომხმარებელი და ანგარიშები"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"აპის ნაგულისხმევი პარამეტრები"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ენა: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"პარამეტრები"</string>
     <string name="search_menu" msgid="6283419262313758339">"ძიების პარამეტრები"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"მოწყობილობის MIDI-ს სახით გამოყენება"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ამ მოწყობილობის MIDI-ს სახით გამოყენება"</string>
     <string name="usb_use" msgid="3256040963685055320">"აირჩიეთ USB-ს გამოყენების მიზანი:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"ფონურ რეჟიმში შემოწმება"</string>
     <string name="background_check_title" msgid="4534254315824525593">"სრული წვდომა ფონურ რეჟიმში"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ტექსტის გამოყენება ეკრანიდან"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"დაუინსტალირებული აპები"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"დაინსტალირებული აპები"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"თქვენს მეხსიერებას ახლა მეხსიერების მენეჯერი მართავს"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"ანგარიშები"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"კონფიგურაცია"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 05555bc..7b3d951 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Қосылған құрылғылар"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Қолданбалар мен хабарландырулар"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Пайдаланушы және есептік жазбалар"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Қолданбаның әдепкі мәндері"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Тіл: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Параметрлер"</string>
     <string name="search_menu" msgid="6283419262313758339">"Іздеу параметрлері"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Құрылғыны MIDI ретінде пайдалану"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Осы құрылғыны MIDI ретінде пайдалану"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB портын келесі үшін пайдалану"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Фондық тексеру"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Толық фондық қатынасу"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Экрандағы мәтінді пайдалану"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Орнатылмаған қолданбалар"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнатылған қолданбалар"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Құрылғы жадын енді жад менеджері басқарады"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Есептік жазбалар"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Конфигурациялау"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 152e46f..b3c74fb 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"អ្នកប្រើ និងគណនី"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"លំនាំដើមកម្មវិធី"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"កម្មវិធីលំនាំដើម"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ភាសា៖ <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ការកំណត់"</string>
     <string name="search_menu" msgid="6283419262313758339">"ការកំណត់ការស្វែងរក"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"ប្រើឧបករណ៍ជាមីឌី"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ប្រើឧបករណ៍នេះជាមីឌី"</string>
     <string name="usb_use" msgid="3256040963685055320">"ប្រើ USB ដើម្បី"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"ពិនិត្យផ្ទៃខាងក្រោយ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"ចូលដំណើរការផ្ទៃខាងក្រោយពេញលេញ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ប្រើអត្ថបទពីអេក្រង់"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"មិនបានដំឡើងកម្មវិធីទេ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"កម្មវិធីបានដំឡើង"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"នៅពេលនេះទំហំផ្ទុករបស់អ្នកត្រូវបានគ្រប់គ្រងដោយកម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"គណនី"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"កំណត់រចនាសម្ព័ន្ធ"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"ធ្វើសមកាលកម្មទិន្នន័យគណនីដោយស្វ័យប្រវត្តិ"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ធ្វើសមកាលកម្មទិន្នន័យគណនីផ្ទាល់ខ្លួនដោយស្វ័យប្រវត្តិ"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"ធ្វើសមកាលកម្មទិន្នន័យគណនីការងារដោយស្វ័យប្រវត្តិ"</string>
 </resources>

diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 1b3cd3a..569d5ce 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ಸಂಪರ್ಕ ಹೊಂದಿರುವ ಸಾಧನಗಳು"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ಬಳಕೆದಾರ ಮತ್ತು ಖಾತೆಗಳು"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ಅಪ್ಲಿಕೇಶನ್ ಡಿಫಾಲ್ಟ್‌ಗಳು"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ಭಾಷೆ: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="search_menu" msgid="6283419262313758339">"ಹುಡುಕಾಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"ಸಾಧನವನ್ನು MIDI ಎಂದು ಬಳಸಿ"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ಈ ಸಾಧನವನ್ನು MIDI ಎಂದು ಬಳಸಿ"</string>
     <string name="usb_use" msgid="3256040963685055320">"ಇದಕ್ಕೆ USB ಬಳಸಿ"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"ಹಿನ್ನೆಲೆ ಪರಿಶೀಲಿಸಿ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"ಪೂರ್ಣ ಹಿನ್ನೆಲೆ ಪ್ರವೇಶ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ಪರದೆಯಿಂದ ಪಠ್ಯವನ್ನು ಬಳಸಿ"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ಥಾಪನೆಗೊಂಡಿಲ್ಲ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ನಿಮ್ಮ ಸಂಗ್ರಹಣೆಯು ಈಗ ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ವಹಿಸಿಲಾಗುತ್ತಿದೆ"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"ಖಾತೆಗಳು"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1a945d9..3e326af 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"연결된 기기"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"앱 및 알림"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"사용자 및 계정"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"앱 기본값"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"언어: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"설정"</string>
     <string name="search_menu" msgid="6283419262313758339">"검색 설정"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"기기를 MIDI로 사용"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"이 기기를 MIDI로 사용"</string>
     <string name="usb_use" msgid="3256040963685055320">"다음에 USB 사용"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"백그라운드 확인"</string>
     <string name="background_check_title" msgid="4534254315824525593">"전체 백그라운드 액세스"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"화면의 텍스트 사용"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"앱이 설치되어 있지 않음"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"설치된 앱"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"현재 저장용량 관리자가 저장용량을 관리하고 있습니다."</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"계정"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"설정"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 1e23afc..fc35be2 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml

@@ -2530,7 +2530,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Туташкан түзмөктөр"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор жана эскертмелер"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Колдонуучу жана каттоо эсептери"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Демейки колдонмолор"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Демейки колдонмолор"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Тили: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Жөндөөлөр"</string>
     <string name="search_menu" msgid="6283419262313758339">"Издөө жөндөөлөрү"</string>
@@ -2949,6 +2949,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Түзмөктү MIDI катары колдонуу"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Бул түзмөктү MIDI катары колдонуу"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB туташууну төмөнкү максатта колдонуу"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Фондо текшерүү"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Фондук режимде толук мүмкүнчүлүк"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Экрандагы текстти колдонуу"</string>
@@ -3275,8 +3279,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Колдонмолор орнотулган эмес"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Орнотулган колдонмолор"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Каттоо эсептери"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Конфигурациялоо"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Каттоо эсебинин дайындарын авто-шайкештештирүү"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Жеке каттоо эсебинин дайындарын авто-шайкештештирүү"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Жумуш каттоо эсебинин дайындарын авто-шайкештештирүү"</string>
 </resources>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 60e750d..433350f 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"User &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"App defaults"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ແອັບເລີ່ມຕົ້ນ"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Language: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ການຕັ້ງຄ່າ"</string>
     <string name="search_menu" msgid="6283419262313758339">"ການຕັ້ງຄ່າການຊອກຫາ"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"ໃຊ້ອຸປະກອນເປັນ MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ໃຊ້ອຸປະກອນນີ້ເປັນ MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"ໃຊ້ USB ເພື່ອ"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"ການກວດໃນພື້ນຫຼັງ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"ການເຂົ້າເຖິງພື້ນຫຼັງເຕັມສ່ວນ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ໃຊ້ຂໍ້ຄວາມຈາກໜ້າຈໍ"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps not installed"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ແອັບຯທີ່ຕິດຕັ້ງແລ້ວ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ຕອນນີ້ອຸປະກອນຂອງທ່ານຖືກຈັດການໂດຍຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນແລ້ວ."</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"ບັນຊີ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ຕັ້ງຄ່າ"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"ຊິ້ງຂໍ້ມູນບັນຊີອັດຕະໂນມັດ"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ຊິ້ງຂໍ້ມູນບັນຊີສ່ວນຕົວອັດຕະໂນມັດ"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"ຊິ້ງຂໍ້ມູນບັນຊີບ່ອນເຮັດວຽກອັດຕະໂນມັດ"</string>
 </resources>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ab375fc..d278f54 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Prijungti įrenginiai"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programos ir pranešimai"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Naudotojas ir paskyros"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Programos numatytieji nustatymai"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Kalba: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nustatymai"</string>
     <string name="search_menu" msgid="6283419262313758339">"Paieškos nustatymai"</string>
@@ -3010,6 +3011,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Naudoti įrenginį kaip MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Naudoti šį įrenginį kaip MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Naudojant USB"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Fono tikrinimas"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Visateisė prieiga prie fono"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Naudoti tekstą iš ekrano"</string>
@@ -3348,8 +3353,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Programos neįdiegtos"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Įdiegtos programos"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Saugyklą dabar tvarko saugyklos valdytojas"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Paskyros"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigūruoti"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 781f504..c3c6c0b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -2553,7 +2553,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pievienotās ierīces"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Lietotnes un paziņojumi"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Lietotāji un konti"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Noklusējuma lietotnes"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Valoda: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Iestatījumi"</string>
     <string name="search_menu" msgid="6283419262313758339">"Meklēšanas iestatījumi"</string>
@@ -2979,6 +2980,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Izmantot ierīci MIDI režīmā"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Izmantot šo ierīci MIDI režīmā"</string>
     <string name="usb_use" msgid="3256040963685055320">"Ar USB var"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Fona pārbaude"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pilna piekļuve fonam"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Izmantot ekrānā redzamo tekstu"</string>
@@ -3311,8 +3316,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Lietotnes nav instalētas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalētās lietotnes"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Tagad jūsu krātuvi pārvalda krātuves pārvaldnieks"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Konti"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurācija"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index e0cbbbe..ccbdb5a 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Поврзани уреди"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апликации и известувања"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Корисник и сметки"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Стандардни апликации"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Јазик: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Поставки"</string>
     <string name="search_menu" msgid="6283419262313758339">"Поставки за пребарување"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Користете го уредот како MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Користете го уредов како MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Користете USB за"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Проверка на заднината"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Целосен пристап до заднината"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Користи го текстот од екранот"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Апликациите не се инсталирани"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталирани апликации"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Управникот со меморија сега управува со вашата меморија"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Сметки"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Конфигурирајте"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index e82bfe0..f55736a 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"കണക്‌റ്റുചെയ്‌ത ഉപകരണങ്ങൾ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്‌സും അറിയിപ്പുകളും"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ഉപയോക്താവും അക്കൗണ്ടുകളും"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ആപ്പ് ഡിഫോൾട്ടുകൾ"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ഡിഫോൾട്ട് ആപ്‌സ്"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ഭാഷ: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ക്രമീകരണം"</string>
     <string name="search_menu" msgid="6283419262313758339">"തിരയൽ ക്രമീകരണം"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI ആയി ഉപകരണം ഉപയോഗിക്കുക"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI ആയി ഈ ഉപകരണം ഉപയോഗിക്കുക"</string>
     <string name="usb_use" msgid="3256040963685055320">"ഇനിപ്പറയുന്നതിന് USB ഉപയോഗിക്കുക"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"പശ്ചാത്തല പരിശോധന"</string>
     <string name="background_check_title" msgid="4534254315824525593">"പൂർണ്ണ പശ്ചാത്തല ആക്സസ്"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"സ്ക്രീനിലെ ടെക്‌സ്റ്റ് ഉപയോഗിക്കുക"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ഇൻസ്‌റ്റാളുചെയ്‌ത അപ്ലിക്കേഷനുകൾ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"നിങ്ങളുടെ സ്റ്റോറേജ് ഇപ്പോൾ മാനേജുചെയ്യുന്നത് സ്റ്റോറേജ് മാനേജരാണ്"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"അക്കൗണ്ടുകൾ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ക്രമീകരിക്കുക"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"അക്കൗണ്ട് വിവരങ്ങൾ സ്വയമേവ സമന്വയിപ്പിക്കുക"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"വ്യക്തിഗത അക്കൗണ്ട് വിവരങ്ങൾ സ്വയമേവ സമന്വയിപ്പിക്കുക"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"ഔദ്യോഗിക അക്കൗണ്ട് വിവരങ്ങൾ സ്വയമേവ സമന്വയിപ്പിക്കുക"</string>
 </resources>

diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 82a31e5..c05792d 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Холбогдсон төхөөрөмж"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апп; мэдэгдэл"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Хэрэглэгч &amp; бүртгэл"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Апп-н өгөгдмөл"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Өгөгдмөл апп"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Хэл: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Тохиргоо"</string>
     <string name="search_menu" msgid="6283419262313758339">"Хайлтын тохиргоо"</string>
@@ -2948,6 +2948,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Төхөөрөмжийг MIDI горимоор ашиглах"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Энэ төхөөрөмжийг MIDI горимоор ашиглах"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB ашиглах"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Дэвсгэрийг шалгах"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Бүтэн дэвсгэрийн хандалт"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Дэлгэцийн текстийг ашиглах"</string>
@@ -3274,8 +3278,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Апп суулгаагүй байна"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Суулгасан апп"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Таны санг одоо сангийн менежер удирдаж байна"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Бүртгэл"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Хэлбэрт оруулах"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Бүртгэлийн өгөгдлийг автоматаар синк хийх"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Хувийн бүртгэлийн өгөгдлийг автоматаар синк хийх"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Ажлын бүртгэлийн өгөгдлийг автоматаар синк хийх"</string>
 </resources>

diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index d78b8b9..c06067e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"कनेक्‍ट केलेले डिव्‍हाइसेस"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अॅप्स आणि सूचना"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"वापरकर्ता आणि खाती"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"अॅप डीफॉल्ट"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"डीफॉल्ट अ‍ॅप्स"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"भाषा: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग्ज"</string>
     <string name="search_menu" msgid="6283419262313758339">"शोध सेटिंग्ज"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI म्हणून डिव्हाइसचा वापर करा"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"या डिव्हाइसचा MIDI म्हणून वापर करा"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB वापरा आणि"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"पार्श्वभूमी तपासणे"</string>
     <string name="background_check_title" msgid="4534254315824525593">"पूर्ण पार्श्वभूमी प्रवेश"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीनवरील मजकूर वापरा"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"अ‍ॅप्स स्थापित केलेले नाहीत"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"स्थापित केलेले अॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"आपला संचय आता संचय व्यवस्थापक व्यवस्थापित करीत आहे"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"खाती"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"खाते डेटा स्वयं संकालित करा"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"वैयक्तिक खाते डेटा स्वयं संकालित करा"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"कार्य खाते डेटा स्वयं संकालित करा"</string>
 </resources>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 06a38d2..8b9fc06 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Peranti yang disambungkan"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl &amp; pemberitahuan"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Pengguna &amp; akaun"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Lalai apl"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Bahasa: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Tetapan"</string>
     <string name="search_menu" msgid="6283419262313758339">"Tetapan carian"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Gunakan peranti sebagai MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Gunakan peranti ini sebagai MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Gunakan USB untuk"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Semakan latar belakang"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Akses latar belakang penuh"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gunakan teks daripada skrin"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apl tidak dipasang"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apl yang dipasang"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Storan anda kini diurus oleh pengurus storan"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Akaun"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurasikan"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 2e481ff..56c12a0 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ချိတ်ဆက်ထားသော စက်ပစ္စည်းများ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်များနှင့် အကြောင်းကြားချက်များ"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"အသုံးပြုသူနှင့် အကောင့်များ"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"အက်ပ်မူရင်းဆက်တင်များ"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ဘာသာစကား - <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ဆက်တင်များ"</string>
     <string name="search_menu" msgid="6283419262313758339">"ရှာဖွေမှု ဆက်တင်များ"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"စက်ပစ္စည်းကို MIDI အဖြစ်အသုံးပြုပါ"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ဤစက်ပစ္စည်းကို MIDI အဖြစ်အသုံးပြုပါ"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB ကို အောက်ပါအတွက် အသုံးပြုပါ -"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"နောက်ခံကို စစ်ကြည့်ပါ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"နောက်ခံကို အပြည့်အဝ သုံးနိုင်ခွင့်"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"မျက်နှာပြင်မှ စာသားကိုသုံးမည်"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"အက်ပ်များကို ထည့်သွင်းမထားပါ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ထည့်သွင်းထားသည့် အက်ပ်များ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"သင့်သိုလှောင်မှုကို သိုလှောင်မှုမန်နေဂျာက လက်ရှိစီမံခန့်ခွဲနေပါသည်"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"အကောင့်များ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"စီစဉ်သတ်မှတ်ပါ"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9e8458f..a89d859 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilkoblede enheter"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apper og varsler"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Bruker og kontoer"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Appstandarder"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Språk: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Innstillinger"</string>
     <string name="search_menu" msgid="6283419262313758339">"Søkeinnstillinger"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"å bruke enheten som MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bruk denne enheten som MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Bruk USB for"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrunnssjekk"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Full bakgrunnstilgang"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Bruk teksten fra skjermen"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apper som ikke er installert"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerte apper"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Lagringsplassen din blir nå administrert av lagringsadministratoren"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Kontoer"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurer"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 2960858..38dfd10 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"जडान गरिएका यन्त्रहरू"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अनुप्रयोग सम्बन्धी &amp; सूचनाहरू"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"प्रयोगकर्ता रamp; खाता"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"अनुप्रयोगको पूर्वनिर्धारित अवस्था"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"भाषा: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिङहरू"</string>
     <string name="search_menu" msgid="6283419262313758339">"खोज सेटिङहरू"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"यन्त्रलाई MIDI को रूपमा प्रयोग गर्नुहोस्"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"यस यन्त्रलाई MIDI को रूपमा प्रयोग गर्नुहोस्"</string>
     <string name="usb_use" msgid="3256040963685055320">"निम्न कार्यका लागि USB प्रयोग गर्नुहोस्"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"पृष्ठभूमि जाँच"</string>
     <string name="background_check_title" msgid="4534254315824525593">"पूर्ण पृष्ठभूमि पहुँच"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रिनबाट पाठ प्रयोग गर्नुहोस्"</string>
@@ -3278,8 +3282,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"अनुप्रयोगहरूको स्थापना गरिएको छैन"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"स्थापना गरिएका अनुप्रयोगहरू"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तपाईंको भण्डारण अहिले भण्डारण प्रबन्धकद्वारा व्यवस्थापन भइरहेको छ"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"खाताहरू"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"कन्फिगर गर्नुहोस्"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"खाताको डेटा स्वतः सिंक गर्नुहोस्"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"व्यक्तिगत खाताको डेटा स्वतः सिंक गर्नुहोस्"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"कार्य खाताको डेटा स्वतः सिंक गर्नुहोस्"</string>
 </resources>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5959a9c..231ffdd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Verbonden apparaten"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en meldingen"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Gebruiker en accounts"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Standaard-apps"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Taal: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellingen"</string>
     <string name="search_menu" msgid="6283419262313758339">"Zoekinstellingen"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Apparaat gebruiken als MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Dit apparaat gebruiken als MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB gebruiken voor het volgende:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Achtergrondcontrole"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Volledige toegang tot achtergrond"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Tekst van scherm gebruiken"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps niet geïnstalleerd"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Geïnstalleerde apps"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Je opslag wordt nu beheerd door de opslagbeheerder"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Accounts"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configureren"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 764f2a3..d35dd32 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ਵਰਤੋਂਕਾਰ ਅਤੇ ਖਾਤੇ"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ਐਪ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ਭਾਸ਼ਾ: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="search_menu" msgid="6283419262313758339">"ਖੋਜ ਸੈੱਟਿੰਗਜ਼"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ MIDI ਵਜੋਂ ਕਰੋ"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ਇਸ ਡੀਵਾਈਸ ਦੀ MIDI ਵਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="usb_use" msgid="3256040963685055320">"ਇਹਨਾਂ ਲਈ USB ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"ਬੈਕਗ੍ਰਾਊਂਡ ਜਾਂਚ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"ਪੂਰੀ ਬੈਕਗ੍ਰਾਊਂਡ ਪਹੁੰਚ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ਸਕ੍ਰੀਨ ਤੋਂ ਟੈਕਸਟ ਵਰਤੋ"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ਐਪਾਂ ਸਥਾਪਤ ਨਹੀਂ ਹਨ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਦੁਆਰਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"ਖਾਤੇ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ਸੰਰੂਪਣ ਕਰੋ"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"ਖਾਤਾ ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ਵਿਅਕਤੀਗਤ ਖਾਤਾ ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"ਕੰਮ ਖਾਤਾ ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 98c3ee2..20ea85f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacje i powiadomienia"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Użytkownik i konta"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Domyślne aplikacje"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Język: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ustawienia"</string>
     <string name="search_menu" msgid="6283419262313758339">"Ustawienia wyszukiwania"</string>
@@ -3008,6 +3009,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Użyć urządzenia jako MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Użyj tego urządzenia jako MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Skorzystaj z USB, aby"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola działania w tle"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pełny dostęp w tle"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Używanie tekstu na ekranie"</string>
@@ -3346,8 +3351,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacje niezainstalowane"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Zainstalowane aplikacje"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pamięcią zarządza teraz menedżer miejsca"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Konta"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiguracja"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index c61065f..a8ef807 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuário e contas"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Padrões de apps"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configurações de pesquisa"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Usar o dispositivo como MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Usar USB para"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo ao segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto da tela"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps não instalados"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index df88d18..f5e973b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos ligados"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicações e notificações"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Utilizador e contas"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Predefinições da aplicação"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Definições"</string>
     <string name="search_menu" msgid="6283419262313758339">"Definições de pesquisa"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utilizar dispositivo como MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizar USB para"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo em segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Utilizar o texto do ecrã"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicações não instaladas"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicações instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"O seu armazenamento está agora a ser gerido pelo gestor de armazenamento"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c61065f..a8ef807 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Usuário e contas"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Padrões de apps"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Idioma: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
     <string name="search_menu" msgid="6283419262313758339">"Configurações de pesquisa"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Usar o dispositivo como MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Usar USB para"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Verificação em segundo plano"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acesso completo ao segundo plano"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Usar texto da tela"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Apps não instalados"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Apps instalados"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Seu armazenamento está sendo controlado pelo gerenciador de armazenamento"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Contas"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurar"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bf063b1..852c020 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -2553,7 +2553,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispozitive conectate"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicații și notificări"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Utilizator și conturi"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Setări prestabilite ale aplicației"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Limba: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setări"</string>
     <string name="search_menu" msgid="6283419262313758339">"Setări de căutare"</string>
@@ -2979,6 +2980,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Folosiți dispozitivul ca MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Folosiți acest dispozitiv ca MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Folosiți conexiunea USB ca să"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Verificare de fundal"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Acces complet la fundal"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Folosește textul de pe ecran"</string>
@@ -3311,8 +3316,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplicații neinstalate"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplicații instalate"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Spațiul de stocare este acum gestionat de managerul spațiului de stocare"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Conturi"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Configurați"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a157b6d..d9efe38 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Подключенные устройства"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и уведомления"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Пользователь и аккаунты"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Приложения по умолчанию"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Язык: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
     <string name="search_menu" msgid="6283419262313758339">"Поиск настроек"</string>
@@ -3008,6 +3009,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Подключение как MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Использование устройства как MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Режим работы USB"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Фоновая проверка"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Полный доступ в фоновом режиме"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Использовать текст с экрана"</string>
@@ -3346,8 +3351,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Приложения не установлены"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установленные приложения"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Память устройства теперь управляется менеджером хранилища"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Аккаунты"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Настройки"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 88dfedc..d55975b 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml

@@ -2533,7 +2533,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"සම්බන්ධ කළ උපාංග"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"යෙදුම් සහ දැනුම්දීම්"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"පරිශීලක සහ ගිණුම්"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"යෙදුම් පෙරනිමි"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"පෙරනිමි යෙදුම්"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"භාෂාව: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"සැකසීම්"</string>
     <string name="search_menu" msgid="6283419262313758339">"සැකසීම් සොයන්න"</string>
@@ -2952,6 +2952,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"උපාංගය MIDI ලෙස භාවිත කිරීම"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"මෙම උපාංගය MIDI ලෙස භාවිත කිරිම"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB භාවිත කරන්න"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"පසුබිම් පරීක්ෂාව"</string>
     <string name="background_check_title" msgid="4534254315824525593">"පූර්ණ පසුබිම ප්‍රවේශය"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"තිරයේ ඇති පෙළ භාවිතා කරන්න"</string>
@@ -3278,8 +3282,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"යෙදුම් ස්ථාපනය කර නැත"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ස්ථාපිත යෙදුම්"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ඔබේ ගබඩාව දැන් ගබඩා කළමනාකරු විසින් පාලනය කරනු ලැබේ"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"ගිණුම්"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"වින්‍යාස කරන්න"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"ස්වයං සමමුහුර්ත ගිණුම් දත්ත"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ස්වයං සමමුහු. පුද්. ගිණු. දත්ත"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"ස්වයං සමමුහු. කාර්. ගිණු. දත්ත"</string>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d3030d9..ab920f8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pripojené zariadenia"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikácie a upozornenia"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Používateľ a účty"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Predvolené aplikácie"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Jazyk: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavenia"</string>
     <string name="search_menu" msgid="6283419262313758339">"Nastavenia vyhľadávania"</string>
@@ -3008,6 +3009,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Režim MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Použiť toto zariadenie ako MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Použiť USB na"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrola na pozadí"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Úplný prístup na pozadí"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Použiť text z obrazovky"</string>
@@ -3346,8 +3351,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Nenainštalované aplikácie"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nainštalované aplikácie"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vaše úložisko odteraz riadi správca úložiska"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Účty"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurácia"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d81a888..3421116 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -2575,7 +2575,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezane naprave"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije in obvestila"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Uporabnik in računi"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Privzete aplikacije"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Jezik: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavitve"</string>
     <string name="search_menu" msgid="6283419262313758339">"Nastavitve iskanja"</string>
@@ -3008,6 +3009,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Uporaba naprave kot vmesnik MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uporaba te naprave kot vmesnik MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Uporaba povezave USB za:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Preverjanje ozadja"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Poln dostop do ozadja"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Uporaba besedila na zaslonu"</string>
@@ -3346,8 +3351,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Nenameščene aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Nameščene aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Shrambo zdaj upravlja upravitelj shrambe"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Računi"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriranje"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index e13de0a..f3bf6bf 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Pajisje të lidhura"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacionet dhe njoftimet"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Përdoruesi dhe llogaritë"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Parazgjedhjet e aplikacionit"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Gjuha: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cilësimet"</string>
     <string name="search_menu" msgid="6283419262313758339">"Cilësimet e kërkimit"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Përdorur pajisjen si MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Përdore këtë pajisje si MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Përdor USB-në për të"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Kontrolli i sfondit"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Qasje e plotë në sfond"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Përdor tekstin nga ekrani"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Aplikacionet nuk janë të instaluara"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Aplikacionet e instaluara"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hapësira jote ruajtëse tani po menaxhohet nga menaxheri i hapësirës ruajtëse"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Llogaritë"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfiguro"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5659b8e..7f0f6e2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -2553,7 +2553,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Повезани уређаји"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aпликације и обавештења"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Корисник и налози"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Подразумеване апликације"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Језик: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Подешавања"</string>
     <string name="search_menu" msgid="6283419262313758339">"Претражите подешавања"</string>
@@ -2979,6 +2980,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Коришћење уређаја у MIDI режиму"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Користи овај уређај као MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Употребите USB за:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Провера у позадини"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Потпун приступ позадини"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Користи текст са екрана"</string>
@@ -3311,8 +3316,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Апликације које нису инсталиране"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Инсталиране апликације"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Меморијским простором сада управља Менаџер меморијског простора"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Налози"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Конфигуришите"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3bded77..d07468f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Anslutna enheter"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Appar och aviseringar"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Användare och konton"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Standardappar"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Språk: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Inställningar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Sökinställningar"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Använda enheten som MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Använd den här enheten som MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Välj vad du vill använda USB-anslutningen till"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Bakgrundskontroll"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Fullständig bakgrundsåtkomst"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Använda text från skärmen"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Appar som är inte installerade"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Installerade appar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ditt lagringsutrymme hanteras nu av lagringshanteraren"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Konton"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Konfigurera"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6507f91..8efe0e2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -2537,7 +2537,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Vifaa vilivyounganishwa"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programu na arifa"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Watumiaji na akaunti"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Chaguo-msingi za programu"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Lugha: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
     <string name="search_menu" msgid="6283419262313758339">"Mipangilio ya utafutaji"</string>
@@ -2956,6 +2957,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Tumia kifaa kama MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Tumia kifaa hiki kama MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Tumia USB"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Ukaguzi wa chini chini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Idhini ya kufikia chini chini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Tumia maandishi kutoka skrini"</string>
@@ -3282,8 +3287,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Programu hazijasakinishwa"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Programu zilizosakinishwa"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Hifadhi yako sasa inasimamiwa na kidhibiti cha hifadhi"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Akaunti"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Weka mipangilio"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index b5fd51c..1bd4188 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"இணைத்த சாதனங்கள்"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"பயன்பாடுகள் &amp; அறிவிப்புகள்"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"பயனர் &amp; கணக்குகள்"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"பயன்பாட்டின் இயல்புகள்"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"மொழி: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"அமைப்பு"</string>
     <string name="search_menu" msgid="6283419262313758339">"தேடல் அமைப்புகள்"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"சாதனத்தை MIDI ஆகப் பயன்படுத்து"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"இந்தச் சாதனத்தை MIDI ஆகப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3256040963685055320">"USBஐ இதற்குப் பயன்படுத்து:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"பின்புலச் சோதனை"</string>
     <string name="background_check_title" msgid="4534254315824525593">"முழுமையான பின்புல அணுகல்"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"திரையில் காட்டப்படும் உரையை பயன்படுத்து"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"பயன்பாடுகள் நிறுவப்படவில்லை"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"நிறுவிய பயன்பாடுகள்"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"உங்கள் சேமிப்பகம் இப்போது சேமிப்பக நிர்வாகியால் நிர்வகிக்கப்படுகிறது"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"கணக்குகள்"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"உள்ளமைக்கவும்"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 168acc4..80aab57 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"కనెక్ట్ చేసిన పరికరాలు"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"అనువర్తనాలు &amp; నోటిఫికేషన్‌లు"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"వినియోగదారు &amp; ఖాతాలు"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"అనువర్తన డిఫాల్ట్‌లు"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ అనువర్తనాలు"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"భాష: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"సెట్టింగ్‌లు"</string>
     <string name="search_menu" msgid="6283419262313758339">"శోధన సెట్టింగ్‌లు"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ఈ పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
     <string name="usb_use" msgid="3256040963685055320">"వీటి కోసం USBని ఉపయోగించండి"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"నేపథ్య తనిఖీ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"పూర్తి నేపథ్య ప్రాప్యత"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"స్క్రీన్‌లోని వచనాన్ని ఉపయోగించండి"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ఇన్‌స్టాల్ చేయని అనువర్తనాలు"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"మీ నిల్వ ఇప్పుడు నిల్వ నిర్వాహికి ద్వారా నిర్వహించబడుతోంది"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"ఖాతాలు"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"కాన్ఫిగర్ చేయండి"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"ఖాతా డేటా స్వీయ సమకాలీకరణ"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"వ్యక్తిగత ఖాతా డేటా స్వీయ సమకాలీకరణ"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"కార్యాలయ ఖాతా డేటా స్వీయ సమకాలీకరణ"</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 92b1ef0..94710e0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"อุปกรณ์ที่เชื่อมต่อ"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"แอปและการแจ้งเตือน"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"ผู้ใช้และบัญชี"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ค่าเริ่มต้นของแอป"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"แอปเริ่มต้น"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"ภาษา: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"การตั้งค่า"</string>
     <string name="search_menu" msgid="6283419262313758339">"การตั้งค่าการค้นหา"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"ใช้อุปกรณ์เป็น MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ใช้อุปกรณ์นี้เป็น MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"ใช้ USB เพื่อ"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"การตรวจสอบพื้นหลัง"</string>
     <string name="background_check_title" msgid="4534254315824525593">"การเข้าถึงพื้นหลังอย่างเต็มรูปแบบ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ใช้ข้อความจากหน้าจอ"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ไม่ได้ติดตั้งแอป"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"แอปที่ติดตั้ง"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ตัวจัดการพื้นที่เก็บข้อมูลกำลังจัดการพื้นที่เก็บข้อมูลของคุณ"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"บัญชี"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"กำหนดค่า"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"ซิงค์ข้อมูลบัญชีอัตโนมัติ"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"ซิงค์ข้อมูลบัญชีส่วนตัวอัตโนมัติ"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"ซิงค์ข้อมูลบัญชีงานอัตโนมัติ"</string>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index de87e82..74eb3ce 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Mga nakakonektang device"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Mga app at notification"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"User at mga account"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Mga default na app"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Mga default na app"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Wika: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mga Setting"</string>
     <string name="search_menu" msgid="6283419262313758339">"Mga setting ng paghahanap"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Gamitin ang device bilang MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Gamitin ang device na ito bilang MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Gamitin ang USB upang"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Pagsusuri sa background"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Kumpletong access sa background"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Gamitin ang text mula sa screen"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Hindi naka-install ang mga app"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Mga naka-install na app"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Pinamamahalaan na ngayon ng storage manager ang iyong storage"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Mga Account"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"I-configure"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"I-auto sync ang account data"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"I-auto sync ang personal account data"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"I-auto sync work account data"</string>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4d8fd3d..9d7cd79 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Bağlı cihazlar"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulamalar ve bildirimler"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Kullanıcı ve hesaplar"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Uygulama varsayılanları"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Dil: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Arama ayarları"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Cihazı MIDI olarak kullanmak"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu cihazı MIDI olarak kullanın"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB bağlantısının kullanım amacı:"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Arka plan kontrolü"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Tam arka plan erişimi"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandaki metni kullan"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Yüklü olmayan uygulamalar"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Yüklü uygulamalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Depolama alanınız artık depolama yöneticisi tarafından yönetiliyor"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Hesaplar"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Yapılandırma"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fe8f408..0e8ffa3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -2575,7 +2575,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Під’єднані пристрої"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Додатки та сповіщення"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Користувач і облікові записи"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Додатки за умовчанням"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Додатки за умовчанням"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Мова: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Налаштування"</string>
     <string name="search_menu" msgid="6283419262313758339">"Налаштування пошуку"</string>
@@ -3008,6 +3008,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Використовувати пристрій як MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Використовувати цей пристрій як MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Використовувати USB, щоб"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Перевірка у фоновому режимі"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Повний доступ у фоновому режиміj"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Використовувати текст з екрана"</string>
@@ -3346,8 +3350,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Додатки не встановлено"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Установлені додатки"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Зараз пам’яттю керує диспетчер пам’яті"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Облікові записи"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Налаштування"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Автосинхронізувати дані"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Автосинхронізувати особисті дані"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Автосинхронізувати робочі дані"</string>
 </resources>

diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index c6de156..903fbfb 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml

@@ -2519,7 +2519,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"منسلک آلات"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ایپس اور اطلاعات"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"صارف اور اکاؤنٹس"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"ایپ ڈیفالٹس"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"زبان: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ترتیبات"</string>
     <string name="search_menu" msgid="6283419262313758339">"تلاش کی ترتیبات"</string>
@@ -2938,6 +2939,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"‏آلہ کو بطور MIDI استعمال کریں"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏اس آلہ کو بطور MIDI استعمال کریں"</string>
     <string name="usb_use" msgid="3256040963685055320">"‏USB کو اس لئے استعمال کریں"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"پس منظر کی جانچ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"پس منظر تک مکمل رسائی"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"سکرین سے متن استعمال کریں"</string>
@@ -3264,8 +3269,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"ایپس انسٹال نہیں ہیں"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"انسٹال کردہ ایپس"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"آپ کی اسٹوریج کا نظم اب اسٹوریج مینیجر کی جانب سے کیا جا رہا ہے"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"اکاؤنٹس"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ترتیب دیں"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 0f9becc..d874415 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ulangan qurilmalar"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ilova va bildirishnomalar"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Foydalanuvchi va hisoblar"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Birlamchi ilovalar"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Til: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Sozlamalar"</string>
     <string name="search_menu" msgid="6283419262313758339">"Qidiruv sozlamalari"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI sifatida foydalanish"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu qurilmadan MIDI sifatida foydalanish"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB rejimi"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Fonda tekshirish"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Butun fonga ruxsat"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Ekrandagi matndan foydalanish"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Ilovalar o‘rnatilmagan"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"O‘rnatilgan ilovalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Xotirangiz hozirda xotira boshqaruvi tomonidan boshqarilmoqda"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Hisoblar"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Sozlash"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b3f6236..97c2964 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -2531,7 +2531,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Thiết bị đã kết nối"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ứng dụng và thông báo"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Người dùng và tài khoản"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Mặc định của ứng dụng"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Ứng dụng mặc định"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Ngôn ngữ: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cài đặt"</string>
     <string name="search_menu" msgid="6283419262313758339">"Cài đặt tìm kiếm"</string>
@@ -2950,6 +2950,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Sử dụng thiết bị làm MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Sử dụng thiết bị này làm MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Sử dụng USB để"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Kiểm tra nền"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Toàn quyền truy cập nền"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Sử dụng văn bản từ màn hình"</string>
@@ -3276,8 +3280,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Ứng dụng chưa cài đặt"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Ứng dụng đã cài đặt"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Bộ nhớ của bạn hiện đang được quản lý bởi trình quản lý bộ nhớ"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"Tài khoản"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Định cấu hình"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"Tự động đồng bộ hóa dữ liệu TK"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Tự động đ.bộ d.liệu TK c.nhân"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Tự động đ.bộ dữ liệu TK c.việc"</string>
 </resources>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 996796f..8d00b8f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -2531,7 +2531,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已关联的设备"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"用户和帐号"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"应用默认设置"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"语言：<xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"设置"</string>
     <string name="search_menu" msgid="6283419262313758339">"搜索设置"</string>
@@ -2950,6 +2951,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"用作 MIDI 设备"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"将此设备用作 MIDI 设备"</string>
     <string name="usb_use" msgid="3256040963685055320">"请选择 USB 的使用方式："</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"后台检查"</string>
     <string name="background_check_title" msgid="4534254315824525593">"完整的后台访问权限"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"使用屏幕上的文字内容"</string>
@@ -3276,8 +3281,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"未安装的应用"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安装的应用"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的存储空间目前是由存储空间管理器管理"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"帐号"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"配置"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 13832f2..3b0efb2 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -2536,7 +2536,7 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"使用者和帳戶"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"應用程式預設"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"預設應用程式"</string>
     <string name="system_dashboard_summary" msgid="6112602136713843779">"語言：<xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="6283419262313758339">"搜尋設定"</string>
@@ -2955,6 +2955,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"在 MIDI 模式下使用裝置"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"在 MIDI 模式下使用此裝置"</string>
     <string name="usb_use" msgid="3256040963685055320">"利用 USB 執行以下操作："</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"背景檢查"</string>
     <string name="background_check_title" msgid="4534254315824525593">"完整背景存取權"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"使用螢幕上的文字"</string>
@@ -3281,8 +3285,9 @@
     <string name="web_action_section_title" msgid="806405168097593614">"尚未安裝的應用程式"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的儲存空間即將由儲存空間管理員管理"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
-    <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
-    <skip />
+    <string name="account_for_section_header" msgid="5867553104728848377">"帳戶"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"設定"</string>
+    <string name="auto_sync_account_title" msgid="7647106425106072285">"自動同步帳戶資料"</string>
+    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"自動同步個人帳戶資料"</string>
+    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"自動同步工作帳戶資料"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3b7bdf1..733483d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -2535,7 +2535,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"使用者和帳戶"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"預設應用程式"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"語言：<xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="6283419262313758339">"搜尋設定"</string>
@@ -2954,6 +2955,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"將裝置用做 MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"將這個裝置用做 MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"請選擇 USB 的使用方式"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"背景檢查"</string>
     <string name="background_check_title" msgid="4534254315824525593">"完整背景存取權"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"使用畫面中的文字"</string>
@@ -3280,8 +3285,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"未安裝的應用程式"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"你的儲存空間目前是由儲存空間管理員管理"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"帳戶"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"設定"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e2a66d0..a21d46e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -2532,7 +2532,8 @@
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Amadivayisi axhunyiwe"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Izinhlelo zokusebenza nezaziso"</string>
     <string name="account_dashboard_title" msgid="38701889336378742">"Umsebenzisi nama-akhawunti"</string>
-    <string name="app_default_dashboard_title" msgid="8176215295082796426">"Okuzenzakalelayo kohlelo lokusebenza"</string>
+    <!-- no translation found for app_default_dashboard_title (7342549305933047317) -->
+    <skip />
     <string name="system_dashboard_summary" msgid="6112602136713843779">"Ulimi: <xliff:g id="LANGUAGE">%1$s</xliff:g>"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Izilungiselelo"</string>
     <string name="search_menu" msgid="6283419262313758339">"Izilungiselelo zokusesha"</string>
@@ -2951,6 +2952,10 @@
     <string name="usb_use_MIDI" msgid="870922185938298263">"Sebenzisa idivayisi njenge-MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Sebenzisa le divayisi njenge-MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Sebenzisa i-USB"</string>
+    <!-- no translation found for usb_pref (1400617804525116158) -->
+    <skip />
+    <!-- no translation found for usb_nothing_connected (253193394274317171) -->
+    <skip />
     <string name="background_check_pref" msgid="7550258400138010979">"Ukuhlola kwangasemuva"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Ukufinyelela kwangasemuva okuphele"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Sebenzisa umbhalo kusukela kusikrini"</string>
@@ -3277,8 +3282,12 @@
     <string name="web_action_section_title" msgid="806405168097593614">"Izinhlelo zokusebenza azifakiwe"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Izinhlelo zokusebenza ezifakiwe"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Isitoreji sakho manje siphethwe umphathi wesitoreji"</string>
-    <!-- no translation found for account_for_section_header (5867553104728848377) -->
+    <string name="account_for_section_header" msgid="5867553104728848377">"Ama-akhawunti"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"Misa"</string>
+    <!-- no translation found for auto_sync_account_title (7647106425106072285) -->
     <skip />
-    <!-- no translation found for configure_section_header (7391183586410814450) -->
+    <!-- no translation found for auto_sync_personal_account_title (999536545686286287) -->
+    <skip />
+    <!-- no translation found for auto_sync_work_account_title (3073278154593727844) -->
     <skip />
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f70c143..62e7452 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -3733,6 +3733,10 @@
     <string name="language_settings">Languages&#160;&amp; input</string>
     <!-- Title of Languages & input settings screen -->
     <string name="language_keyboard_settings_title">Languages&#160;&amp; input</string>
+    <!-- Title of Languages & region settings screen -->
+    <string name="language_and_region_settings_title">Languages&#160;&amp; region</string>
+    <!-- Title of Input & gesture settings screen -->
+    <string name="input_gesture_settings_title">Input&#160;&amp; gestures</string>
     <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
     <string name="keyboard_settings_category">Keyboard &amp; input methods</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
@@ -7073,6 +7077,11 @@
          usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
     <string name="usb_use">Use USB to</string>
 
+    <!-- Settings item title for USB preference [CHAR LIMIT=35] -->
+    <string name="usb_pref">USB</string>
+    <!-- Summary for the USB preference when nothing is connected through the usb port.  [CHAR LIMIT=40] -->
+    <string name="usb_nothing_connected">Nothing connected</string>
+
     <!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
     <string name="background_check_pref">Background check</string>
 

diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 4289550..e758702 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml

@@ -16,16 +16,25 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <SwitchPreference
-    android:key="toggle_nfc"
-    android:title="@string/nfc_quick_toggle_title"
-    android:summary="@string/nfc_quick_toggle_summary"
-    android:order="-5" />
+    <SwitchPreference
+        android:key="toggle_nfc"
+        android:title="@string/nfc_quick_toggle_title"
+        android:summary="@string/nfc_quick_toggle_summary"
+        android:order="-5" />
 
-  <com.android.settingslib.RestrictedPreference
-    android:fragment="com.android.settings.nfc.AndroidBeam"
-    android:key="android_beam_settings"
-    android:title="@string/android_beam_settings_title"
-    android:order="-4" />
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.nfc.AndroidBeam"
+        android:key="android_beam_settings"
+        android:title="@string/android_beam_settings_title"
+        android:order="-4" />
+
+    <Preference
+        android:key="usb_mode"
+        android:title="@string/usb_pref"
+        android:order="-3" >
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.deviceinfo.UsbModeChooserActivity"/>
+    </Preference>
 
 </PreferenceScreen>
\ No newline at end of file

diff --git a/res/xml/input_and_gesture.xml b/res/xml/input_and_gesture.xml
new file mode 100644
index 0000000..fb89589
--- /dev/null
+++ b/res/xml/input_and_gesture.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2016 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">
+
+    <PreferenceCategory
+        android:title="@string/keyboard_and_input_methods_category">
+        <Preference
+            android:title="@string/virtual_keyboard_category"
+            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"/>
+        <Preference
+            android:title="@string/physical_keyboard_title"
+            android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="pointer_settings_category"
+        android:title="@string/pointer_settings_category">
+
+        <com.android.settings.PointerSpeedPreference
+            android:key="pointer_speed"
+            android:title="@string/pointer_speed"
+            android:dialogTitle="@string/pointer_speed"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="game_controller_settings_category"
+        android:title="@string/game_controller_settings_category">
+
+        <SwitchPreference
+            android:key="vibrate_input_devices"
+            android:title="@string/vibrate_input_devices"
+            android:summaryOn="@string/vibrate_input_devices_summary"
+            android:summaryOff="@string/vibrate_input_devices_summary"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file

diff --git a/res/xml/language_and_region.xml b/res/xml/language_and_region.xml
new file mode 100644
index 0000000..62179c9
--- /dev/null
+++ b/res/xml/language_and_region.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2016 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">
+
+    <Preference
+        android:key="phone_language"
+        android:title="@string/phone_language"
+        android:fragment="com.android.settings.localepicker.LocaleListEditor"/>
+
+    <!-- Spell checker preference title, summary and fragment will be set programmatically. -->
+    <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
+         See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->
+    <Preference
+        android:key="spellcheckers_settings"
+        android:title="@string/spellcheckers_settings_title"
+        android:persistent="false"/>
+
+    <!-- User dictionary preference title and fragment will be set programmatically. -->
+    <Preference
+        android:key="key_user_dictionary_settings"
+        android:title="@string/user_dict_settings_title"/>
+
+    <!-- TTS -->
+    <PreferenceCategory
+        android:key="voice_category"
+        android:title="@string/voice_category">
+
+        <Preference
+            android:key="tts_settings"
+            android:title="@string/tts_settings_title"
+            android:fragment="com.android.settings.tts.TextToSpeechSettings"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file

diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index d829dc4..992af92 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml

@@ -27,11 +27,11 @@
     <!-- Spell checker preference title, summary and fragment will be set programmatically. -->
     <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
          See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->
-    <PreferenceScreen
-            android:key="spellcheckers_settings"
-            android:title="@string/spellcheckers_settings_title"
-            android:persistent="false"
-            />
+    <Preference
+        android:key="spellcheckers_settings"
+        android:title="@string/spellcheckers_settings_title"
+        android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"
+        android:persistent="false"/>
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 451c7e3..85fb334 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java

@@ -41,12 +41,14 @@
     public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
     public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class InputAndGestureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
     public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ }
     public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }
     public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LocalePickerActivity extends SettingsActivity { /* empty */ }
+    public static class LanguageAndRegionSettingsActivity extends SettingsActivity { /* empty */ }
     public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ }
     public static class HomeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3813c42..d1c7266 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java

@@ -99,12 +99,13 @@
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.gestures.GestureSettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
+import com.android.settings.inputmethod.InputAndGestureSettings;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
-import com.android.settings.inputmethod.KeyboardLayoutPickerFragment2;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 import com.android.settings.inputmethod.SpellCheckersSettings;
 import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.language.LanguageAndRegionSettings;
 import com.android.settings.localepicker.LocaleListEditor;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.network.NetworkDashboardFragment;
@@ -292,7 +293,8 @@
             // Home page > Security
             "com.android.settings.Settings.LocationDashboardAlias",
             // Home page > System
-            "com.android.settings.Settings.LanguageAndInputDashboardAlias",
+            Settings.LanguageAndRegionSettingsActivity.class.getName(),
+            Settings.InputAndGestureSettingsActivity.class.getName(),
             "com.android.settings.Settings.DateTimeDashboardAlias",
             "com.android.settings.Settings.AccessibilityDashboardAlias",
             "com.android.settings.Settings.AboutDeviceDashboardAlias",
@@ -312,6 +314,8 @@
             LocaleListEditor.class.getName(),
             InputMethodAndLanguageSettings.class.getName(),
             AvailableVirtualKeyboardFragment.class.getName(),
+            InputAndGestureSettings.class.getName(),
+            LanguageAndRegionSettings.class.getName(),
             SpellCheckersSettings.class.getName(),
             UserDictionaryList.class.getName(),
             UserDictionarySettings.class.getName(),
@@ -355,7 +359,6 @@
             TrustedCredentialsSettings.class.getName(),
             PaymentSettings.class.getName(),
             KeyboardLayoutPickerFragment.class.getName(),
-            KeyboardLayoutPickerFragment2.class.getName(),
             PhysicalKeyboardFragment.class.getName(),
             ZenModeSettings.class.getName(),
             SoundSettings.class.getName(),

diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
deleted file mode 100644
index 3a8f1a5..0000000
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2010 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;
-
-import android.speech.tts.TtsEngines;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
-
-/**
- * Settings screen for voice input/output.
- */
-public class VoiceInputOutputSettings {
-
-    private static final String TAG = "VoiceInputOutputSettings";
-
-    private static final String KEY_VOICE_CATEGORY = "voice_category";
-    private static final String KEY_TTS_SETTINGS = "tts_settings";
-
-    private PreferenceGroup mParent;
-    private PreferenceCategory mVoiceCategory;
-    private Preference mVoiceInputSettingsPref;
-    private Preference mTtsSettingsPref;
-    private final SettingsPreferenceFragment mFragment;
-    private final TtsEngines mTtsEngines;
-
-    public VoiceInputOutputSettings(SettingsPreferenceFragment fragment) {
-        mFragment = fragment;
-        mTtsEngines = new TtsEngines(fragment.getPreferenceScreen().getContext());
-    }
-
-    public void onCreate() {
-        mParent = mFragment.getPreferenceScreen();
-        mVoiceCategory = (PreferenceCategory) mParent.findPreference(KEY_VOICE_CATEGORY);
-        mTtsSettingsPref = mVoiceCategory.findPreference(KEY_TTS_SETTINGS);
-
-        populateOrRemovePreferences();
-    }
-
-    private void populateOrRemovePreferences() {
-        boolean hasTtsPrefs = populateOrRemoveTtsPrefs();
-        if (!hasTtsPrefs) {
-            // There were no TTS settings and no recognizer settings,
-            // so it should be safe to hide the preference category
-            // entirely.
-            mFragment.getPreferenceScreen().removePreference(mVoiceCategory);
-        }
-    }
-
-    private boolean populateOrRemoveTtsPrefs() {
-        if (mTtsEngines.getEngines().isEmpty()) {
-            mVoiceCategory.removePreference(mTtsSettingsPref);
-            return false;
-        }
-
-        return true;
-    }
-}

diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index b913669..57133b1 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

@@ -20,6 +20,7 @@
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settingslib.drawer.CategoryKey;
 
@@ -29,6 +30,7 @@
 public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "ConnectedDeviceFrag";
+    private UsbModePreferenceController mUsbPrefController;
 
     @Override
     public int getMetricsCategory() {
@@ -52,11 +54,14 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
         final NfcPreferenceController nfcPreferenceController =
                 new NfcPreferenceController(context);
         getLifecycle().addObserver(nfcPreferenceController);
-        final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(nfcPreferenceController);
+        mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context));
+        getLifecycle().addObserver(mUsbPrefController);
+        controllers.add(mUsbPrefController);
         return controllers;
     }
 

diff --git a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
new file mode 100644
index 0000000..f782e9e
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java

@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2016 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.connecteddevice;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.R;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settings.deviceinfo.UsbBackend;
+
+public class UsbModePreferenceController extends PreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
+
+    private static final String KEY_USB_MODE = "usb_mode";
+
+    private UsbBackend mUsbBackend;
+    private UsbConnectionBroadcastReceiver mUsbReceiver;
+    private Preference mUsbPreference;
+
+    public UsbModePreferenceController(Context context, UsbBackend usbBackend) {
+        super(context);
+        mUsbBackend = usbBackend;
+        mUsbReceiver = new UsbConnectionBroadcastReceiver();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mUsbPreference = screen.findPreference(KEY_USB_MODE);
+        updataSummary(mUsbPreference);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updataSummary(preference);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        return false;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_USB_MODE;
+    }
+
+    @Override
+    public void onPause() {
+        mUsbReceiver.unregister();
+    }
+
+    @Override
+    public void onResume() {
+        mUsbReceiver.register();
+    }
+
+    public static int getSummary(int mode) {
+        switch (mode) {
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_charging_only_desc;
+            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_power_only_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+                return R.string.usb_use_file_transfers_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+                return R.string.usb_use_photo_transfers_desc;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+                return R.string.usb_use_MIDI_desc;
+        }
+        return 0;
+    }
+
+    public static int getTitle(int mode) {
+        switch (mode) {
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_charging_only;
+            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
+                return R.string.usb_use_power_only;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
+                return R.string.usb_use_file_transfers;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
+                return R.string.usb_use_photo_transfers;
+            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
+                return R.string.usb_use_MIDI;
+        }
+        return 0;
+    }
+
+    private void updataSummary(Preference preference) {
+        updataSummary(preference, mUsbBackend.getCurrentMode());
+    }
+
+    private void updataSummary(Preference preference, int mode) {
+        if (preference != null) {
+            if (mUsbReceiver.isConnected()) {
+                preference.setEnabled(true);
+                preference.setSummary(getTitle(mode));
+            } else {
+                preference.setSummary(R.string.usb_nothing_connected);
+                preference.setEnabled(false);
+            }
+        }
+    }
+
+    private class UsbConnectionBroadcastReceiver extends BroadcastReceiver {
+        private boolean mListeningToUsbEvents;
+        private boolean mConnected;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            boolean connected = intent != null
+                    && intent.getExtras().getBoolean(UsbManager.USB_CONNECTED);
+            if (connected != mConnected) {
+                mConnected = connected;
+                updataSummary(mUsbPreference);
+            }
+        }
+
+        public void register() {
+            if (!mListeningToUsbEvents) {
+                IntentFilter intentFilter = new IntentFilter(UsbManager.ACTION_USB_STATE);
+                Intent intent = mContext.registerReceiver(this, intentFilter);
+                mConnected = intent != null
+                        && intent.getExtras().getBoolean(UsbManager.USB_CONNECTED);
+                mListeningToUsbEvents = true;
+            }
+        }
+
+        public void unregister() {
+            if (mListeningToUsbEvents) {
+                mContext.unregisterReceiver(this);
+                mListeningToUsbEvents = false;
+            }
+        }
+
+        public boolean isConnected() {
+            return mConnected;
+        }
+    }
+
+}

diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index ca683e3..107fbab 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java

@@ -40,6 +40,8 @@
     protected final int NETWORK_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 3;
     protected final int CONNECTED_DEVICE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 4;
     protected final int APP_AND_NOTIFICATION_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 5;
+    protected final int INPUT_AND_GESTURE_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 6;
+    protected final int LANGUAGE_AND_REGION_CATEGORY_FRAGMENT = PLACEHOLDER_METRIC + 7;
 
     public InstrumentedFragment() {
         // Mixin that logs visibility change for activity.

diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index baea164..6659ab4 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java

@@ -163,13 +163,9 @@
     public void notifySummaryChanged(Tile tile) {
         final int position = mDashboardData.getPositionByTile(tile);
         if (position != DashboardData.POSITION_NOT_FOUND) {
-            final Tile targetTile = (Tile) mDashboardData.getItemEntityByPosition(position);
-            if (!TextUtils.equals(tile.summary, targetTile.summary)) {
-
-                // Since usually tile in parameter and tile in mCategories are same instance,
-                // which is hard to be detected by DiffUtil, so we notifyItemChanged directly.
-                notifyItemChanged(position);
-            }
+            // Since usually tile in parameter and tile in mCategories are same instance,
+            // which is hard to be detected by DiffUtil, so we notifyItemChanged directly.
+            notifyItemChanged(position);
         }
     }
 

diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index d592fcc..5ac16d4 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java

@@ -40,6 +40,7 @@
 
 import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settings.connecteddevice.UsbModePreferenceController;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -135,9 +136,9 @@
         View v = mLayoutInflater.inflate(R.layout.restricted_radio_with_summary, container, false);
 
         TextView titleView = (TextView) v.findViewById(android.R.id.title);
-        titleView.setText(getTitle(mode));
+        titleView.setText(UsbModePreferenceController.getTitle(mode));
         TextView summaryView = (TextView) v.findViewById(android.R.id.summary);
-        summaryView.setText(getSummary(mode));
+        summaryView.setText(UsbModePreferenceController.getSummary(mode));
 
         if (disallowedByAdmin) {
             if (mEnforcedAdmin != null) {
@@ -177,35 +178,4 @@
         }
     }
 
-    private static int getSummary(int mode) {
-        switch (mode) {
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
-                return R.string.usb_use_charging_only_desc;
-            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
-                return R.string.usb_use_power_only_desc;
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
-                return R.string.usb_use_file_transfers_desc;
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
-                return R.string.usb_use_photo_transfers_desc;
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
-                return R.string.usb_use_MIDI_desc;
-        }
-        return 0;
-    }
-
-    private static int getTitle(int mode) {
-        switch (mode) {
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_NONE:
-                return R.string.usb_use_charging_only;
-            case UsbBackend.MODE_POWER_SOURCE | UsbBackend.MODE_DATA_NONE:
-                return R.string.usb_use_power_only;
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MTP:
-                return R.string.usb_use_file_transfers;
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_PTP:
-                return R.string.usb_use_photo_transfers;
-            case UsbBackend.MODE_POWER_SINK | UsbBackend.MODE_DATA_MIDI:
-                return R.string.usb_use_MIDI;
-        }
-        return 0;
-    }
 }

diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
new file mode 100644
index 0000000..f8232b8
--- /dev/null
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2016 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.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputManager;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.InputDevice;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
+
+public class GameControllerPreferenceController extends PreferenceController
+        implements InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause {
+
+    public static final String PREF_KEY = "vibrate_input_devices";
+    private static final String CATEGORY_KEY = "game_controller_settings_category";
+
+    private final InputManager mIm;
+
+    private PreferenceScreen mScreen;
+    private Preference mCategory;
+    private Preference mPreference;
+
+    public GameControllerPreferenceController(Context context) {
+        super(context);
+        mIm = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
+    }
+
+    @Override
+    public void onResume() {
+        mIm.registerInputDeviceListener(this, null);
+    }
+
+    @Override
+    public void onPause() {
+        mIm.unregisterInputDeviceListener(this);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mScreen = screen;
+        mCategory = screen.findPreference(CATEGORY_KEY);
+        mPreference = screen.findPreference(PREF_KEY);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        final int[] devices = mIm.getInputDeviceIds();
+        for (int deviceId : devices) {
+            InputDevice device = mIm.getInputDevice(deviceId);
+            if (device != null && !device.isVirtual() && device.getVibrator().hasVibrator()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(PREF_KEY, preference.getKey())) {
+            Settings.System.putInt(mContext.getContentResolver(),
+                    Settings.System.VIBRATE_INPUT_DEVICES,
+                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CATEGORY_KEY;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (preference == null) {
+            return;
+        }
+        ((SwitchPreference) preference).setChecked(Settings.System.getInt(
+                mContext.getContentResolver(),
+                Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0);
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        updateGameControllers();
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        updateGameControllers();
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        updateGameControllers();
+    }
+
+    private void updateGameControllers() {
+        if (isAvailable()) {
+            mScreen.addPreference(mCategory);
+            updateState(mPreference);
+        } else {
+            if (mCategory != null) {
+                mScreen.removePreference(mCategory);
+            }
+        }
+    }
+}

diff --git a/src/com/android/settings/inputmethod/InputAndGestureSettings.java b/src/com/android/settings/inputmethod/InputAndGestureSettings.java
new file mode 100644
index 0000000..874fc0b
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputAndGestureSettings.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2016 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.inputmethod;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.drawer.CategoryKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InputAndGestureSettings extends DashboardFragment {
+
+    private static final String TAG = "InputAndGestureSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return INPUT_AND_GESTURE_CATEGORY_FRAGMENT;
+    }
+
+    @Override
+    protected String getCategoryKey() {
+        return CategoryKey.CATEGORY_SYSTEM_INPUT;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.input_and_gesture;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final GameControllerPreferenceController gameControllerPreferenceController
+                = new GameControllerPreferenceController(context);
+        getLifecycle().addObserver(gameControllerPreferenceController);
+
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(gameControllerPreferenceController);
+
+        return controllers;
+    }
+}

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index ea6c529..2c12139 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

@@ -17,7 +17,6 @@
 package com.android.settings.inputmethod;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -25,54 +24,44 @@
 import android.hardware.input.InputDeviceIdentifier;
 import android.hardware.input.InputManager;
 import android.hardware.input.KeyboardLayout;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.provider.Settings.System;
 import android.speech.tts.TtsEngines;
-import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceClickListener;
-import android.support.v7.preference.PreferenceCategory;
 import android.view.InputDevice;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
-import android.view.textservice.SpellCheckerInfo;
-import android.view.textservice.TextServicesManager;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SubSettings;
-import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
-import com.android.settings.VoiceInputOutputSettings;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.language.PhoneLanguagePreferenceController;
+import com.android.settings.language.TtsPreferenceController;
+import com.android.settings.language.UserDictionaryPreferenceController;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.drawer.CategoryKey;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.TreeSet;
 
-public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
-        implements InputManager.InputDeviceListener,
-        KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener, Indexable {
+/**
+ * @deprecated New features should use {@code InputAndGestureSettings} and
+ * {@code LanguageAndRegionSettings} instead.
+ */
+@Deprecated
+public class InputMethodAndLanguageSettings extends DashboardFragment
+        implements KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener, Indexable {
 
-    private static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
-    private static final String KEY_PHONE_LANGUAGE = "phone_language";
-    private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
+    private static final String TAG = "IMEAndLanguageSetting";
 
-    private PreferenceCategory mGameControllerCategory;
-    private Preference mLanguagePref;
-    private InputManager mIm;
     private Intent mIntentWaitingForResult;
-    private InputMethodSettingValuesWrapper mInputMethodSettingValues;
 
     @Override
     public int getMetricsCategory() {
@@ -80,147 +69,33 @@
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.language_settings);
-
-        final Activity activity = getActivity();
-        mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(activity);
-
-        if (activity.getAssets().getLocales().length == 1) {
-            // No "Select language" pref if there's only one system locale available.
-            getPreferenceScreen().removePreference(findPreference(KEY_PHONE_LANGUAGE));
-        } else {
-            mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
-        }
-
-        new VoiceInputOutputSettings(this).onCreate();
-
-        mGameControllerCategory = (PreferenceCategory)findPreference(
-                "game_controller_settings_category");
-
-        // Build hard keyboard and game controller preference categories.
-        mIm = (InputManager)activity.getSystemService(Context.INPUT_SERVICE);
-        updateInputDevices();
-
-        // Spell Checker
-        final Preference spellChecker = findPreference(KEY_SPELL_CHECKERS);
-        if (spellChecker != null) {
-            // Note: KEY_SPELL_CHECKERS preference is marked as persistent="false" in XML.
-            InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference(spellChecker);
-            final Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.setClass(activity, SubSettings.class);
-            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT,
-                    SpellCheckersSettings.class.getName());
-            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID,
-                    R.string.spellcheckers_settings_title);
-            spellChecker.setIntent(intent);
-        }
-    }
-
-    private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
-        final Activity activity = getActivity();
-        final TreeSet<String> localeSet = UserDictionaryList.getUserDictionaryLocalesSet(activity);
-        if (null == localeSet) {
-            // The locale list is null if and only if the user dictionary service is
-            // not present or disabled. In this case we need to remove the preference.
-            getPreferenceScreen().removePreference(userDictionaryPreference);
-        } else {
-            userDictionaryPreference.setOnPreferenceClickListener(
-                    new OnPreferenceClickListener() {
-                        @Override
-                        public boolean onPreferenceClick(Preference arg0) {
-                            // Redirect to UserDictionarySettings if the user needs only one
-                            // language.
-                            final Bundle extras = new Bundle();
-                            final Class<? extends Fragment> targetFragment;
-                            if (localeSet.size() <= 1) {
-                                if (!localeSet.isEmpty()) {
-                                    // If the size of localeList is 0, we don't set the locale
-                                    // parameter in the extras. This will be interpreted by the
-                                    // UserDictionarySettings class as meaning
-                                    // "the current locale". Note that with the current code for
-                                    // UserDictionaryList#getUserDictionaryLocalesSet()
-                                    // the locale list always has at least one element, since it
-                                    // always includes the current locale explicitly.
-                                    // @see UserDictionaryList.getUserDictionaryLocalesSet().
-                                    extras.putString("locale", localeSet.first());
-                                }
-                                targetFragment = UserDictionarySettings.class;
-                            } else {
-                                targetFragment = UserDictionaryList.class;
-                            }
-                            startFragment(InputMethodAndLanguageSettings.this,
-                                    targetFragment.getCanonicalName(), -1, -1, extras);
-                            return true;
-                        }
-                    });
-        }
+    protected String getCategoryKey() {
+        return CategoryKey.CATEGORY_SYSTEM_LANGUAGE;
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-
-        mIm.registerInputDeviceListener(this, null);
-
-        final Preference spellChecker = findPreference(KEY_SPELL_CHECKERS);
-        if (spellChecker != null) {
-            final TextServicesManager tsm = (TextServicesManager) getSystemService(
-                    Context.TEXT_SERVICES_MANAGER_SERVICE);
-            if (!tsm.isSpellCheckerEnabled()) {
-                spellChecker.setSummary(R.string.switch_off_text);
-            } else {
-                final SpellCheckerInfo sci = tsm.getCurrentSpellChecker();
-                if (sci != null) {
-                    spellChecker.setSummary(sci.loadLabel(getPackageManager()));
-                } else {
-                    spellChecker.setSummary(R.string.spell_checker_not_selected);
-                }
-            }
-        }
-
-        if (mLanguagePref != null) {
-            final String localeNames = FeatureFactory.getFactory(getContext())
-                    .getLocaleFeatureProvider().getLocaleNames();
-            mLanguagePref.setSummary(localeNames);
-        }
-
-        updateUserDictionaryPreference(findPreference(KEY_USER_DICTIONARY_SETTINGS));
-
-        updateInputDevices();
-
-        // Refresh internal states in mInputMethodSettingValues to keep the latest
-        // "InputMethodInfo"s and "InputMethodSubtype"s
-        mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
+    protected String getLogTag() {
+        return TAG;
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-
-        mIm.unregisterInputDeviceListener(this);
-
-        // TODO: Consolidate the logic to InputMethodSettingsWrapper
-        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
-                this, getContentResolver(), mInputMethodSettingValues.getInputMethodList(),
-                false /* hasHardKeyboard */);
+    protected int getPreferenceScreenResId() {
+        return R.xml.language_settings;
     }
 
     @Override
-    public void onInputDeviceAdded(int deviceId) {
-        updateInputDevices();
-    }
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final GameControllerPreferenceController gameControllerPreferenceController =
+                new GameControllerPreferenceController(context);
+        getLifecycle().addObserver(gameControllerPreferenceController);
 
-    @Override
-    public void onInputDeviceChanged(int deviceId) {
-        updateInputDevices();
-    }
-
-    @Override
-    public void onInputDeviceRemoved(int deviceId) {
-        updateInputDevices();
+        final List<PreferenceController> list = new ArrayList<>();
+        list.add(gameControllerPreferenceController);
+        list.add(new PhoneLanguagePreferenceController(context));
+        list.add(new SpellCheckerPreferenceController(context));
+        list.add(new UserDictionaryPreferenceController(context));
+        list.add(new TtsPreferenceController(context, new TtsEngines(context)));
+        return list;
     }
 
     @Override
@@ -229,21 +104,9 @@
         if (Utils.isMonkeyRunning()) {
             return false;
         }
-        if (preference instanceof SwitchPreference) {
-            final SwitchPreference pref = (SwitchPreference) preference;
-            if (pref == mGameControllerCategory.findPreference("vibrate_input_devices")) {
-                System.putInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES,
-                        pref.isChecked() ? 1 : 0);
-                return true;
-            }
-        }
         return super.onPreferenceTreeClick(preference);
     }
 
-    private void updateInputDevices() {
-        updateGameControllers();
-    }
-
     private void showKeyboardLayoutDialog(InputDeviceIdentifier inputDeviceIdentifier) {
         KeyboardLayoutDialogFragment fragment = (KeyboardLayoutDialogFragment)
                 getFragmentManager().findFragmentByTag("keyboardLayout");
@@ -276,38 +139,12 @@
         }
     }
 
-    private void updateGameControllers() {
-        if (haveInputDeviceWithVibrator()) {
-            getPreferenceScreen().addPreference(mGameControllerCategory);
-
-            SwitchPreference pref = (SwitchPreference)
-                    mGameControllerCategory.findPreference("vibrate_input_devices");
-            pref.setChecked(System.getInt(getContentResolver(),
-                    Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0);
-        } else {
-            getPreferenceScreen().removePreference(mGameControllerCategory);
-        }
-    }
-
-    private static boolean haveInputDeviceWithVibrator() {
-        final int[] devices = InputDevice.getDeviceIds();
-        for (int i = 0; i < devices.length; i++) {
-            InputDevice device = InputDevice.getDevice(devices[i]);
-            if (device != null && !device.isVirtual() && device.getVibrator().hasVibrator()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
 
-        private final Context mContext;
         private final SummaryLoader mSummaryLoader;
         private LocaleFeatureProvider mLocaleFeatureProvider;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
             mSummaryLoader = summaryLoader;
             mLocaleFeatureProvider = FeatureFactory.getFactory(context).getLocaleFeatureProvider();
         }
@@ -339,11 +176,13 @@
             final String screenTitle = context.getString(R.string.language_keyboard_settings_title);
 
             // Locale picker.
-            if (context.getAssets().getLocales().length > 1) {
+            final PhoneLanguagePreferenceController mLanguagePrefController =
+                    new PhoneLanguagePreferenceController(context);
+            if (mLanguagePrefController.isAvailable()) {
                 String localeNames = FeatureFactory.getFactory(context).getLocaleFeatureProvider()
                         .getLocaleNames();
                 SearchIndexableRaw indexable = new SearchIndexableRaw(context);
-                indexable.key = KEY_PHONE_LANGUAGE;
+                indexable.key = mLanguagePrefController.getPreferenceKey();
                 indexable.title = context.getString(R.string.phone_language);
                 indexable.summaryOn = localeNames;
                 indexable.summaryOff = localeNames;
@@ -353,7 +192,7 @@
 
             // Spell checker.
             SearchIndexableRaw indexable = new SearchIndexableRaw(context);
-            indexable.key = KEY_SPELL_CHECKERS;
+            indexable.key = SpellCheckerPreferenceController.KEY_SPELL_CHECKERS;
             indexable.title = context.getString(R.string.spellcheckers_settings_title);
             indexable.screenTitle = screenTitle;
             indexable.keywords = context.getString(R.string.keywords_spell_checker);
@@ -476,9 +315,9 @@
             indexables.add(indexable);
 
             // Game controllers.
-            if (haveInputDeviceWithVibrator()) {
+            if (!new GameControllerPreferenceController(context).isAvailable()) {
                 indexable = new SearchIndexableRaw(context);
-                indexable.key = "vibrate_input_devices";
+                indexable.key = GameControllerPreferenceController.PREF_KEY;
                 indexable.title = context.getString(R.string.vibrate_input_devices);
                 indexable.summaryOn = context.getString(R.string.vibrate_input_devices_summary);
                 indexable.summaryOff = context.getString(R.string.vibrate_input_devices_summary);

diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
index 1b51c3c..09cc65e 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,32 +16,43 @@
 
 package com.android.settings.inputmethod;
 
-import android.content.Context;
+import android.annotation.Nullable;
+import android.app.Activity;
 import android.hardware.input.InputDeviceIdentifier;
 import android.hardware.input.InputManager;
 import android.hardware.input.InputManager.InputDeviceListener;
 import android.hardware.input.KeyboardLayout;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.view.InputDevice;
 
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodSubtype;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.internal.util.Preconditions;
+import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.inputmethod.PhysicalKeyboardFragment.KeyboardInfoPreference;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-public class KeyboardLayoutPickerFragment extends SettingsPreferenceFragment
+public final class KeyboardLayoutPickerFragment extends SettingsPreferenceFragment
         implements InputDeviceListener {
+
     private InputDeviceIdentifier mInputDeviceIdentifier;
     private int mInputDeviceId = -1;
     private InputManager mIm;
+    private InputMethodInfo mImi;
+    @Nullable
+    private InputMethodSubtype mSubtype;
     private KeyboardLayout[] mKeyboardLayouts;
-    private HashMap<CheckBoxPreference, KeyboardLayout> mPreferenceMap =
-            new HashMap<CheckBoxPreference, KeyboardLayout>();
+    private Map<Preference, KeyboardLayout> mPreferenceMap = new HashMap<>();
+
+    // TODO: Make these constants public API for b/25752827
 
     /**
      * Intent extra: The input device descriptor of the keyboard whose keyboard
@@ -49,6 +60,16 @@
      */
     public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
 
+    /**
+     * Intent extra: The associated {@link InputMethodInfo}.
+     */
+    public static final String EXTRA_INPUT_METHOD_INFO = "input_method_info";
+
+    /**
+     * Intent extra: The associated {@link InputMethodSubtype}.
+     */
+    public static final String EXTRA_INPUT_METHOD_SUBTYPE = "input_method_subtype";
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.INPUTMETHOD_KEYBOARD;
@@ -57,14 +78,18 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        Activity activity = Preconditions.checkNotNull(getActivity());
 
-        mInputDeviceIdentifier = getActivity().getIntent().getParcelableExtra(
+        mInputDeviceIdentifier = activity.getIntent().getParcelableExtra(
                 EXTRA_INPUT_DEVICE_IDENTIFIER);
-        if (mInputDeviceIdentifier == null) {
-            getActivity().finish();
+        mImi = activity.getIntent().getParcelableExtra(EXTRA_INPUT_METHOD_INFO);
+        mSubtype = activity.getIntent().getParcelableExtra(EXTRA_INPUT_METHOD_SUBTYPE);
+
+        if (mInputDeviceIdentifier == null || mImi == null) {
+            activity.finish();
         }
 
-        mIm = (InputManager)getSystemService(Context.INPUT_SERVICE);
+        mIm = activity.getSystemService(InputManager.class);
         mKeyboardLayouts = mIm.getKeyboardLayoutsForInputDevice(mInputDeviceIdentifier);
         Arrays.sort(mKeyboardLayouts);
         setPreferenceScreen(createPreferenceHierarchy());
@@ -83,8 +108,6 @@
             return;
         }
         mInputDeviceId = inputDevice.getId();
-
-        updateCheckedState();
     }
 
     @Override
@@ -97,34 +120,21 @@
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference instanceof CheckBoxPreference) {
-            CheckBoxPreference checkboxPref = (CheckBoxPreference)preference;
-            KeyboardLayout layout = mPreferenceMap.get(checkboxPref);
-            if (layout != null) {
-                boolean checked = checkboxPref.isChecked();
-                if (checked) {
-                    mIm.addKeyboardLayoutForInputDevice(mInputDeviceIdentifier,
-                            layout.getDescriptor());
-                } else {
-                    mIm.removeKeyboardLayoutForInputDevice(mInputDeviceIdentifier,
-                            layout.getDescriptor());
-                }
-                return true;
-            }
+        KeyboardLayout layout = mPreferenceMap.get(preference);
+        if (layout != null) {
+            mIm.setKeyboardLayoutForInputDevice(mInputDeviceIdentifier, mImi, mSubtype,
+                    layout.getDescriptor());
+            getActivity().finish();
+            return true;
         }
         return super.onPreferenceTreeClick(preference);
     }
 
     @Override
-    public void onInputDeviceAdded(int deviceId) {
-    }
+    public void onInputDeviceAdded(int deviceId) {}
 
     @Override
-    public void onInputDeviceChanged(int deviceId) {
-        if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
-            updateCheckedState();
-        }
-    }
+    public void onInputDeviceChanged(int deviceId) {}
 
     @Override
     public void onInputDeviceRemoved(int deviceId) {
@@ -135,26 +145,16 @@
 
     private PreferenceScreen createPreferenceHierarchy() {
         PreferenceScreen root = getPreferenceManager().createPreferenceScreen(getActivity());
-        Context context = getActivity();
 
         for (KeyboardLayout layout : mKeyboardLayouts) {
-            CheckBoxPreference pref = new CheckBoxPreference(getPrefContext());
+            Preference pref = new Preference(getPrefContext());
             pref.setTitle(layout.getLabel());
             pref.setSummary(layout.getCollection());
             root.addPreference(pref);
             mPreferenceMap.put(pref, layout);
         }
+
+        root.setTitle(KeyboardInfoPreference.getDisplayName(getContext(), mImi, mSubtype));
         return root;
     }
-
-    private void updateCheckedState() {
-        String[] enabledKeyboardLayouts = mIm.getEnabledKeyboardLayoutsForInputDevice(
-                mInputDeviceIdentifier);
-        Arrays.sort(enabledKeyboardLayouts);
-
-        for (Map.Entry<CheckBoxPreference, KeyboardLayout> entry : mPreferenceMap.entrySet()) {
-            entry.getKey().setChecked(Arrays.binarySearch(enabledKeyboardLayouts,
-                    entry.getValue().getDescriptor()) >= 0);
-        }
-    }
 }

diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
deleted file mode 100644
index 2e43a57..0000000
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2016 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.inputmethod;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.hardware.input.InputDeviceIdentifier;
-import android.hardware.input.InputManager;
-import android.hardware.input.InputManager.InputDeviceListener;
-import android.hardware.input.KeyboardLayout;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.InputDevice;
-
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodSubtype;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.internal.util.Preconditions;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment.KeyboardInfoPreference;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-public final class KeyboardLayoutPickerFragment2 extends SettingsPreferenceFragment
-        implements InputDeviceListener {
-
-    private InputDeviceIdentifier mInputDeviceIdentifier;
-    private int mInputDeviceId = -1;
-    private InputManager mIm;
-    private InputMethodInfo mImi;
-    @Nullable
-    private InputMethodSubtype mSubtype;
-    private KeyboardLayout[] mKeyboardLayouts;
-    private Map<Preference, KeyboardLayout> mPreferenceMap = new HashMap<>();
-
-    // TODO: Make these constants public API for b/25752827
-
-    /**
-     * Intent extra: The input device descriptor of the keyboard whose keyboard
-     * layout is to be changed.
-     */
-    public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
-
-    /**
-     * Intent extra: The associated {@link InputMethodInfo}.
-     */
-    public static final String EXTRA_INPUT_METHOD_INFO = "input_method_info";
-
-    /**
-     * Intent extra: The associated {@link InputMethodSubtype}.
-     */
-    public static final String EXTRA_INPUT_METHOD_SUBTYPE = "input_method_subtype";
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.INPUTMETHOD_KEYBOARD;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Activity activity = Preconditions.checkNotNull(getActivity());
-
-        mInputDeviceIdentifier = activity.getIntent().getParcelableExtra(
-                EXTRA_INPUT_DEVICE_IDENTIFIER);
-        mImi = activity.getIntent().getParcelableExtra(EXTRA_INPUT_METHOD_INFO);
-        mSubtype = activity.getIntent().getParcelableExtra(EXTRA_INPUT_METHOD_SUBTYPE);
-
-        if (mInputDeviceIdentifier == null || mImi == null) {
-            activity.finish();
-        }
-
-        mIm = activity.getSystemService(InputManager.class);
-        mKeyboardLayouts = mIm.getKeyboardLayoutsForInputDevice(mInputDeviceIdentifier);
-        Arrays.sort(mKeyboardLayouts);
-        setPreferenceScreen(createPreferenceHierarchy());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        mIm.registerInputDeviceListener(this, null);
-
-        InputDevice inputDevice =
-                mIm.getInputDeviceByDescriptor(mInputDeviceIdentifier.getDescriptor());
-        if (inputDevice == null) {
-            getActivity().finish();
-            return;
-        }
-        mInputDeviceId = inputDevice.getId();
-    }
-
-    @Override
-    public void onPause() {
-        mIm.unregisterInputDeviceListener(this);
-        mInputDeviceId = -1;
-
-        super.onPause();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        KeyboardLayout layout = mPreferenceMap.get(preference);
-        if (layout != null) {
-            mIm.setKeyboardLayoutForInputDevice(mInputDeviceIdentifier, mImi, mSubtype,
-                    layout.getDescriptor());
-            getActivity().finish();
-            return true;
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    @Override
-    public void onInputDeviceAdded(int deviceId) {}
-
-    @Override
-    public void onInputDeviceChanged(int deviceId) {}
-
-    @Override
-    public void onInputDeviceRemoved(int deviceId) {
-        if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
-            getActivity().finish();
-        }
-    }
-
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceManager().createPreferenceScreen(getActivity());
-
-        for (KeyboardLayout layout : mKeyboardLayouts) {
-            Preference pref = new Preference(getPrefContext());
-            pref.setTitle(layout.getLabel());
-            pref.setSummary(layout.getCollection());
-            root.addPreference(pref);
-            mPreferenceMap.put(pref, layout);
-        }
-
-        root.setTitle(KeyboardInfoPreference.getDisplayName(getContext(), mImi, mSubtype));
-        return root;
-    }
-}

diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index bca656a..f0fdc08 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java

@@ -225,10 +225,10 @@
             @Nullable InputMethodSubtype imSubtype) {
         final Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClass(getActivity(), Settings.KeyboardLayoutPickerActivity.class);
-        intent.putExtra(KeyboardLayoutPickerFragment2.EXTRA_INPUT_DEVICE_IDENTIFIER,
+        intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
                 inputDeviceIdentifier);
-        intent.putExtra(KeyboardLayoutPickerFragment2.EXTRA_INPUT_METHOD_INFO, imi);
-        intent.putExtra(KeyboardLayoutPickerFragment2.EXTRA_INPUT_METHOD_SUBTYPE, imSubtype);
+        intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_METHOD_INFO, imi);
+        intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_METHOD_SUBTYPE, imSubtype);
         startActivity(intent);
     }
 

diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
new file mode 100644
index 0000000..17d3fdc
--- /dev/null
+++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2016 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.inputmethod;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.textservice.SpellCheckerInfo;
+import android.view.textservice.TextServicesManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class SpellCheckerPreferenceController extends PreferenceController {
+
+    public static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
+
+    private final TextServicesManager mTextServicesManager;
+
+    public SpellCheckerPreferenceController(Context context) {
+        super(context);
+        mTextServicesManager = (TextServicesManager) context.getSystemService(
+                Context.TEXT_SERVICES_MANAGER_SERVICE);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(KEY_SPELL_CHECKERS);
+        if (preference != null) {
+            InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference(preference);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        return false;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SPELL_CHECKERS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (preference == null) {
+            return;
+        }
+        if (!mTextServicesManager.isSpellCheckerEnabled()) {
+            preference.setSummary(R.string.switch_off_text);
+        } else {
+            final SpellCheckerInfo sci = mTextServicesManager.getCurrentSpellChecker();
+            if (sci != null) {
+                preference.setSummary(sci.loadLabel(mContext.getPackageManager()));
+            } else {
+                preference.setSummary(R.string.spell_checker_not_selected);
+            }
+        }
+    }
+}

diff --git a/src/com/android/settings/language/LanguageAndRegionSettings.java b/src/com/android/settings/language/LanguageAndRegionSettings.java
new file mode 100644
index 0000000..5741255
--- /dev/null
+++ b/src/com/android/settings/language/LanguageAndRegionSettings.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.speech.tts.TtsEngines;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.inputmethod.SpellCheckerPreferenceController;
+import com.android.settingslib.drawer.CategoryKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LanguageAndRegionSettings extends DashboardFragment {
+
+    private static final String TAG = "LangAndRegionSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return LANGUAGE_AND_REGION_CATEGORY_FRAGMENT;
+    }
+
+    @Override
+    protected String getCategoryKey() {
+        return CategoryKey.CATEGORY_SYSTEM_LANGUAGE;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.language_and_region;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new PhoneLanguagePreferenceController(context));
+        controllers.add(new SpellCheckerPreferenceController(context));
+        controllers.add(new UserDictionaryPreferenceController(context));
+        controllers.add(new TtsPreferenceController(context, new TtsEngines(context)));
+        return controllers;
+    }
+
+}

diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
new file mode 100644
index 0000000..2b87fd9
--- /dev/null
+++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+public class PhoneLanguagePreferenceController extends PreferenceController {
+
+    private static final String KEY_PHONE_LANGUAGE = "phone_language";
+
+    public PhoneLanguagePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getAssets().getLocales().length > 1;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        return false;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (preference == null) {
+            return;
+        }
+        final String localeNames = FeatureFactory.getFactory(mContext)
+                .getLocaleFeatureProvider().getLocaleNames();
+        preference.setSummary(localeNames);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PHONE_LANGUAGE;
+    }
+}

diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java
new file mode 100644
index 0000000..ffc1eb1
--- /dev/null
+++ b/src/com/android/settings/language/TtsPreferenceController.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.speech.tts.TtsEngines;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+
+public class TtsPreferenceController extends PreferenceController {
+
+    private static final String KEY_VOICE_CATEGORY = "voice_category";
+    private static final String KEY_TTS_SETTINGS = "tts_settings";
+
+    private final TtsEngines mTtsEngines;
+
+    public TtsPreferenceController(Context context, TtsEngines ttsEngines) {
+        super(context);
+        mTtsEngines = ttsEngines;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return !mTtsEngines.getEngines().isEmpty();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (!isAvailable()) {
+            removePreference(screen, KEY_VOICE_CATEGORY);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        return false;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_TTS_SETTINGS;
+    }
+}

diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java
new file mode 100644
index 0000000..d26761b
--- /dev/null
+++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.UserDictionarySettings;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.inputmethod.UserDictionaryList;
+
+import java.util.TreeSet;
+
+public class UserDictionaryPreferenceController extends PreferenceController {
+
+    private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
+
+    public UserDictionaryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        final TreeSet<String> localeSet = getDictionaryLocales();
+        // The locale list is null if and only if the user dictionary service is
+        // not present or disabled. In this case we need to remove the preference.
+        return localeSet != null;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        return false;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_USER_DICTIONARY_SETTINGS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (!isAvailable() || preference == null) {
+            return;
+        }
+        final TreeSet<String> localeSet = getDictionaryLocales();
+        final Bundle extras = preference.getExtras();
+        final Class<? extends Fragment> targetFragment;
+        if (localeSet.size() <= 1) {
+            if (!localeSet.isEmpty()) {
+                // If the size of localeList is 0, we don't set the locale
+                // parameter in the extras. This will be interpreted by the
+                // UserDictionarySettings class as meaning
+                // "the current locale". Note that with the current code for
+                // UserDictionaryList#getUserDictionaryLocalesSet()
+                // the locale list always has at least one element, since it
+                // always includes the current locale explicitly.
+                // @see UserDictionaryList.getUserDictionaryLocalesSet().
+                extras.putString("locale", localeSet.first());
+            }
+            targetFragment = UserDictionarySettings.class;
+        } else {
+            targetFragment = UserDictionaryList.class;
+        }
+        preference.setFragment(targetFragment.getCanonicalName());
+    }
+
+    protected TreeSet<String> getDictionaryLocales() {
+        return UserDictionaryList.getUserDictionaryLocalesSet(mContext);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
new file mode 100644
index 0000000..da25f0f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java

@@ -0,0 +1,137 @@
+package com.android.settings.connecteddevice;
+
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.usb.UsbManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.deviceinfo.UsbBackend;
+import com.android.settings.deviceinfo.UsbModeChooserActivity;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UsbModePreferenceControllerTest {
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private UsbBackend mUsbBackend;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private UsbModePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mController = new UsbModePreferenceController(mContext, mUsbBackend);
+    }
+
+    @Test
+    public void testGetSummary_chargeDevice() {
+        assertThat(UsbModePreferenceController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[0]))
+                .isEqualTo(R.string.usb_use_charging_only_desc);
+    }
+
+    @Test
+    public void testGetSummary_supplyPower() {
+        assertThat(UsbModePreferenceController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[1]))
+                .isEqualTo(R.string.usb_use_power_only_desc);
+    }
+
+    @Test
+    public void testGetSummary_TransferFiles() {
+        assertThat(UsbModePreferenceController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[2]))
+                .isEqualTo(R.string.usb_use_file_transfers_desc);
+    }
+
+    @Test
+    public void testGetSummary_TransferPhoto() {
+        assertThat(UsbModePreferenceController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[3]))
+                .isEqualTo(R.string.usb_use_photo_transfers_desc);
+    }
+
+    @Test
+    public void testGetSummary_MIDI() {
+        assertThat(UsbModePreferenceController.getSummary(UsbModeChooserActivity.DEFAULT_MODES[4]))
+                .isEqualTo(R.string.usb_use_MIDI_desc);
+    }
+
+    @Test
+    public void testGetTitle_chargeDevice() {
+        assertThat(UsbModePreferenceController.getTitle(UsbModeChooserActivity.DEFAULT_MODES[0]))
+                .isEqualTo(R.string.usb_use_charging_only);
+    }
+
+    @Test
+    public void testGetTitle_supplyPower() {
+        assertThat(UsbModePreferenceController.getTitle(UsbModeChooserActivity.DEFAULT_MODES[1]))
+                .isEqualTo(R.string.usb_use_power_only);
+    }
+
+    @Test
+    public void testGetTitle_TransferFiles() {
+        assertThat(UsbModePreferenceController.getTitle(UsbModeChooserActivity.DEFAULT_MODES[2]))
+                .isEqualTo(R.string.usb_use_file_transfers);
+    }
+
+    @Test
+    public void testGetTitle_TransferPhoto() {
+        assertThat(UsbModePreferenceController.getTitle(UsbModeChooserActivity.DEFAULT_MODES[3]))
+                .isEqualTo(R.string.usb_use_photo_transfers);
+    }
+
+    @Test
+    public void testGetTitle_MIDI() {
+        assertThat(UsbModePreferenceController.getTitle(UsbModeChooserActivity.DEFAULT_MODES[4]))
+                .isEqualTo(R.string.usb_use_MIDI);
+    }
+
+    @Test
+    public void testPreferenceSummary_usbDisconnected() {
+        final Preference preference = new Preference(mContext);
+        preference.setKey("usb_mode");
+        preference.setEnabled(true);
+        mController.updateState(preference);
+        assertThat(preference.getSummary()).isEqualTo(
+                mContext.getString(R.string.usb_nothing_connected));
+    }
+
+    @Test
+    public void testUsbBoradcastReceiver_usbConnected_shouldUpdateSummary() {
+        final Preference preference = new Preference(mContext);
+        preference.setKey("usb_mode");
+        preference.setEnabled(true);
+        when(mUsbBackend.getCurrentMode()).thenReturn(UsbModeChooserActivity.DEFAULT_MODES[0]);
+        when(mScreen.findPreference("usb_mode")).thenReturn(preference);
+
+        mController.displayPreference(mScreen);
+        mController.onResume();
+        final Intent intent = new Intent(UsbManager.ACTION_USB_STATE);
+        intent.putExtra(UsbManager.USB_CONNECTED, true);
+        mContext.sendStickyBroadcast(intent);
+
+        assertThat(preference.getSummary()).isEqualTo(
+                mContext.getString(R.string.usb_use_charging_only));
+    }
+
+}
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index e2b4473..578b853 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java

@@ -22,6 +22,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
+import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +31,6 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
@@ -41,7 +41,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(RobolectricTestRunner.class)
+@RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SwipeToNotificationPreferenceControllerTest {
 

diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
new file mode 100644
index 0000000..c1bd0e0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016 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.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputManager;
+import android.view.InputDevice;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class GameControllerPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private InputManager mInputManager;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private InputDevice mInputDevice;
+
+    private GameControllerPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mInputManager);
+        mController = new GameControllerPreferenceController(mContext);
+    }
+
+    @Test
+    public void testLifecycle_shouldRegisterInputManager() {
+        mController.onResume();
+
+        // register is called, but unregister should not be called.
+        verify(mInputManager).registerInputDeviceListener(mController, null);
+        verify(mInputManager, never()).unregisterInputDeviceListener(mController);
+
+        mController.onPause();
+        // register is not called any more times, but unregister should be called once.
+        verify(mInputManager).registerInputDeviceListener(mController, null);
+        verify(mInputManager).unregisterInputDeviceListener(mController);
+    }
+
+    @Test
+    public void testIsAvailable_hasDeviceWithVibrator_shouldReturnTrue() {
+        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{1});
+        when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
+        when(mInputDevice.isVirtual()).thenReturn(false);
+        when(mInputDevice.getVibrator().hasVibrator()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailable_hasNoVibratingDevice_shouldReturnFalse() {
+        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{1});
+        when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
+        when(mInputDevice.isVirtual()).thenReturn(false);
+        when(mInputDevice.getVibrator().hasVibrator()).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testIsAvailable_hasNoPhysicalDevice_shouldReturnFalse() {
+        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{1});
+        when(mInputManager.getInputDevice(1)).thenReturn(mInputDevice);
+        when(mInputDevice.isVirtual()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testIsAvailable_hasNoDevice_shouldReturnFalse() {
+        when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputAndGestureSettingsTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputAndGestureSettingsTest.java
new file mode 100644
index 0000000..f51ee56
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/InputAndGestureSettingsTest.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2016 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.inputmethod;
+
+import android.content.Context;
+import android.hardware.input.InputManager;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.core.lifecycle.LifecycleObserver;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class InputAndGestureSettingsTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mock(InputManager.class));
+        mFragment = new TestFragment(mContext);
+    }
+
+    @Test
+    public void testGetPreferenceScreenResId() {
+        assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(R.xml.input_and_gesture);
+    }
+
+    @Test
+    public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
+        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        int lifecycleObserverCount = 0;
+        for (PreferenceController controller : controllers) {
+            if (controller instanceof LifecycleObserver) {
+                lifecycleObserverCount++;
+            }
+        }
+        verify(mFragment.getLifecycle(), times(lifecycleObserverCount))
+                .addObserver(any(LifecycleObserver.class));
+    }
+
+    public static class TestFragment extends InputAndGestureSettings {
+
+        private Lifecycle mLifecycle;
+        private Context mContext;
+
+        public TestFragment(Context context) {
+            mContext = context;
+            mLifecycle = mock(Lifecycle.class);
+        }
+
+        @Override
+        public Context getContext() {
+            return mContext;
+        }
+
+        @Override
+        protected Lifecycle getLifecycle() {
+            if (mLifecycle == null) {
+                return super.getLifecycle();
+            }
+            return mLifecycle;
+        }
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
new file mode 100644
index 0000000..78c0590
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2016 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.inputmethod;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.view.textservice.SpellCheckerInfo;
+import android.view.textservice.TextServicesManager;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SpellCheckerPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private TextServicesManager mTextServicesManager;
+    private Context mAppContext;
+    private Preference mPreference;
+    private SpellCheckerPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mAppContext = ShadowApplication.getInstance().getApplicationContext();
+        when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
+                .thenReturn(mTextServicesManager);
+        mPreference = new Preference(mAppContext);
+        mController = new SpellCheckerPreferenceController(mContext);
+    }
+
+    @Test
+    public void updateState_NoSpellerChecker_shouldSetSummaryToDefault() {
+        when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(true);
+        when(mTextServicesManager.getCurrentSpellChecker()).thenReturn(null);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mAppContext.getString(R.string.spell_checker_not_selected));
+    }
+
+    @Test
+    public void updateState_spellerCheckerDisabled_shouldSetSummaryToDisabledText() {
+        when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mAppContext.getString(R.string.switch_off_text));
+    }
+
+    @Test
+    public void updateState_hasSpellerChecker_shouldSetSummaryToAppName() {
+        final String spellCheckerAppLabel = "test";
+        final SpellCheckerInfo sci = mock(SpellCheckerInfo.class);
+        when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(true);
+        when(mTextServicesManager.getCurrentSpellChecker()).thenReturn(sci);
+        when(sci.loadLabel(mContext.getPackageManager())).thenReturn(spellCheckerAppLabel);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getSummary()).isEqualTo(spellCheckerAppLabel);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndRegionSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndRegionSettingsTest.java
new file mode 100644
index 0000000..7efdc9d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndRegionSettingsTest.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.view.textservice.TextServicesManager;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LanguageAndRegionSettingsTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
+                .thenReturn(mock(TextServicesManager.class));
+        mFragment = new TestFragment(mContext);
+    }
+
+    @Test
+    public void testGetPreferenceScreenResId() {
+        assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(R.xml.language_and_region);
+    }
+
+    @Test
+    public void testGetPreferenceControllers_shouldAllBeCreated() {
+        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+
+        assertThat(controllers.isEmpty()).isFalse();
+    }
+
+    public static class TestFragment extends LanguageAndRegionSettings {
+
+        private Context mContext;
+
+        public TestFragment(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public Context getContext() {
+            return mContext;
+        }
+    }
+
+}

diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
new file mode 100644
index 0000000..e7367bb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PhoneLanguagePreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private Preference mPreference;
+    private FakeFeatureFactory mFeatureFactory;
+    private PhoneLanguagePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mController = new PhoneLanguagePreferenceController(mContext);
+    }
+
+    @Test
+    public void testIsAvailable_hasMultipleLocales_shouldReturnTrue() {
+        when(mContext.getAssets().getLocales()).thenReturn(new String[]{"en", "de"});
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailable_hasSingleLocales_shouldReturnFalse() {
+        when(mContext.getAssets().getLocales()).thenReturn(new String[]{"en"});
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testUpdateState_shouldUpdateSummary() {
+        final String testSummary = "test";
+        when(mFeatureFactory.localeFeatureProvider.getLocaleNames()).thenReturn(testSummary);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(testSummary);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
new file mode 100644
index 0000000..0e41784
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TtsEngines;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class TtsPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private TtsEngines mTtsEngines;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private TtsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new TtsPreferenceController(mContext, mTtsEngines);
+    }
+
+    @Test
+    public void testIsAvailable_ttsEngineEmpty_shouldReturnFalse() {
+
+        // Not available when there is no engine.
+        when(mTtsEngines.getEngines()).thenReturn(new ArrayList<>());
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testIsAvailable_ttsEngineInstalled_shouldReturnTrue() {
+        final List<TextToSpeech.EngineInfo> infolist = new ArrayList<>();
+        infolist.add(mock(TextToSpeech.EngineInfo.class));
+        when(mTtsEngines.getEngines()).thenReturn(infolist);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void displayPreference_notAvailable_shouldRemoveCategory() {
+        when(mScreen.findPreference(anyString())).thenReturn(mock(Preference.class));
+
+        mController.displayPreference(mScreen);
+
+        // Remove both category and preference.
+        verify(mScreen, times(2)).removePreference(any(Preference.class));
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
new file mode 100644
index 0000000..d2032ed
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2016 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.language;
+
+import android.content.Context;
+import android.speech.tts.TtsEngines;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.UserDictionarySettings;
+import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.TreeSet;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class UserDictionaryPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private TtsEngines mTtsEngines;
+    private Preference mPreference;
+    private TestController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mController = new TestController(mContext);
+        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
+    }
+
+    @Test
+    public void testIsAvailable_noLocale_shouldReturnFalse() {
+        mController.mLocales = null;
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testIsAvailable_hasLocale_shouldReturnTrue() {
+        mController.mLocales.add("en");
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_noLocale_setUserDictionarySettingsAsFragment() {
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getFragment())
+                .isEqualTo(UserDictionarySettings.class.getCanonicalName());
+    }
+
+    @Test
+    public void updateState_singleLocale_setUserDictionarySettingsAsFragment_setLocaleInExtra() {
+        mController.mLocales.add("en");
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getFragment())
+                .isEqualTo(UserDictionarySettings.class.getCanonicalName());
+        assertThat(mPreference.getExtras().getString("locale"))
+                .isEqualTo("en");
+    }
+
+    @Test
+    public void updateState_multiLocale_setUserDictionaryListAsFragment() {
+        mController.mLocales.add("en");
+        mController.mLocales.add("de");
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getFragment())
+                .isEqualTo(UserDictionaryList.class.getCanonicalName());
+    }
+
+    /**
+     * Fake Controller that overrides getDictionaryLocales to make testing the rest of stuff easier.
+     */
+    private class TestController extends UserDictionaryPreferenceController {
+
+        private TreeSet<String> mLocales = new TreeSet<>();
+
+        @Override
+        protected TreeSet<String> getDictionaryLocales() {
+            return mLocales;
+        }
+
+        public TestController(Context context) {
+            super(context);
+        }
+    }
+
+}
commit	7c16338c472ea623d42ca97bbf1827ac7d03abd7	[log] [tgz]
author	Nathan Harold <nharold@google.com>	Tue Nov 08 19:47:49 2016 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Nov 08 19:47:49 2016 +0000
tree	d1fc91e7ffde9481510fff922574fc7ce7c26fe7
parent	50e19f6e8fcad2f5900f44ee5760560439482624 [diff]
parent	e272c2078ba1626e1f14c57257d9516bd107acea [diff]