diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ad93db..43fe796 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,7 +92,9 @@
             android:requiredForAllUsers="true"
             android:supportsRtl="true"
             android:allowBackup="false"
-            android:usesCleartextTraffic="true">
+            android:usesCleartextTraffic="true"
+            android:forceDeviceEncrypted="true"
+            android:encryptionAware="true">
 
         <!-- Settings -->
 
@@ -121,6 +123,38 @@
             </intent-filter>
         </activity-alias>
 
+        <activity android:name=".Settings$WirelessSettings"
+            android:label="@string/header_category_wireless_networks">
+            <intent-filter android:priority="4">
+                <action android:name="com.android.settings.category.wireless" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".Settings$DeviceSettings"
+            android:label="@string/header_category_device">
+            <intent-filter android:priority="3">
+                <action android:name="com.android.settings.category.device" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".Settings$PersonalSettings"
+            android:label="@string/header_category_personal">
+            <intent-filter android:priority="2">
+                <action android:name="com.android.settings.category.personal" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".SystemSettings"
+            android:label="@string/header_category_system">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.category.system" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <receiver android:name="ManagedProfileSetup">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
@@ -146,6 +180,7 @@
         <activity android:name="Settings$WirelessSettingsActivity"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wireless_networks_settings_title"
+                android:icon="@drawable/ic_settings_more"
                 android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -158,10 +193,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.wireless" />
+            <meta-data android:name="com.android.settings.title"
+                android:value="@string/radio_controls_title" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.WirelessSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
             <!-- Note that this doesn't really show any Wireless settings. -->
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
@@ -183,6 +223,7 @@
         <activity android:name="Settings$WifiSettingsActivity"
                 android:taskAffinity=""
                 android:label="@string/wifi_settings"
+                android:icon="@drawable/ic_settings_wireless"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -194,10 +235,13 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="4">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wifi_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -206,13 +250,12 @@
         <activity-alias android:name=".wifi.WifiSettings"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_settings"
+                android:icon="@drawable/ic_settings_wireless"
                 android:targetActivity="Settings$WifiSettingsActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:exported="true">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wifi_settings" />
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
@@ -248,6 +291,7 @@
         <activity android:name="Settings$AdvancedWifiSettingsActivity"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_advanced_settings_label"
+                android:icon="@drawable/ic_settings_wireless"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter android:priority="1">
@@ -261,8 +305,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.AdvancedWifiSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wifi_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -270,6 +312,7 @@
         <activity android:name="Settings$SavedAccessPointsSettingsActivity"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_saved_access_points_label"
+                android:icon="@drawable/ic_settings_wireless"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter android:priority="1">
@@ -282,8 +325,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.SavedAccessPointsSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wifi_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -343,16 +384,6 @@
                 android:value="true" />
         </activity>
 
-        <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
-        <activity-alias android:name=".wifi.WifiApSettings"
-                android:targetActivity="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-        </activity-alias>
-
         <!-- Runs in the phone process since it needs access to UiccController -->
         <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
@@ -378,6 +409,7 @@
 
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
+                android:icon="@drawable/ic_settings_bluetooth"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -389,10 +421,13 @@
                 <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="3">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.bluetooth.BluetoothSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/bluetooth_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -403,8 +438,6 @@
                 android:clearTaskOnLaunch="true">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.bluetooth.BluetoothSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/bluetooth_settings" />
         </activity-alias>
 
         <activity android:name=".bluetooth.DevicePickerActivity"
@@ -429,6 +462,7 @@
 
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
+                android:icon="@drawable/ic_settings_wireless"
                 android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -438,8 +472,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.TetherSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -450,8 +482,6 @@
                   android:targetActivity="Settings$TetherSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.TetherSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
@@ -464,13 +494,12 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
         </activity>
 
 
         <activity android:name="Settings$VpnSettingsActivity"
                 android:label="@string/vpn_settings_title"
+                android:icon="@drawable/ic_settings_wireless"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.net.vpn.SETTINGS" />
@@ -484,14 +513,13 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.vpn2.VpnSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$DateTimeSettingsActivity"
                 android:label="@string/date_and_time"
+                android:icon="@drawable/ic_settings_date_time"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATE_SETTINGS" />
@@ -503,10 +531,13 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="5">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DateTimeSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/date_time_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -522,6 +553,7 @@
 
         <activity android:name="Settings$LocalePickerActivity"
                 android:label="@string/language_picker_title"
+                android:icon="@drawable/ic_settings_language"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter android:priority="1">
@@ -535,14 +567,13 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.LocalePicker" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
                 android:label="@string/language_keyboard_settings_title"
+                android:icon="@drawable/ic_settings_language"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -554,10 +585,13 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.personal" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -576,8 +610,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageAssist" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
         </activity>
 
         <activity android:name="Settings$KeyboardLayoutPickerActivity"
@@ -589,8 +621,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.inputmethod.KeyboardLayoutPickerFragment" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -601,8 +631,6 @@
                 android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
         </activity-alias>
 
         <activity android:name="Settings$SpellCheckersSettingsActivity"
@@ -616,8 +644,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.inputmethod.SpellCheckersSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
         </activity>
 
         <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
@@ -658,8 +684,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.inputmethod.UserDictionaryList" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -685,12 +709,11 @@
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.UserDictionarySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
         </activity-alias>
 
         <activity android:name="Settings$ZenModeSettingsActivity"
                 android:label="@string/zen_mode_settings_title"
+                android:icon="@drawable/ic_settings_notifications"
                 android:exported="true"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
@@ -704,14 +727,33 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$ZenModeVisualInterruptionSettingsActivity"
+                  android:label="@string/zen_mode_visual_interruptions_settings_title"
+                  android:icon="@drawable/ic_settings_notifications"
+                  android:exported="true"
+                  android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
         <activity android:name="Settings$ZenModePrioritySettingsActivity"
                 android:label="@string/zen_mode_priority_settings_title"
+                android:icon="@drawable/ic_settings_notifications"
                 android:exported="true"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
@@ -725,14 +767,13 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModePrioritySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$ZenModeAutomationSettingsActivity"
                 android:label="@string/zen_mode_automation_settings_title"
+                android:icon="@drawable/ic_settings_notifications"
                 android:exported="true"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
@@ -750,8 +791,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeAutomationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -769,8 +808,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -788,8 +825,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeEventRuleSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -807,14 +842,13 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeExternalRuleSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$HomeSettingsActivity"
                 android:label="@string/home_settings"
+                android:icon="@drawable/ic_settings_home"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.HOME_SETTINGS" />
@@ -825,16 +859,20 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="10">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.HomeSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/home_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
+                android:icon="@drawable/ic_settings_display"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -847,10 +885,13 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="9">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DisplaySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/display_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -862,13 +903,12 @@
                 android:targetActivity="Settings$DisplaySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DisplaySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/display_settings" />
         </activity-alias>
 
         <activity android:name="Settings$DeviceInfoSettingsActivity"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                 android:label="@string/device_info_settings"
+                android:icon="@drawable/ic_settings_about"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -880,10 +920,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.system" />
+            <meta-data android:name="com.android.settings.title"
+                android:value="@string/about_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DeviceInfoSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/about_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -902,6 +947,7 @@
 
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
+                android:icon="@drawable/ic_settings_applications"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -914,25 +960,32 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="6">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$MemorySettingsActivity"
                 android:label="@string/memory_settings_title"
+                android:icon="@drawable/ic_settings_memory"
                 android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="3">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ProcessStatsSummary" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/manage_memory" />
         </activity>
 
         <activity android:name="Settings$AllApplicationsActivity"
@@ -944,8 +997,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -981,8 +1032,6 @@
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
         </activity-alias>
 
         <!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
@@ -1000,8 +1049,6 @@
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
         </activity-alias>
 
         <!-- Provide direct entry into manage apps showing storage usage for apps.
@@ -1012,8 +1059,6 @@
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
         </activity-alias>
 
         <!-- Still need a top-level activity for showing app details.  Aliasing
@@ -1051,8 +1096,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1074,8 +1117,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1117,13 +1158,24 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.AppOpsSummary" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
         </activity>
         -->
 
+        <activity android:name="Settings$BackgroundCheckSummaryActivity"
+                android:label="@string/background_check_title"
+                android:taskAffinity=""
+                android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.BackgroundCheckSummary" />
+        </activity>
+
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"
+                android:icon="@drawable/ic_settings_location"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
@@ -1136,16 +1188,20 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="3">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.personal" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.location.LocationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/location_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
+                android:icon="@drawable/ic_settings_security"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
                 android:parentActivityName="Settings">
@@ -1159,10 +1215,13 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="2">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.personal" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.SecuritySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1183,6 +1242,7 @@
 
         <activity android:name="Settings$TrustedCredentialsSettingsActivity"
                 android:label="@string/trusted_credentials"
+                android:icon="@drawable/ic_settings_security"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
@@ -1196,8 +1256,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.TrustedCredentialsSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -1208,12 +1266,11 @@
                 android:targetActivity="Settings$SecuritySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.SecuritySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
         </activity-alias>
 
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
+                android:icon="@drawable/ic_settings_backup"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
@@ -1227,10 +1284,13 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="-2">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.personal" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.PrivacySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/privacy_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1263,8 +1323,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DeviceAdminSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -1274,8 +1332,6 @@
                 android:targetActivity="Settings$DeviceAdminSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DeviceAdminSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
         </activity-alias>
 
         <activity android:name="DeviceAdminAdd"
@@ -1302,8 +1358,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
         </activity>
 
         <activity-alias android:name="SetProfileOwner"
@@ -1328,6 +1382,7 @@
 
         <activity android:name="Settings$AccessibilitySettingsActivity"
                 android:label="@string/accessibility_settings"
+                android:icon="@drawable/ic_settings_accessibility"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
@@ -1340,10 +1395,13 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="4">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.AccessibilitySettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/accessibility_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1362,8 +1420,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/accessibility_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1382,8 +1438,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.CaptionPropertiesFragment" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/accessibility_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1398,8 +1452,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.tts.TextToSpeechSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1555,6 +1607,7 @@
 
         <activity android:name="Settings$StorageSettingsActivity"
                 android:label="@string/storage_settings_title"
+                android:icon="@drawable/ic_settings_storage"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -1567,10 +1620,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="5">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
+            <meta-data android:name="com.android.settings.title"
+                android:value="@string/storage_usb_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.StorageSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/storage_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1581,8 +1639,6 @@
                 android:parentActivityName="Settings$StorageSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/storage_settings" />
         </activity>
 
         <activity android:name="Settings$PublicVolumeSettingsActivity"
@@ -1599,8 +1655,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.PublicVolumeSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/storage_settings" />
         </activity>
 
         <activity android:name="Settings$PrivateVolumeForgetActivity"
@@ -1611,8 +1665,6 @@
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.PrivateVolumeForget" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/storage_settings" />
         </activity>
 
         <!-- Exported for SystemUI to launch into -->
@@ -1673,6 +1725,7 @@
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
                 android:label="@string/development_settings_title"
+                android:icon="@drawable/ic_settings_development"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -1680,16 +1733,20 @@
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="2">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DevelopmentSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/development_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$PrintSettingsActivity"
                 android:label="@string/print_settings"
+                android:icon="@drawable/ic_settings_print"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -1701,10 +1758,13 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <intent-filter android:priority="3">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.print.PrintSettingsFragment" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/print_settings" />
         </activity>
 
         <activity android:name="Settings$PrintJobSettingsActivity"
@@ -1718,8 +1778,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.print.PrintJobSettingsFragment" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/print_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -1729,8 +1787,6 @@
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DevelopmentSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/development_settings" />
         </activity-alias>
 
         <activity android:name=".AppPicker" android:label="@string/select_application"
@@ -1743,8 +1799,6 @@
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.UsbSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/storage_settings" />
         </activity-alias>
 
         <!-- Bluetooth stuff -->
@@ -1876,6 +1930,7 @@
 
         <activity android:name="Settings$WifiDisplaySettingsActivity"
                 android:label="@string/wifi_display_settings_title"
+                android:icon="@drawable/ic_settings_display"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAST_SETTINGS" />
@@ -1889,16 +1944,6 @@
                 android:value="com.android.settings.wfd.WifiDisplaySettings" />
         </activity>
 
-
-        <!-- Development settings -->
-
-        <!-- DeviceInfo adds the user's requested build to stats upload.  -->
-        <receiver android:name=".DeviceInfo$StatsReportReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.STATISTICS_REPORT" />
-            </intent-filter>
-        </receiver>
-
         <activity android:name="Display" android:label="@string/display_label"
                 android:configChanges="fontScale"
                 android:taskAffinity="com.android.settings"
@@ -1917,17 +1962,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
-        <activity-alias android:name="ProxySelector"
-            android:label="@string/proxy_settings_label"
-            android:targetActivity="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-        </activity-alias>
-
         <!-- TODO: Is this needed? -->
         <activity android:name="BandMode"
                   android:theme="@android:style/Theme.Dialog"
@@ -1985,6 +2019,7 @@
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:label="@string/power_usage_summary_title"
+                android:icon="@drawable/ic_settings_battery"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -1995,10 +2030,13 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="4">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/battery_settings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -2008,12 +2046,11 @@
                 android:targetActivity="Settings$PowerUsageSummaryActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/battery_settings" />
         </activity-alias>
 
         <activity android:name="Settings$BatterySaverSettingsActivity"
                 android:label="@string/battery_saver"
+                android:icon="@drawable/ic_settings_battery"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
@@ -2026,8 +2063,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.fuelgauge.BatterySaverSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/battery_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2045,6 +2080,7 @@
 
         <activity android:name="Settings$AccountSettingsActivity"
             android:label="@string/account_settings_title"
+            android:icon="@drawable/ic_settings_accounts"
             android:taskAffinity=""
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
@@ -2055,6 +2091,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.personal" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accounts.AccountSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2075,8 +2116,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accounts.AccountSyncSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/account_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2121,6 +2160,17 @@
             </intent-filter>
         </activity>
 
+        <!-- Triggered when user-selected home app isn't encryption aware -->
+        <activity android:name=".FallbackHome"
+                  android:excludeFromRecents="true"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter android:priority="-10">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".CryptKeeper$FadeToBlack"
             android:immersive="true"
             android:launchMode="singleTop"
@@ -2146,26 +2196,29 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.CryptKeeperSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/security_settings" />
         </activity>
 
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
+                android:icon="@drawable/ic_settings_data_usage"
                 android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DataUsageSummary" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
         </activity>
 
         <activity android:name="Settings$DreamSettingsActivity"
                 android:label="@string/screensaver_settings_title"
+                android:icon="@drawable/ic_settings_display"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DREAM_SETTINGS" />
@@ -2178,14 +2231,13 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DreamSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/display_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$UserSettingsActivity"
                 android:label="@string/user_settings_title"
+                android:icon="@drawable/ic_settings_multiuser"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_SETTINGS" />
@@ -2195,16 +2247,20 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="2">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.users.UserSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/user_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity android:name="Settings$PaymentSettingsActivity"
                 android:label="@string/nfc_payment_settings_title"
+                android:icon="@drawable/ic_settings_nfc_payment"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
@@ -2214,10 +2270,13 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.nfc.PaymentSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/nfc_payment_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2273,8 +2332,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.notification.NotificationAccessSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/notification_settings" />
         </activity>
 
         <activity android:name="Settings$ZenAccessSettingsActivity"
@@ -2290,12 +2347,11 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.notification.ZenAccessSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/notification_settings" />
         </activity>
 
-        <activity android:name="Settings$NotificationSettingsActivity"
-                android:label="@string/notification_settings"
+        <activity android:name="Settings$ConfigureNotificationSettingsActivity"
+                android:label="@string/configure_notification_settings"
+                android:icon="@drawable/ic_settings_notifications"
                 android:exported="true"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
@@ -2308,18 +2364,17 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.NotificationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
+                android:value="com.android.settings.notification.ConfigureNotificationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="Settings$SoundSettingsActivity"
-                android:label="@string/notification_settings"
+        <activity android:name="Settings$SoundSettingsActivity"
+                android:label="@string/sound_settings"
+                android:icon="@drawable/ic_settings_sound"
                 android:taskAffinity=""
-                android:targetActivity="Settings$NotificationSettingsActivity">
+                android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
                 <action android:name="android.settings.SOUND_SETTINGS" />
@@ -2329,24 +2384,26 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <intent-filter android:priority="7">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.NotificationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
+                android:value="com.android.settings.notification.SoundSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
-        </activity-alias>
+        </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="SoundSettings"
-                android:label="@string/notification_settings"
+                android:label="@string/sound_settings"
                 android:exported="true"
-                android:targetActivity="Settings$NotificationSettingsActivity">
+                android:targetActivity="Settings$SoundSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.NotificationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
+                android:value="com.android.settings.notification.SoundSettings" />
         </activity-alias>
 
         <activity android:name="Settings$OtherSoundSettingsActivity"
@@ -2363,8 +2420,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.OtherSoundSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2372,12 +2427,16 @@
         <!-- Show apps for which application-level notification settings are applicable -->
         <activity android:name="Settings$NotificationAppListActivity"
                 android:label="@string/app_notifications_title"
+                android:icon="@drawable/ic_settings_notifications"
                 android:exported="true"
                 android:taskAffinity="">
+            <intent-filter android:priority="8">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
         </activity>
 
         <!-- Show application-level notification settings (app passed in as extras) -->
@@ -2394,8 +2453,6 @@
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.AppNotificationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/notification_settings" />
         </activity>
 
         <!-- Show Manual (from settings item) -->
@@ -2472,6 +2529,7 @@
 
         <activity android:name="Settings$SimSettingsActivity"
                 android:label="@string/sim_settings_title"
+                android:icon="@drawable/ic_settings_sim"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
@@ -2481,10 +2539,13 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter android:priority="2">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.sim.SimSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/sim_settings" />
         </activity>
 
         <activity android:name=".sim.SimPreferenceDialog"
@@ -2495,7 +2556,8 @@
         <activity android:name=".wifi.WifiDialogActivity"
             android:theme="@style/Transparent"
             android:excludeFromRecents="true"
-            android:exported="true">
+            android:exported="true"
+            android:permission="android.permission.CHANGE_WIFI_STATE">
             <intent-filter>
                 <action android:name="com.android.settings.WIFI_DIALOG" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2524,8 +2586,6 @@
                        android:value="com.android.settings.WifiCallingSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/wireless_settings" />
         </activity>
 
         <provider
diff --git a/res/drawable/selectable_card.xml b/res/drawable/selectable_card.xml
new file mode 100644
index 0000000..554b9f6
--- /dev/null
+++ b/res/drawable/selectable_card.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight" >
+    <item android:drawable="@color/card_background"/>
+</ripple>
diff --git a/res/layout-land/dashboard_tile.xml b/res/layout-land/dashboard_tile.xml
deleted file mode 100644
index a817799..0000000
--- a/res/layout-land/dashboard_tile.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/dashboard_tile_minimum_height">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:layout_weight="1">
-
-            <ImageView
-                    android:id="@+id/icon"
-                    android:layout_width="@dimen/dashboard_tile_image_size"
-                    android:layout_height="@dimen/dashboard_tile_image_size"
-                    android:scaleType="centerInside"
-                    android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-                    android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
-
-            <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                <TextView android:id="@+id/title"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:textAppearance="@style/TextAppearance.TileTitle"
-                          android:ellipsize="marquee"
-                          android:fadingEdge="horizontal" />
-
-                <TextView android:id="@+id/status"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_below="@id/title"
-                          android:layout_alignStart="@android:id/title"
-                          android:textAppearance="@style/TextAppearance.Small"
-                          android:textColor="?android:attr/textColorSecondary" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <View android:id="@+id/tile_divider"
-              android:layout_width="match_parent"
-              android:layout_height="1dp"
-              android:background="?android:attr/dividerVertical" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/dashboard_tile.xml b/res/layout-sw600dp/dashboard_tile.xml
deleted file mode 100644
index a817799..0000000
--- a/res/layout-sw600dp/dashboard_tile.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/dashboard_tile_minimum_height">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:layout_weight="1">
-
-            <ImageView
-                    android:id="@+id/icon"
-                    android:layout_width="@dimen/dashboard_tile_image_size"
-                    android:layout_height="@dimen/dashboard_tile_image_size"
-                    android:scaleType="centerInside"
-                    android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-                    android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
-
-            <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                <TextView android:id="@+id/title"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:textAppearance="@style/TextAppearance.TileTitle"
-                          android:ellipsize="marquee"
-                          android:fadingEdge="horizontal" />
-
-                <TextView android:id="@+id/status"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_below="@id/title"
-                          android:layout_alignStart="@android:id/title"
-                          android:textAppearance="@style/TextAppearance.Small"
-                          android:textColor="?android:attr/textColorSecondary" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <View android:id="@+id/tile_divider"
-              android:layout_width="match_parent"
-              android:layout_height="1dp"
-              android:background="?android:attr/dividerVertical" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 6469779..7e981f1 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -32,8 +32,8 @@
         android:scaleType="fitXY"
         android:src="?android:attr/listDivider" />
 
-    <ListView
-        android:id="@android:id/list"
+    <FrameLayout
+        android:id="@+id/prefs_container"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
diff --git a/res/layout/app_ops_item.xml b/res/layout/app_ops_item.xml
index 8d21456..adba9da 100644
--- a/res/layout/app_ops_item.xml
+++ b/res/layout/app_ops_item.xml
@@ -25,7 +25,7 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
-    android:columnCount="3">
+    android:columnCount="4">
 
     <ImageView
         android:id="@+id/app_icon"
@@ -47,6 +47,14 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textAlignment="viewStart" />
 
+    <Switch
+        android:id="@+id/op_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_rowSpan="2"
+        android:focusable="false"
+        android:clickable="false" />
+
     <TextView
         android:id="@+id/op_name"
         android:layout_width="0dip"
diff --git a/res/layout/background_check_summary.xml b/res/layout/background_check_summary.xml
new file mode 100644
index 0000000..ee47194
--- /dev/null
+++ b/res/layout/background_check_summary.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/appops_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+</LinearLayout>
diff --git a/res/layout/convert_fbe.xml b/res/layout/convert_fbe.xml
new file mode 100644
index 0000000..4a9d7c0
--- /dev/null
+++ b/res/layout/convert_fbe.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginBottom="12dp" >
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginTop="12dp"
+                android:textSize="18sp"
+                android:text="@string/convert_to_fbe_warning" />
+
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
+            <Button
+                    android:id="@+id/button_convert_fbe"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="12dp"
+                    android:text="@string/button_convert_fbe" />
+        </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index 0563fc0..ae5be68 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -14,24 +14,13 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dashboard"
+<android.support.v7.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dashboard_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scrollbarStyle="outsideOverlay"
-    android:clipToPadding="false">
-
-        <LinearLayout
-                android:id="@+id/dashboard_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:paddingStart="@dimen/dashboard_padding_start"
-                android:paddingEnd="@dimen/dashboard_padding_end"
-                android:paddingTop="@dimen/dashboard_padding_top"
-                android:paddingBottom="@dimen/dashboard_padding_bottom"
-                android:clipToPadding="false"
-                android:orientation="vertical"
-                />
-
-</ScrollView>
+    android:paddingStart="@dimen/dashboard_padding_start"
+    android:paddingEnd="@dimen/dashboard_padding_end"
+    android:paddingTop="@dimen/dashboard_padding_top"
+    android:paddingBottom="@dimen/dashboard_padding_bottom"
+    android:clipToPadding="false" />
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index bee063e..9109440 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -21,11 +21,16 @@
         android:paddingStart="@dimen/dashboard_category_padding_start"
         android:paddingEnd="@dimen/dashboard_category_padding_end"
         android:orientation="vertical"
+        android:paddingBottom="8dip"
         android:background="@color/card_background"
-        android:layout_marginBottom="8dip"
-        android:elevation="@dimen/dashboard_category_elevation">
+        android:elevation="@dimen/dashboard_category_elevation" >
 
-    <TextView android:id="@+id/category_title"
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider" />
+
+    <TextView android:id="@android:id/title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dashboard_category_title_height"
             android:paddingStart="@dimen/dashboard_category_title_margin_start"
@@ -36,10 +41,4 @@
             android:textAlignment="viewStart"
             />
 
-    <com.android.settings.dashboard.DashboardContainerView
-            android:id="@+id/category_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
-
 </LinearLayout>
diff --git a/res/layout/dashboard_spacer.xml b/res/layout/dashboard_spacer.xml
new file mode 100644
index 0000000..d7d9717
--- /dev/null
+++ b/res/layout/dashboard_spacer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="10dp" />
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index aa1d00e..cc237ee 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -19,10 +19,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:minHeight="@dimen/dashboard_tile_minimum_height">
+        android:minHeight="@dimen/dashboard_tile_minimum_height"
+        android:clickable="true"
+        android:background="@drawable/selectable_card"
+        android:elevation="@dimen/dashboard_category_elevation" >
 
     <ImageView
-            android:id="@+id/icon"
+            android:id="@android:id/icon"
             android:layout_width="@dimen/dashboard_tile_image_size"
             android:layout_height="@dimen/dashboard_tile_image_size"
             android:scaleType="centerInside"
@@ -45,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
 
-                <TextView android:id="@+id/title"
+                <TextView android:id="@android:id/title"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:singleLine="true"
@@ -53,10 +56,10 @@
                           android:ellipsize="marquee"
                           android:fadingEdge="horizontal" />
 
-                <TextView android:id="@+id/status"
+                <TextView android:id="@android:id/summary"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_below="@id/title"
+                          android:layout_below="@android:id/title"
                           android:layout_alignStart="@android:id/title"
                           android:textAppearance="@style/TextAppearance.Small"
                           android:textColor="?android:attr/textColorSecondary" />
@@ -65,11 +68,6 @@
 
         </LinearLayout>
 
-        <View android:id="@+id/tile_divider"
-              android:layout_width="match_parent"
-              android:layout_height="1dp"
-              android:background="?android:attr/dividerVertical" />
-
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
index 12158b9..57241c1 100644
--- a/res/layout/manage_accounts_screen.xml
+++ b/res/layout/manage_accounts_screen.xml
@@ -22,8 +22,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ListView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@android:id/list"
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/prefs_container"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
diff --git a/res/layout/preference_importance_slider.xml b/res/layout/preference_importance_slider.xml
new file mode 100644
index 0000000..737254b
--- /dev/null
+++ b/res/layout/preference_importance_slider.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:gravity="center_vertical"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:orientation="vertical"
+        android:clickable="false"
+        android:focusable="false"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip">
+
+        <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                android:textColor="?android:attr/textColorPrimary"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal" />
+
+        <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@android:id/title"
+                android:textAlignment="viewStart"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary"
+                android:maxLines="10"
+                android:minLines="2" />
+
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp">
+
+            <ImageView
+                    android:id="@+id/low_importance"
+                    android:src="@android:drawable/ic_menu_close_clear_cancel"
+                    android:layout_gravity="center_vertical|start"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp" />
+
+            <SeekBar
+                    android:id="@*android:id/seekbar"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginEnd="24dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"/>
+
+            <ImageView
+                    android:id="@+id/max_importance"
+                    android:src="@android:drawable/ic_popup_reminder"
+                    android:layout_gravity="center_vertical|end"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp" />
+
+        </FrameLayout>
+
+</LinearLayout>
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 7eb1511..99e764f 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -30,7 +30,7 @@
                  android:visibility="gone" />
 
          <FrameLayout
-                 android:id="@id/list_container"
+                 android:id="@android:id/list_container"
                  android:layout_height="0px"
                  android:layout_weight="1"
                  android:layout_width="match_parent">
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 878a710..d279eb6 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -20,7 +20,8 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:clickable="false" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/layout/preference_wallpaper_type b/res/layout/preference_wallpaper_type
new file mode 100644
index 0000000..48bfffd
--- /dev/null
+++ b/res/layout/preference_wallpaper_type
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:gravity="center_vertical"
+              android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
+
+    <ImageView
+            android:id="@+android:id/icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:scaleType="fitXY"
+            android:layout_marginEnd="16dip"
+            android:contentDescription="@null" />
+
+    <TextView android:id="@+android:id/title"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+              android:ellipsize="marquee"
+              android:fadingEdge="horizontal"
+              android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 22cd4d3..13ee460 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/sync_failed" />
 
-    <com.android.settings.widget.AnimatedImageView
+    <com.android.settingslib.widget.AnimatedImageView
         android:id="@+id/sync_active"
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
@@ -39,7 +39,7 @@
         android:contentDescription="@string/sync_active" />
 
     <Switch xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@*android:id/switchWidget"
+        android:id="@android:id/switch_widget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index a288224..16bf0f6 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -51,13 +51,13 @@
                 />
  
         <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ping_ipaddr" style="@style/info_label" />
-            <TextView android:id="@+id/pingIpAddr" style="@style/info_value" />
+            <TextView android:text="@string/radio_info_ping_hostname_v4" style="@style/info_label" />
+            <TextView android:id="@+id/pingHostnameV4" style="@style/info_value" />
         </LinearLayout>
 
         <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ping_hostname" style="@style/info_label" />
-            <TextView android:id="@+id/pingHostname" style="@style/info_value" />
+            <TextView android:text="@string/radio_info_ping_hostname_v6" style="@style/info_label" />
+            <TextView android:id="@+id/pingHostnameV6" style="@style/info_value" />
         </LinearLayout>
 
         <LinearLayout style="@style/entry_layout">
@@ -71,6 +71,14 @@
             <TextView android:id="@+id/dbm" style="@style/info_value" />
         </LinearLayout>
 
+        <!-- CellInfoListRate -->
+        <Button android:id="@+id/cell_info_list_rate"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
         <!-- Location -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_signal_location_label" style="@style/info_label" />
@@ -88,6 +96,8 @@
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_cellinfo_label"
                       style="@style/info_label" />
+        </LinearLayout>
+        <LinearLayout style="@style/entry_layout">
             <TextView android:id="@+id/cellinfo" style="@style/info_value" />
         </LinearLayout>
 
@@ -140,7 +150,6 @@
             <TextView android:id="@+id/call" style="@style/info_value" />
         </LinearLayout>
 
-
         <!-- Radio Resets -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_radio_resets_label" style="@style/info_label" />
@@ -210,15 +219,7 @@
                 android:layout_height="wrap_content"
                 />
 
-        <!-- CellInfoListRate -->
-        <Button android:id="@+id/cell_info_list_rate"
-                android:textSize="14sp"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-        <!-- IMS registration required -->
+       <!-- IMS registration required -->
         <Button android:id="@+id/ims_reg_required"
                 android:textSize="14sp"
                 android:layout_marginTop="8dip"
diff --git a/res/layout/see_all.xml b/res/layout/see_all.xml
new file mode 100644
index 0000000..fff4d07
--- /dev/null
+++ b/res/layout/see_all.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/dashboard_tile_minimum_height"
+        android:clickable="true"
+        android:background="@drawable/selectable_card"
+        android:elevation="@dimen/dashboard_category_elevation">
+
+    <View
+            android:layout_width="@dimen/dashboard_tile_image_size"
+            android:layout_height="@dimen/dashboard_tile_image_size"
+            android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+            android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+            android:visibility="invisible" />
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:orientation="vertical"
+            android:gravity="center_vertical"
+            android:layout_weight="1">
+
+            <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                <TextView android:id="@android:id/title"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:singleLine="true"
+                          android:textAppearance="@android:style/TextAppearance.Material.Widget.Button.Inverse"
+                          android:textColor="?android:attr/colorAccent"
+                          android:ellipsize="marquee"
+                          android:fadingEdge="horizontal" />
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_card.xml b/res/layout/suw_no_scroll_template_card.xml
new file mode 100644
index 0000000..3cdec90
--- /dev/null
+++ b/res/layout/suw_no_scroll_template_card.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+
+<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
+     RecyclerView. For other layouts that should be put inside a ScrollView, consider using
+     suw_template instead. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.setupwizardlib.view.Illustration
+        android:id="@+id/suw_layout_decor"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@drawable/suw_layout_background">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/suw_card_port_margin_sides"
+            android:paddingRight="@dimen/suw_card_port_margin_sides">
+
+            <TextView
+                android:id="@+id/suw_layout_title"
+                style="@style/SuwCardTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="?attr/suwCardBackground"
+                android:elevation="@dimen/suw_card_elevation"
+                tools:ignore="UnusedAttribute">
+
+                <FrameLayout
+                    android:id="@+id/suw_layout_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <!-- Temporary solution to work with PreferenceFragment v14 -->
+                    <FrameLayout android:id="@android:id/list_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                </FrameLayout>
+
+                <include layout="@layout/suw_progress_bar_stub" />
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+    </com.android.setupwizardlib.view.Illustration>
+
+    <com.android.setupwizardlib.view.NavigationBar
+        android:id="@+id/suw_layout_navigation_bar"
+        style="@style/SuwNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/suw_navbar_height" />
+
+</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_card_wide.xml b/res/layout/suw_no_scroll_template_card_wide.xml
new file mode 100644
index 0000000..73b9008
--- /dev/null
+++ b/res/layout/suw_no_scroll_template_card_wide.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+
+<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
+     RecyclerView. For other layouts that should be put inside a ScrollView, consider using
+     suw_template instead. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.setupwizardlib.view.Illustration
+        android:id="@+id/suw_layout_decor"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@drawable/suw_layout_background">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="start|top"
+            android:weightSum="16">
+
+            <TextView
+                android:id="@+id/suw_layout_title"
+                style="@style/SuwCardTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/suw_card_land_header_text_margin_top"
+                android:layout_weight="6" />
+
+            <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="8"
+                android:background="?attr/suwCardBackground"
+                android:elevation="@dimen/suw_card_elevation"
+                tools:ignore="UnusedAttribute">
+
+                <FrameLayout
+                    android:id="@+id/suw_layout_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <!-- Temporary solution to work with PreferenceFragment v14 -->
+                    <FrameLayout android:id="@android:id/list_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                </FrameLayout>
+
+                <include layout="@layout/suw_progress_bar_stub" />
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+    </com.android.setupwizardlib.view.Illustration>
+
+    <com.android.setupwizardlib.view.NavigationBar
+        android:id="@+id/suw_layout_navigation_bar"
+        style="@style/SuwNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/suw_navbar_height" />
+
+</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_header.xml b/res/layout/suw_no_scroll_template_header.xml
new file mode 100644
index 0000000..0291e55
--- /dev/null
+++ b/res/layout/suw_no_scroll_template_header.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+
+<!-- IMPORTANT NOTE: Even if this layout is used with a view that handles its scroll internally,
+     like WebView or RecyclerView, the illustration will not scroll away, since this view doesn't
+     know about the scrolling view at all. It is recommended that you add the illustration as a
+     header to the RecyclerView or avoid using this layout (e.g. use suw_no_scroll_template_short
+     instead of suw_no_scroll_template) -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <com.android.setupwizardlib.view.Illustration
+            android:id="@+id/suw_layout_decor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/suw_layout_background"
+            android:elevation="@dimen/suw_title_area_elevation"
+            android:tag="stickyContainer"
+            tools:ignore="UnusedAttribute">
+
+            <TextView
+                android:id="@+id/suw_layout_title"
+                style="@style/SuwHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:tag="sticky" />
+
+        </com.android.setupwizardlib.view.Illustration>
+
+        <include layout="@layout/suw_progress_bar_stub" />
+
+        <FrameLayout
+            android:id="@+id/suw_layout_content"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <!-- Temporary solution to work with PreferenceFragment v14 -->
+            <FrameLayout android:id="@android:id/list_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <com.android.setupwizardlib.view.NavigationBar
+        android:id="@+id/suw_layout_navigation_bar"
+        style="@style/SuwNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/suw_navbar_height" />
+
+</LinearLayout>
diff --git a/res/layout/suw_no_scroll_template_header_collapsed.xml b/res/layout/suw_no_scroll_template_header_collapsed.xml
new file mode 100644
index 0000000..7eff625
--- /dev/null
+++ b/res/layout/suw_no_scroll_template_header_collapsed.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+
+<!-- This layout file is intended for use with views that handle its own scrolling, like WebView or
+     RecyclerView. For other layouts that should be put inside a ScrollView, consider using
+     suw_template instead. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/suw_layout_decor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/suw_layout_background"
+        android:elevation="@dimen/suw_title_area_elevation"
+        tools:ignore="UnusedAttribute">
+
+        <TextView
+            android:id="@+id/suw_layout_title"
+            style="@style/SuwHeaderTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </FrameLayout>
+
+    <include layout="@layout/suw_progress_bar_stub" />
+
+    <FrameLayout android:id="@+id/suw_layout_content"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <!-- Temporary solution to work with PreferenceFragment v14 -->
+        <FrameLayout android:id="@android:id/list_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
+    <com.android.setupwizardlib.view.NavigationBar
+        android:id="@+id/suw_layout_navigation_bar"
+        style="@style/SuwNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/suw_navbar_height" />
+
+</LinearLayout>
diff --git a/res/layout/user_preference.xml b/res/layout/user_preference.xml
deleted file mode 100644
index 8e81fec..0000000
--- a/res/layout/user_preference.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@android:id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/user_spinner_item_height"
-        android:paddingStart="@dimen/user_spinner_padding_sides"
-        android:paddingEnd="@dimen/user_spinner_padding_sides"
-        android:orientation="horizontal" >
-
-    <ImageView
-            android:id="@+android:id/icon"
-            android:layout_width="@dimen/user_icon_view_height"
-            android:layout_height="@dimen/user_icon_view_height"
-            android:layout_gravity="center"
-            android:scaleType="fitCenter"
-            android:paddingBottom="@dimen/user_spinner_padding"
-            android:paddingTop="@dimen/user_spinner_padding" />
-
-    <TextView
-            android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_gravity="center"
-            android:labelFor="@+android:id/icon"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:paddingStart="@dimen/user_spinner_padding"
-            android:paddingEnd="@dimen/user_spinner_padding"
-            style="@style/TextAppearance.Medium" />
-
-</LinearLayout>
diff --git a/res/layout/wifi_status_test.xml b/res/layout/wifi_status_test.xml
index 2bdfbfc..aac3207 100644
--- a/res/layout/wifi_status_test.xml
+++ b/res/layout/wifi_status_test.xml
@@ -111,11 +111,6 @@
                 />
 
         <LinearLayout style="@style/entry_layout">
-            <TextView android:text="@string/radio_info_ping_ipaddr" style="@style/info_label" />
-            <TextView android:id="@+id/pingIpAddr" style="@style/info_value" />
-        </LinearLayout>
-
-        <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_ping_hostname" style="@style/info_label" />
             <TextView android:id="@+id/pingHostname" style="@style/info_value" />
         </LinearLayout>
diff --git a/res/menu/zen_settings_menu.xml b/res/menu/zen_settings_menu.xml
new file mode 100644
index 0000000..ff28403
--- /dev/null
+++ b/res/menu/zen_settings_menu.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/zen_access"
+        android:title="@string/manage_zen_access_title"
+        android:showAsAction="never" />
+</menu>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 782203c..76d10a4 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Groot"</item>
     <item msgid="7786168277516233536">"Baie groot"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Baie stadig"</item>
-    <item msgid="2361722960903353554">"Stadig"</item>
-    <item msgid="1145554631248513562">"Normaal"</item>
-    <item msgid="7553665153391107454">"Vinnig"</item>
-    <item msgid="1370673569131070146">"Vinniger"</item>
-    <item msgid="4648206845228970803">"Baie vinnig"</item>
-    <item msgid="4977949754169483251">"Vinnig"</item>
-    <item msgid="6106302964845503577">"Baie vinnig"</item>
-    <item msgid="6800277205640837264">"Vinnigste"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Baie laag"</item>
-    <item msgid="2692137425242433765">"Laag"</item>
-    <item msgid="3332408460740717754">"Normaal"</item>
-    <item msgid="4907380534957572531">"Hoog"</item>
-    <item msgid="4699640516390840297">"Baie hoog"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skandeer tans…"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7e62530..0411030 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wagwoorde"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Gedeaktiveer deur administrateur"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Bestuur vingerafdrukke"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gebruik vingerafdruk vir"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Moenie klank speel as tablet op dok geplaas of afgehaal word nie"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Moenie klank speel wanneer foon in dok gesit of uitgehaal word nie"</string>
     <string name="account_settings" msgid="6403589284618783461">"Rekeninge"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persoonlik"</string>
-    <string name="category_work" msgid="8699184680584175622">"Werk"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Werkprofielrekeninge – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Persoonlikeprofielrekeninge"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Werkrekening – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Gedeaktiveer"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Altyd aan"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Outomaties"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Skakel om na lêerenkripsie"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Skakel om …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Lêerenkripsie is reeds uitgevoer"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Skakel tans na lêer-gebaseerde enkripsie om"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Skakel dataverdeling om in lêer-gebaseerde enkripsie.\n !!Waarskuwing!! Dit sal al jou data uitvee.\n Hierdie kenmerk is alfa en sal dalk nie reg werk nie.\n Druk \'Maak skoon en skakel om …\' om voort te gaan."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Maak skoon en skakel om …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Instellings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Druk"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Drukdienste"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Jou dokument kan dalk deur een of meer bedieners op pad na die drukker gaan."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen dienste geïnstalleer nie"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Geen drukkers gekry nie"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellings"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Volle aktiveerwoord en interaksie"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Eenvoudige spraak na teks"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Hierdie steminvoerdiens sal altyd-aan-stemmonitering kan verrig en stemgeaktiveerde programme namens jou kan beheer. Dit kom van die <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>-program af. Wil jy die gebruik van hierdie diens aktiveer?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Teks-na-spraak-instellings"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Teks-na-spraak-uitset"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Gebruik altyd my instellings"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Verstekinstellings hieronder oorheers programinstellings"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Verstek instellings"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Verstekenjin"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Stel die spraaksintese-enjin om vir gesproke teks gebruik te word"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Spraaktempo"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Spoed waarteen die teks gepraat word"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affekteer die klank van die gesproke teks"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gebruik stelseltaal"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal nie gekies nie"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Stel die taalspesifieke stem vir gesproke teks"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Luister na \'n voorbeeld"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Speel \'n kort demonstrasie van spraaksintese"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installeer stemdata"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installeer die stemdata vereis vir spraaksintese"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Stemme vereis vir spraaksintese is reeds behoorlik geïnstalleer"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Jou instellings het verander. Hierdie is \'n voorbeeld van hoe dit klink."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Die enjin wat jy gekies het, werk nie."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Stel op"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Kies \'n ander enjin"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hierdie spraaksintese-enjin kan dalk al die teks versamel wat uitgespreek sal word, insluitend persoonlike data soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> enjin. Aktiveer die gebruik van hierdie spraaksintese-enjin?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Hierdie taal vereis \'n werkende netwerkverbinding vir teks-na-spraak-uitvoer."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dit is \'n voorbeeld van spraaksintese"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Verstek taalstatus"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> word ten volle ondersteun"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> vereis netwerkverbinding"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> word nie ondersteun nie"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Kontroleer tans…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Enjins"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> instellings"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is geaktiveer"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is gedeaktiveer"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Enjin-instellings"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Instellings vir <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Taal en stemme"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Geïnstalleer"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nie geïnstalleer nie"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Vroulik"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Manlik"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Spraaksintese-enjin geïnstalleer"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktiveer nuwe enjin voor gebruik."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lanseer enjin-instellings"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Voorkeur-enjin"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Algemeen"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kragbeheer"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Dateer Wi-Fi-instelling op"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Werk Bluetooth-instelling by"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Wys Program reageer nie-dialoog vir agtergrond programme"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Programme verplig ekstern toegelaat"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Laat enige program na ekstern geskryf word, ongeag manifeswaardes"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Verplig verstelbare groottes vir aktiwiteite"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Maak grootte van alle aktiwiteite verstelbaar vir veelvuldige vensters, ongeag manifeswaardes."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programdatagebruik"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Net wekkers"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Volkome stilte"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuele onderbrekings"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Verstekkennisgewingluitoon"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreer ook vir oproepe"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hoe wil jy hê moet kennisgewings wys wanneer jou toestel gesluit is?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Kennisgewings"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Onderwerpkennisgewings"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Ander klanke"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Belbladtone"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Skermsluitklanke"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Moet nooit kennisgewings van hierdie program af wys nie"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandel as prioriteit"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Laat hierdie program se kennisgewings gehoor word wanneer Moenie steur nie na Net prioriteit gestel is"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Laat loer toe"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Laat hierdie program sekere kennisgewings beklemtoon deur hulle vir \'n kort tyd op die huidige skerm te wys"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie steur nie"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie steur nie na \'Net prioriteit\' gestel is"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Versteek sensitiewe inhoud"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Wanneer die toestel gesluit is, versteek inhoud in hierdie program se kennisgewings wat private inligting kan onthul."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Versteek inhoud in hierdie kennisgewings wat private inligting kan onthul wanneer die toestel gesluit is."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeer"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitief"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Verander tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> na net wekkers"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Verander na onderbreek altyd"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Geen skermonderbrekings nie"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, op die huidige skerm opspring of verskyn"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Geen kennisgewinglig"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, die lig laat flikker"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vra PIN voordat jy ontspeld"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vra wagwoord voordat jy ontspeld"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Sluit toestel terwyl jy ontspeld"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hierdie werkprofiel word bestuur deur:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Bestuur deur <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimenteel)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Kennisgewings"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normaal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokkeer"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Sensitiewe inhoud is versteek"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteit"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Mag nie loer nie"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlik"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Geblokkeer"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteit"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Sensitiewe inhoud is versteek"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Mag nie loer nie"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'e"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Gedeaktiveer deur administrateur"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Stel programme op"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Kies profiel"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Programtoestemmings"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme mag bykomende toegang hê"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme toegelaat"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Fotokleurmodus"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gebruik sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Vertoonskaal"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"vertoon digtheid zoem skaal skalering"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Klein"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normaal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Groot"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Groter"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Grootste"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Gepasmaak (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Sien alles"</string>
+    <string name="see_less" msgid="1250265310929558370">"Sien minder"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Ontkoppel"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> van die data is gebruik"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> programme is geïnstalleer"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> van <xliff:g id="SIZE2">%2$s</xliff:g> gebruik"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Aanpasbare helderheid is AAN"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Aanpasbare helderheid is AF"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index b38e1e4..261588a 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ትልቅ"</item>
     <item msgid="7786168277516233536">"ግዙፍ"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"በጣም ቀርፋፋ"</item>
-    <item msgid="2361722960903353554">"አዘግይ"</item>
-    <item msgid="1145554631248513562">"መደበኛ"</item>
-    <item msgid="7553665153391107454">"ፈጣን"</item>
-    <item msgid="1370673569131070146">"የፈጠነ"</item>
-    <item msgid="4648206845228970803">"በጣም ፈጣን"</item>
-    <item msgid="4977949754169483251">"ፈጣን"</item>
-    <item msgid="6106302964845503577">"በጣም ፈጣን"</item>
-    <item msgid="6800277205640837264">"እጅግ በጣም ፈጣን"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"በጣም ዝቅተኛ"</item>
-    <item msgid="2692137425242433765">"ዝቅ ያለ"</item>
-    <item msgid="3332408460740717754">"መደበኛ"</item>
-    <item msgid="4907380534957572531">"ከፍ ያለ"</item>
-    <item msgid="4699640516390840297">"በጣም ከፍተኛ"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"በመቃኘት ላይ....."</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ef73ec7..2ec1986 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"የይለፍ ቃሎች"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"በአስተዳዳሪ የተሰናከለ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"የጣት አሻራ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"የጣት አሻራዎችን ያስተዳድሩ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"የጣት አሻራን ይጠቀሙ ለ"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ከትከል ጡባዊ ስትከት ወይም ስታስወግድ ድምፅ አታጫውት"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
     <string name="account_settings" msgid="6403589284618783461">"መለያዎች"</string>
-    <string name="category_personal" msgid="1299663247844969448">"የግል"</string>
-    <string name="category_work" msgid="8699184680584175622">"ስራ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"የስራ መገለጫ መለያዎች - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"የግል መገለጫ መለያዎች"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"የስራ መለያ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ተሰናክሏል"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ሁልጊዜ ይበራል"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ራስ-ሰር"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ወደ ፋይል ምሥጠራ ቀይር"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ለውጥ…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ፋይል አስቀድሞ ተመስጥሯል"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ወደ በፋይል ላይ የተመሠረተ ምስጠራን በመለወጥ ላይ"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"የውሂብ ክፍፍልን ወደ በፋይል ላይ የተመሠረተ ምሥጠራ ይቀይሩ።\n !!ማስጠንቀቂያ!! ይሄ ሁሉንም ውሂብዎን ይደመስሳል።\n ይህ ባህሪ አልፋ ላይ ነው፣ እና በትክክል ላይሠራ ይችላል።\n ለመቀጠል «ይጥረጉ እና ይለውጡ...» የሚለውን ይጫኑ።"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ይጥረጉ እና ይለውጡ…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"አንቀላፋ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ማያ ገጽ የሚጠፋው"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ቅንብሮች"</string>
     <string name="print_settings" msgid="4742428530112487843">"ማተም"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"የህትመት አገልግሎቶች"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ሰነድዎ ወደ አታሚው በሚሄድበት ወቅት በአንድ ወይም ከዚያ በላይ አገልጋዮች ውስጥ ሊያልፍ ይችላል።"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ምንም አታሚዎች አልተገኙም"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ቅንብሮች"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"ሙሉ ትኩስ ቃል እና መስተጋብር"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ቀላል ንግግር ወደ ጽሑፍ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ይህ የድምጽ ግቤት አገልግሎት እርስዎን ወክሎ ሁልጊዜ የሚበራ የድምጽ ክትትልን እና በድምጽ የሚነቁ መተግበሪያዎችን መቆጣጠር ይችላል። ከ<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> መተግበሪያ ነው የመጣው። የዚህን አገልግሎት መጠቀም ያነቁ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ፅሁፍ-ወደ-ንግግር ቅንብሮች"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"የፅሁፍ- ወደ- ንግግር ውፅዓት"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ሁልጊዜም የእኔን ቅንብሮች ተጠቀም"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ከስር ያሉ ነባሪ ቅንብሮች የመተግበሪያ  ቅንብሮችን ያግዳሉ"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ነባሪ ቅንብሮች"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ነባሪ አንቀሳቃሽ"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"የንግግር አስተጻምሮ ፕሮግራሙ ለሚነገር ጽሑፍ ጥቅም ላይ እንዲውል ያዋቅሩት"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">" የንግግር ደረጃ"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"የተነገረበትን ፅሁፍ አፍጥን"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"የሚነገረው ፅሁፍ ድምፅ ላይ ተፅዕኖ ያሳድራል"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ቋንቋ"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"የስርዓት ቋንቋ ተጠቀም"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ቋንቋ አልተመረጠም"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ለሚነገረው ፅሁፍ ቋንቋ-ተኮር ድምፅ አዘጋጅ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ምሳሌውን አዳምጥ"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"አጭር የንግግር ልምምድ ማሳያ አጫውት"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"የድምፅ ውሂብ ጫን"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ለንግግር ልምምድ የሚጠየቀውን የድምፅ ውሂብ ጫን"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ለንግግር ልምምድ የሚጠየቁ ድምፆች አስቀድመው በአግባቡ ተጭነዋል"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ቅንብሮችዎ ተለውጠዋል።ይህ ምን ድምፅ እንደሚያወጡ ምሳሌ ነው።"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"የመረጥከው አንቀሳቃሽ አይሄድም።"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"አዋቅር"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ሌላ አንቀሳቃሽ ምረጥ"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ይህ የንግግር ልምምድ አንቀሳቃሽ የሚነገረውን ፅሁፍ ሁሉ  እንደ ይለፍ ቃል እና የዱቤ ካርድ ቁጥሮች፣ የግል ውሂብ ጨምሮ ለመሰብሰብ ይችል ይሆናል።  ከ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> አንቀሳቃሽ ይመጣል። የዚህን የንግግር ልምምድ አንቀሳቃሽ አጠቃቀም ይንቃ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ይህ ቋንቋ የጽሑፍ-ወደ-ንግግር ውጽዓት እንዲኖረው የሚሰራ የአውታረ መረብ ግንኙነት ያስፈልገዋል።"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ይህ የተሰራ ንግግር ምሳሌ ነው"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"የነባሪ ቋንቋ ሁኔታ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> ሙሉ ለሙሉ ይደገፋል"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> የአውታረ መረብ ግንኙነት ያስፈልጋል"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> አይደገፍም"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"በማረጋገጥ ላይ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"አንቀሳቃሾች"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ቅንብሮች"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ተችሏል"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ቦዝኗል"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"የአንቀሳቃሽ ቅንብሮች"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"የ<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> ቅንብሮች"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ቋንቋዎች እና ድምፆች"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ተጭኗል"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"አልተጫነም"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ሴት"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ወንድ"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"የንግግር ልምምድ አንቀሳቃሽ ተጭኗል"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"አዲስ አንቀሳቃሽ ከመጠቀምህ በፊት አንቃ።"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"የፍርግም ቅንብሮችን ያስጀምሩ"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"የተመረጠ ፍርግም"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"አጠቃላይ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"የኃይል መቆጣጠሪያ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"የWi-Fi ቅንብርን በማዘመን ላይ"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"የብሉቱዝቅንብር ማዘመን"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ለዳራ መተግበሪያዎች ምላሽ የማይሰጥ መገናኛ ትግበራ አሳይ"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"በውጫዊ ላይ ሃይል ይፈቀዳል"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"አንጸባራቂ እሴቶች ግምት ውስጥ ሳይገቡ ማንኛውም መተግበሪያ ወደ ውጫዊ ማከማቻ ለመጻፍ ብቁ ያደርጋል።"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"እንቅስቃሴዎች ዳግመኛ እንዲመጣጠኑ አስገድድ"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"የዝርዝር ሰነድ እሴቶች ምንም ይሁኑ ምን ለበርካታ መስኮቶች ሁሉንም እንቅስቃሴዎች ዳግም የሚመጣጠኑ እንዲሆኑ ያደርጋቸዋል።"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"የውሂብ አጠቃቀም"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"የአገልግሎት አቅራቢ ውሂብ አቆጣጠር ከየመሣሪያዎ ሊለይ ይችላል።"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ማንቂያዎች ብቻ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ሙሉ ለሙሉ ጸጥታ"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>፦ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"የሚታዩ መቆራረጦች"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ነባሪ የማሳወቂያ ጥሪ ቅላጼ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"እንዲሁም ለጥሪዎችም ንዘር"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"መሳሪያዎ የተቆለፈ ሲሆን ማሳወቂያዎችዎ እንዴት እንዲታዩ ይፈልጋሉ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ማሳወቂያዎች"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"የርዕሰ ጉዳይ ማሳወቂያዎች"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ሌሎች ድምጾች"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"የመደወያ ሰሌዳ ድምጾች"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"የማያ ገጾ መቆለፍ ድምጾች"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ከዚህ መተግበሪያዎች ማሳወቂያዎችን በፍጹም አታሳይ"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"እንደ ቅድሚያ ተሰጪ አስተናግድ"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"አትረብሽ የሚለው ወደ ቅድሚያ የሚሰጠው ብቻ በሚዋቀርበት ጊዜ የዚህ መተግበሪያ ማሳወቂያዎች እንዲሰሙ ይፍቀዱ"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ለቀማን ይፍቀዱ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ይህ መተግበሪያ የተወሰኑ ማሳወቂያዎችን ወደ ዕይታ ለአፍታ በማንሸራተት አሁን ባለው ማያ ገጽ ላይ አጽዕኖት እንዲሰጥባቸው ይፍቀዱ"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"«አትረብሽ»ን ሻር"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"«አትረብሽ» ወደ ቅድሚያ ብቻ በሚቀናበርበት ጊዜ እነዚህ ማሳወቂያዎች እንዲያቋርጡ ይፍቀዱ"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"አደጋ ሊያስከትል የሚችል ይዘትን ደብቅ"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"መሳሪያው በሚቆለፍበት ጊዜ፣ የግል መረጃን ገልጠው ሊያሳዩ የሚችሉ ማሳወቂያዎችን ይዘት ከዚህ መተግብሪያ ላይ ደብቅ"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"መሣሪያው በሚቆለፍበት ጊዜ በእነዚህ ማሳወቂያዎች ውስጥ ያለ የግል መረጃን ሊገልጥ የሚችል ይዘት ደብቅ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ታግዷል"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ቅድሚያ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ሚስጥራዊነት ያለው"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"እስከ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ድረስ ብቻ ወደ ማንቂያዎች ይቀይሩ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ወደ ሁልጊዜ አቋርጥ ለውጥ"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ምንም የማያ ገጽ መቆራረጦች የሉም"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"በአትረብሽ ዝም እንዲሉ የተደረጉ ማሳወቂያዎች አሁን ባለው ማያ ገጽ ላይ ጥልቅ ወይም ብቅ እንዳይሉ ተከላከል"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"ምንም ማሳወቂያ ብርሃን የለም"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"በአትረብሽ ዝም እንዲሉ የተደረጉ ማሳወቂያዎች ብርሃኑ እንዲርገበገብ እንዳያደርጉ ተከላከል"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ከመንቀል በፊት ፒን ጠይቅ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ከመንቀል በፊት የይለፍ ቃል ጠይቅ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ሲነቀል መሣሪያ ቆልፍ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"የስራ መገለጫ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ይህ የስራ መገለጫ የሚቀናበረው በ፦"</string>
     <string name="managing_admin" msgid="8843802210377459055">"በ<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> የሚቀናበር"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(የሙከራ)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"ማሳወቂያዎች"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"መደበኛ"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"አግድ"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"ሚስጥራዊነት ያለው ይዘት ተደብቋል"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ቅድሚያ የሚሰጠው"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"ምንም አጮልቆ ማየት የለም"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"የግል"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ስራ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"የታገዱ"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ቅድሚያ የሚሰጣቸው"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"ሚስጥራዊነት ያለው ይዘት ተደብቋል"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"ምንም አጮልቆ ማየት የለም"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ከጎራ ዩአርኤሎች ጋር"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"በአስተዳዳሪ የተሰናከለ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"መተግበሪያዎች ያዋቅሩ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"መገለጫ ይምረጡ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"የመተግበሪያ ፈቃዶች"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ተጨማሪ መዳረሻ ይፈቅዳሉ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ይፈቀዳል"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"የስዕል ቀለም ሁነታ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ይጠቀሙ"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ልኬትን አሳይ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"የእምቅነት አጉላ/አሳንስ ልኬት ማመጣጠንን አሳይ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ትንሽ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"መደበኛ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ትልቅ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ተለቅ ያለ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"በጣም ተለቅ ያለ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ብጁ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"ሁሉንም ይመልከቱ"</string>
+    <string name="see_less" msgid="1250265310929558370">"ያነሰ ይመልከቱ"</string>
+    <string name="disconnected" msgid="5787956818111197212">"ግንኙነት ተቋርጧል"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ከውሂብ ጥቅም ላይ ውሏል"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ተጭነዋል"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> ከ <xliff:g id="SIZE2">%2$s</xliff:g> ጥቅም ላይ ውሏል"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"አመጣጣኝ ብሩህነት በርቷል"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"አመጣጣኝ ብሩህነት ጠፍቷል"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 45677d0..1eebe52 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"كبير"</item>
     <item msgid="7786168277516233536">"ضخم"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"بطيء للغاية"</item>
-    <item msgid="2361722960903353554">"بطيء"</item>
-    <item msgid="1145554631248513562">"عادي"</item>
-    <item msgid="7553665153391107454">"سريع"</item>
-    <item msgid="1370673569131070146">"أسرع"</item>
-    <item msgid="4648206845228970803">"سريع جدًا"</item>
-    <item msgid="4977949754169483251">"سريع"</item>
-    <item msgid="6106302964845503577">"سريع جدًا"</item>
-    <item msgid="6800277205640837264">"الأسرع"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"منخفضة جدًا"</item>
-    <item msgid="2692137425242433765">"منخفضة"</item>
-    <item msgid="3332408460740717754">"عادي"</item>
-    <item msgid="4907380534957572531">"مرتفعة"</item>
-    <item msgid="4699640516390840297">"عالية جدًا"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"جارٍ الفحص..."</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b9e0ea8..e4e30bd 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -317,6 +317,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"معطّل بواسطة المشرف"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"بصمة الإصبع"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"إدارة بصمات الإصبع"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"استخدام بصمة الإصبع في"</string>
@@ -843,8 +844,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"عدم تشغيل صوت أثناء إدراج الجهاز اللوحي أو إزالته من المرسى"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"عدم تشغيل صوت عند إدراج أو إزالة الهاتف من الإرساء"</string>
     <string name="account_settings" msgid="6403589284618783461">"الحسابات"</string>
-    <string name="category_personal" msgid="1299663247844969448">"شخصي"</string>
-    <string name="category_work" msgid="8699184680584175622">"العمل"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"حسابات الملفات الشخصية للعمل - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"حسابات الملفات الشخصية"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"حساب العمل - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -867,6 +866,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"معطَّل"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"التشغيل دائمًا"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"تلقائيًا"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"التحويل إلى تشفير ملفات"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"تحويل…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"تم استخدام تشفير ملفات من قبل"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"التحويل إلى تشفير على الملف"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"تحويل قسم البيانات إلى تشفير على الملف.\n !!تحذير!! سيؤدي هذا إلى محو جميع بياناتك.\n لا تزال هذه الميزة في مرحلة ألفا، وقد لا تعمل على نحو سليم.\n للمتابعة، اضغط على \"مسح وتحويل…\"."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"مسح وتحويل…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"السكون"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"إيقاف الشاشة"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -1753,8 +1758,6 @@
     <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</string>
     <string name="print_settings" msgid="4742428530112487843">"الطباعة"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"خدمات الطباعة"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"قد يمر المستند خلال خادم أو أكثر بينما هو في طريقه إلى الطابعة."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"لم يتم تثبيت أية خدمات"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"لم يتم العثور على طابعات"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"الإعدادات"</string>
@@ -1935,54 +1938,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"كلمات مهمة وتفاعل كامل"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"تحويل النص إلى كلام ببساطة"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"سيكون بمقدور خدمة الإدخال الصوتي هذه أداء مراقبة صوتية دائمة، علاوة على التحكم في التطبيقات الممكن بها ميزة الصوت نيابة عنك. وتتبع هذه الخدمة تطبيق <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. هل ترغب في تمكين استخدام هذه الخدمة؟"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"إعدادات تحويل النص إلى كلام"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"إخراج تحويل النص إلى كلام"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"استخدام إعداداتي دائمًا"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"تتجاوز الإعدادات الافتراضية التالية إعدادات التطبيق"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"الإعدادات الافتراضية"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"المحرك الافتراضي"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"عيِّن محرك تركيب الصوت على الاستخدام مع النصوص المنطوقة"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"معدل سرعة الكلام"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"سرعة نطق الكلام"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"درجة الصوت"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"يؤثر في نبرة النص المنطوق"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"اللغة"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"استخدام لغة النظام"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"اللغة غير محددة"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"تعيين الصوت الخاص بلغة النص المنطوق"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"الاستماع إلى مثال"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"تشغيل عرض توضيحي قصير لتجميع الكلام"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"تثبيت البيانات الصوتية"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"تثبيت البيانات الصوتية المطلوبة لتجميع الكلام"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"الأصوات المطلوبة لتجميع الكلام مثبتة فعليًا وبشكل صحيح"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"تم تغيير إعداداتك. هذا مثال على الكيفية التي تبدو عليها."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"لا يمكن تشغيل المحرك الذي اخترته."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"تهيئة"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"اختيار محرك آخر"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ربما يمكن لمحرك اصطناع الحديث جمع كل النص التي سيتم نطقه، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقة الائتمان. يتم إحضار ذلك من المحرك <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. هل تريد تمكين استخدام محرك اصطناع الحديث هذا؟"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"تتطلب هذه اللغة اتصال شبكة سليمًا لتحويل النص إلى كلام."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"هذا مثال لتركيب الكلام"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"حالة اللغة الافتراضية"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> متوافقة تمامًا"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> تتطلب اتصالاً بالشبكة"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> غير متوافقة"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"جارٍ التحقق..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"المحركات"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"إعدادات <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"تم تمكين <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> معطّل"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"إعدادات المحرك"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"إعدادات <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"اللغات والأصوات"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"مثبت"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"غير مثبت"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"أنثى"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ذكر"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"تم تثبيت محرك اصطناع الحديث"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"تمكين محرك جديد قبل الاستخدام."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"تشغيل إعدادات المحرك"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"المحرك المفضل"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"عامة"</string>
     <string name="gadget_title" msgid="5519037532720577836">"التحكم في الطاقة"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"‏تحديث إعداد Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"تحديث إعداد البلوتوث"</string>
@@ -2223,10 +2178,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"عرض مربع الحوار \"التطبيق لا يستجيب\" مع تطبيقات الخلفية"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"فرض السماح للتطبيقات على الخارجي"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"تأهيل أي تطبيق بحيث تتم كتابته على سعة تخزين خارجية، بغض النظر عن قيم البيان"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"فرض إمكانية تغيير على الأنشطة"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"لتمكين تغيير حجم جميع الأنشطة لتناسب تعدد النوافذ، بغض النظر عن قيم البيان."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"استخدام البيانات"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"استخدام بيانات التطبيق"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"قد تختلف طريقة حساب بيانات مشغل شبكة الجوّال عن طريقة الحساب على جهازك."</string>
@@ -2618,6 +2571,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"التنبيهات فقط"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"كتم الصوت تمامًا"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"الإشعارات المرئية"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"نغمة رنين الإشعارات الافتراضية"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"الاهتزاز أيضًا مع المكالمات"</string>
@@ -2631,6 +2585,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ما الطريقة التي تريد عرض الإشعارات بها عندما يكون الجهاز مقفولاً؟"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"الإشعارات"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"إشعارات الموضوع"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"أصوات أخرى"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"نغمات لوحة الاتصال"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"أصوات قفل الشاشة"</string>
@@ -2662,12 +2617,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"حظر الكل"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"عدم عرض إشعارات من هذا التطبيق"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"معاملة كأولوية"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"السماح بسماع صوت إشعارات هذا التطبيق عند تعيين \"الرجاء عدم الإزعاج\" على \"الألوية\" فقط."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"السماح بالظهور الخاطف"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"السماح لهذا التطبيق بالتشديد على إشعارات معينة من خلال عرضها لفترة وجيزة على الشاشة الحالية."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"إلغاء وضع \"الرجاء عدم الإزعاج\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"السماح لهذه الإشعارات بمتابعة المقاطعة عند تعيين وضع \"الرجاء عدم الإزعاج\" على \"ذات الأولوية فقط\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"إخفاء المحتوى الحساس"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"إخفاء أي محتوى قد يكشف معلومات خاصة في إشعارات هذا التطبيق عند قفل الجهاز."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"عند تأمين الجهاز، ينبغي إخفاء المحتوى في هذه الإشعارات الذي يمكن أن يكشف معلومات خاصة"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"محظور"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"الأولوية"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
@@ -2746,6 +2699,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"التغيير إلى التنبيهات فقط حتى <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغيير إلى المقاطعة دائمًا"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"تعطيل إشعارات الشاشة"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"منع الإشعارات التي يتم تجاهلها باستخدام إعداد \"الرجاء عدم الإزعاج\" من الظهور بشكل موجز أو بالكامل على الشاشة الحالية"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"تعطيل مصباح الإشعار"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"منع الإشعارات التي يتم تجاهلها باستخدام إعداد \"الرجاء عدم الإزعاج\" من إحداث وميض للمصباح"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
@@ -2758,7 +2715,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"مطالبة برقم تعريف قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"المطالبة بكلمة المرور قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل الجهاز عند إزالة التثبيت"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"الملف الشخصي للعمل"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"تتم إدارة الملف الشخصي للعمل هذا بواسطة:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"يديرها <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجريبي)"</string>
@@ -2811,9 +2767,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"الإشعارات"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"عادية"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"حظر"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"تم إخفاء المحتوى الحساس"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"الأولوية"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"بدون مطالعة سريعة"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2847,15 +2800,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"شخصي"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"العمل"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"محظور"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"الأولوية"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"تم إخفاء المحتوى الحساس"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"بدون مطالعة سريعة"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏مع عناوين URL للنطاقات"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"معطّل بواسطة المشرف"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
     <string name="configure_apps" msgid="6685680790825882528">"تهيئة التطبيقات"</string>
     <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"اختيار ملف شخصي"</string>
     <string name="app_permissions" msgid="4148222031991883874">"أذونات التطبيق"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"تم السماح بدخول إضافي لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"تم السماح لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
@@ -3024,4 +2973,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"نمط لون الصورة"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استخدام sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"مقياس العرض"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ضبط مقياس تكبير كثافة العرض"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"صغير"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"عادي"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"كبير"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"أكبر"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"الأكبر"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"مخصص (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"عرض الكل"</string>
+    <string name="see_less" msgid="1250265310929558370">"عرض عناصر أقل"</string>
+    <string name="disconnected" msgid="5787956818111197212">"تم قطع الاتصال"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"تم استخدام <xliff:g id="AMOUNT">%1$s</xliff:g> من البيانات"</string>
+    <string name="apps_summary" msgid="193158055537070092">"تم تثبيت <xliff:g id="COUNT">%1$d</xliff:g> تطبيق"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"تم استخدام <xliff:g id="SIZE1">%1$s</xliff:g> من <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"تم تشغيل السطوع التكيفي"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"تم إيقاف السطوع التكيفي"</string>
 </resources>
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az-rAZ/arrays.xml
index 8caf7f02..cd63310 100644
--- a/res/values-az-rAZ/arrays.xml
+++ b/res/values-az-rAZ/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Böyük"</item>
     <item msgid="7786168277516233536">"İri"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Çox yavaş"</item>
-    <item msgid="2361722960903353554">"Yavaş"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Sürətli"</item>
-    <item msgid="1370673569131070146">"Daha sürətli"</item>
-    <item msgid="4648206845228970803">"Çox sürətli"</item>
-    <item msgid="4977949754169483251">"Tez"</item>
-    <item msgid="6106302964845503577">"Çox tez"</item>
-    <item msgid="6800277205640837264">"Ən sürətli"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Çox aşağı"</item>
-    <item msgid="2692137425242433765">"Alçaq"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Yüksək"</item>
-    <item msgid="4699640516390840297">"Çox yüksək"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skan edilir ..."</item>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 46eb7d5..7b38922 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administrator tərəfindən deaktiv edildi"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmaq izi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmaq izlərini idarə edin"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bunun üçün barmaq izi istifadə edin:"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Planşeti doka daxil edən və dokdan çıxaran zaman səs siqnalı verilməsin."</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Telefonu doka daxil edən və dokdan çıxaran zaman səs siqnalı verilməsin."</string>
     <string name="account_settings" msgid="6403589284618783461">"Hesablar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Şəxsi"</string>
-    <string name="category_work" msgid="8699184680584175622">"İş"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"İş profili hesabları - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Şəxsi profil hesabları"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"İş hesabı - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Qeyri-aktiv"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Həmişə aktiv"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Avtomatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Fayl şifrələnməsinə çevirin"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Çevirin..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fayl artıq şifrələnib"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Fayl əsaslı şifrələnməyə çevrilir"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Data bölgüsünü fayl əsaslı şifrələməyə çevirin.\n !!Xəbərdarlıq!! Bu, bütün datanızı siləcək.\n Bu xüsusiyyət alfadır və düzgün işləməyə bilər.\n Davam etmək üçün \'Silin və çevirin...\' düyməsinə basın."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Silin və çevirin..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Yuxu"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran sönür"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Parametrlər"</string>
     <string name="print_settings" msgid="4742428530112487843">"Çap"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Çap xidmətləri"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətindən istifadə edilsin?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Sənədiniz printerə qədər bir və ya daha çox server vasitəsilə keçə bilər."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Heç bir xidmət quraşdırılmayıb"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Heç bir printer tapılmadı"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ayarlar"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Tam əmr sözü və qarşılıqlı təsir"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Sadəcə nitqdən mətnə"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Bu səs daxiletməsi həmişə aktiv səs monitorinqi həyata keçirmək və adınızdan fəaliyyət göstərən səs icazəli tətbiqləri idarə etmək imkanında olacaq. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> tətbiqinə aiddir. Bu xidmətin istifadəsinə icazə verilsin?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Mətndən-danışığa parametrləri"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Mətndən-nitqə çıxışı"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Həmişə mənim parametrlərimdən istifadə et"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Aşağıdakı varsayılan ayarlar tətbiq ayarlarını yenidən təyin edir"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Defolt ayarlar"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Defolt mühərrik"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Mətni oxumaq üçün nitq danışma mühərrikini ayarlayın"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Nitq diapazonu"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Mətnin səsləndirilmə sürəti"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitç"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Danışılan mətnin tonuna təsir edir"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Sistem dili işlədin"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Dil seçilməyib"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Danışılan oxunulan mətnə dil üçün spesifik səs ayarlayır"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Nümunə dinləyin"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Nitq sintezindən nümunə göstərin"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Səs datasını quraşdırın"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Nitq sintezi üçün səs datası quraşdırın"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Nitq sintezi üçün tələb olunan səslər artıq düzgün şəkildə quraşdırılıb"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ayarlarınız dəyişdi. Bu, onların səslənmə nümunəsidir."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Seçdiyiniz mühərrik işləməyə bilər."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiqurasiya edin"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Başqa mühərrik seçin"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Bu nitq sitnez mühərriki danışılan bütün mətni, həmçinin parollarınızı və kredir kart nömrələrinizi toplaya bilər. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mühərrikindən gəlir. Nitq sintez mühərriki istifadə olunsun?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bu dil mətnin nitqə çıxışı üçün şəbəkə bağlantısı tələb edir."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Bu, bir nitq sintez nümunəsidir."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Defolt dil statusu"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> tam dəstəklənir"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> şəbəkə bağlantısı tələb edir"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> dəstəklənmir"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Yoxlanılır..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mühərriklər"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> parametrləri"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aktivdir"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> deaktiv edilib"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Mühərrik ayarları"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> üçün ayarlar"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Dillər və səslər"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Quraşdırılıb"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Quraşdırılmayıb"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Qadın"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Kişi"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Nitq sintez mühərriki quraşdırılıb"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"İstifadə etmədən öncə yeni mühərrikə icazə verin"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Mühərrik parametrlərini başladın"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Tərcih olunmuş mühərrik"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Ümumi"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Enerji nəzarəti"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi parametri güncəllənir"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarının güncəllənməsi"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Arxa tətbiqlər dialoquna cavab verməyən tətbiqi göstər"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Tətbiqlərə xaricdən məcburi icazə"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Seçilmiş hər hansı tətbiqi bəyannamə dəyərlərindən aslı olmayaraq xarici yaddaşa yazılabilən edir."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Ölçü dəyişdirmək üçün məcburi fəaliyyətlər"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Bəyannamə dəyərlərindən aslı olmayaraq bütün fəaliyyətləri çoxsaylı pəncərə üçün dəyişkən ölçülü edir."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data istifadəsi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Tətbiq data istifadəsi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnız alarmlar"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Tam sakitlik"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizual kəsintilər"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zəng səsi"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Defolt bildiriş səsi"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Həmçinin, zənglər üçün vibrasiya olsun"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Cihazınız kilidləndiyi zaman bildirişlərin necə göstərilməsini istəyirsiniz?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Bildirişlər"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Tətbiq bildirişləri"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Mövzu bildirişləri"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Digər səslər"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Klaviş tonları"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekran kilidləmə səsləri"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Tətbiqlər endirilir..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Hamısını bloklayın"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Bu tətbiqdən olan bildirişləri heç vaxt göstərmə"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Prioritet olaraq qəbul edin"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"\"Narahat etməyin\" yalnız Prioritet olanlara ayarlandığı zaman bu tətbiqin bildirişlərinin eşidilməsinə imkan verin"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Nəzər salmağa icazə verin"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Bəzi bildirişləri nəzərə çatdırmaq üçün onları cari ekranda sürüşdürərək görüntüləyin"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Narahat etməyin seçimini əvəzləyin"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Narahat Etməyin seçimi Yalnız Prioritet üçün ayarlandıqda bildirişlərin mane olmasına imkan verin"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Həssas məzmunu gizlədin"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Cihaz kilidləndiyi zaman bu tətbiq bildirişlərində şəxsi məlumatları aşkara çıxaracaq məzmunu gizlədin"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Cihaz kilidli olduqda, bu bildirişlərdə gizli məlumatları aşkarlaya biləcək məzmunu gizlədin"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloklanmış"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Həssas"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnız <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> vaxtınadək xəbərdarlıqları dəyişin"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Həmişə fasiləyə dəyişin"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ekran kəsintiləri yoxdur"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Baxışlardakı Narahat Etməyin vasitəsilə və ya cari ekranda görünən ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Bildiriş işığı yoxdur"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"İşığın yanıb sönməsinə səbəb olan Narahat Etməyin ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Tətbiq bildirişləri"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildiriş ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihaz haqqında fikrinizi bildirin"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ayırmadan öncə PIN istənilsin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ayırmadan öncə parol istənilsin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ekranı açarkən cihazı kilidləyin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"İş profili"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu iş profilini idarə edir:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tərəfindən idarə olunur"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Bildirişlər"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blok"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Həssas məzmun gizlidir"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritet"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Heç kəs baxmasın"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Şəxsi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"İş"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloklanıb"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Həssas məzmun gizlidir"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Heç kəs baxmasın"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domen URL-ləri ilə"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administrator tərəfindən deaktiv edilib"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Qabaqcıl"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Tətbiqi konfiqurasiya edin"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Naməlum tətbiq"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Tətbiq icazələri"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%d</xliff:g> tətbiqə əlavə girişə icazə var"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%d</xliff:g> tətbiq icazəlidir"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Şəkil rəng rejimi"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB istifadə edin"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Miqyası göstərin"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"yaxınlıq miqyasının ölçmə sıxlığını göstərin"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kiçik"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Böyük"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Daha böyük"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Ən böyük"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Fərdi (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Hamısına baxın"</string>
+    <string name="see_less" msgid="1250265310929558370">"Baxışı kiçildin"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Bağlantı kəsilib"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> data istifadə edildi"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> tətbiq quraşdırıldı"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> datadan <xliff:g id="SIZE2">%2$s</xliff:g> data istifadə olunub"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Adaptiv parlaqlıq aktivdir"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Adaptiv parlaqlıq deaktivdir"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 9d9c9b1..c48e7b3 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Голям"</item>
     <item msgid="7786168277516233536">"Огромен"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Много бавна"</item>
-    <item msgid="2361722960903353554">"Бавна"</item>
-    <item msgid="1145554631248513562">"Нормална"</item>
-    <item msgid="7553665153391107454">"Бърза"</item>
-    <item msgid="1370673569131070146">"По-бързо"</item>
-    <item msgid="4648206845228970803">"Много бързо"</item>
-    <item msgid="4977949754169483251">"Бързо"</item>
-    <item msgid="6106302964845503577">"Много бързо"</item>
-    <item msgid="6800277205640837264">"Най-бързо"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Много нисък"</item>
-    <item msgid="2692137425242433765">"Нисък"</item>
-    <item msgid="3332408460740717754">"Нормален"</item>
-    <item msgid="4907380534957572531">"Висок"</item>
-    <item msgid="4699640516390840297">"Много висок"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Сканира се..."</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9515b8a..c2375fd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Деактивирано от администратора"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечатък"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Отпечатъци: Управл."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Oтпечатък: Ползване за"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Без пускане на звук при поставяне или премахване на таблета от докинг станция"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Без пускане на звуци при поставяне или премахване на телефона от докинг станция"</string>
     <string name="account_settings" msgid="6403589284618783461">"Профили"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Лични"</string>
-    <string name="category_work" msgid="8699184680584175622">"Служебни"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Профили със служебен потребителски профил – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Профили с личен потребителски профил"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Служебен профил – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Деактивирано"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Винаги включено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматично"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Преобразуване към шифроване на ниво файл"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Преобразуване…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Данните вече са шифровани на ниво файл"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Преобразуване към шифроване на ниво файл"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Делът с данни ще се преобразува към шифроване на ниво файл.\n Предупреждение: Всичките ви данни ще се изтрият!\n Тази функция е в алфа версия и може да не работи правилно.\n Натиснете „Изтриване и преобразуване…“, за да продължите."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Изтриване и преобразуване…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спящ режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранът се изключва"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="print_settings" msgid="4742428530112487843">"Отпечатване"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуги за отпечатване"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"По пътя към принтера документът ви може да премине през един или повече сървъри."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Няма инсталирани услуги"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Няма намерени принтери"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Цялостна услуга за активиращи думи и взаимодействие"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Обикновено разпознаване на говор"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Тази услуга за гласово въвеждане ще може да извършва постоянно наблюдение на говора и да контролира от ваше име всички поддържащи говор приложения. Източникът й е <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Да се активира ли използването на услугата?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Настройки за синтезиран говор"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Синтезиран говор"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Винаги да се използват моите настройки"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Стандартните настройки по-долу заменят тези на приложенията"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Стандартни настройки"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Стандартна машина"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Задаване за изговаряне на текст да се използва машината за синтезиране на говор"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Скорост на речта"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Скорост, с която се изговаря текстът"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Височина"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Отразява се на тона на изговорения текст"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Език"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Използване на системния език"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Езикът не е избран"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Задава глас за конкретен език за изговорения текст"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Чуйте пример"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Възпроизвеждане на кратка демонстрация на синтезиране на реч"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Инсталиране на гласови данни"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Инсталиране на гласови данни, нужни за синтезиране на реч"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Вече нормално инсталирани гласове, нужни за синтезиране на реч"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Настройките ви бяха променени. Ето пример как звучат."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Избраната от вас машина не може да стартира."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриране"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Избор на друга машина"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Тази машина за синтезиране на реч може да събира всички изговорено от вас, включително лични данни като пароли и номера на кредитни карти. Тя произлиза от машината <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Искате ли да я активирате?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Този език изисква работеща връзка с мрежата за синтезирания говор."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Това е пример за синтезиране на говор"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Състояние на основния език"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> се поддържа напълно"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"За <xliff:g id="LOCALE">%1$s</xliff:g> се изисква връзка с мрежа"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не се поддържа"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Проверява се..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Машини"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Настройки за <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е активирано"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е деактивирано"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Настройки на машината"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Настройки за <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Езици и гласове"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Инсталиран"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Не е инсталирано"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Жена"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Мъж"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Инсталирано бе синтезиране на реч"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Активирайте преди ползване."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Стартиране на настройките на машината"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Предпочитана машина"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Общи"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контрол на захранването"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Актуализиране на настройките за Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Актуализиране на настройките за Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Диалог. прозорец „НП“ за приложения на заден план"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Външно хран.: Принуд. разрешаване на приложенията"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Позволява прилож. да се записват във външ. хранил. независимо от стойностите в манифеста"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Възможност за преоразмеряване на активностите"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Дава възможност за преоразмеряване на всички активности в режима за няколко прозореца независимо от стойностите в манифеста."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Използване на данни"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Прилож.: Пренос на данни"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Отчетеният от оператора обем на данните може да се различава от показания на устройството ви."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само будилници"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Пълна тишина"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Визуални прекъсвания"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Стандартна мелодия за известията"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибриране и при обаждания"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Как искате да се показват известията, когато устройството ви е заключено?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Известия"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Известия за прилож."</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Известия по тема"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Други звуци"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонове при набиране"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"При заключване на екрана"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Известията от това приложение никога не се показват"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Третиране като приоритетни"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Разрешаване на известията от това приложение, когато за „Не безпокойте“ е зададено „Само с приоритет“"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Кратко показване"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Това приложение може да набляга върху определени известия, като за кратко ги показва на текущия екран"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отмяна на „Не безпокойте“"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешаване тези известия да продължат да ви прекъсват, когато за „Не безпокойте“ е зададено „Само с приоритет“"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Скриване на деликатното съдържание"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Когато устройството е заключено, от известията на това приложение се скрива съдържанието, което може да разкрие частна информация"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Когато устройството е заключено, няма да се показва съдържанието на известията, които може да разкрият лична информация"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Блокирано"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Приоритет"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Деликатно"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активиране на режима „Само будилници“ до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Активиране на режима „Прекъсване винаги“"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Без екранни прекъсв."</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Известията, блокирани чрез „Не безпокойте“, няма да се показват мимолетно или трайно на текущия екран"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Без извест. светлина"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Известията, блокирани чрез „Не безпокойте“, няма да задействат пулсиращата светлина"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ПИН код преди освобождаване"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запитване за парола преди освобождаване"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заключване на устройството при освобождаване"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Служебен потр. профил"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Този служебен потребителски профил се управлява от:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управлява се от <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Известия"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Нормално"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Блокирани"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Деликатното съдържание е скрито"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"С приоритет"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Без мимолетно показване"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Служебни"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирани"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"С приоритет"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Деликатното съдърж. е скрито"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Без мимолетно показване"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL адреси в домейните"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Деактивирано от администратора"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигуриране на приложенията"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Разрешения"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> приложения имат допълнителен достъп"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> приложения имат разрешение"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Цветови режим за снимките"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Използване на sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Мащаб на показване"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"показване, плътност, промяна на мащаба, мащаб, мащабиране"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Малък"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Нормален"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Голям"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"По-голям"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Най-голям"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Персонализиран (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Преглед на всичко"</string>
+    <string name="see_less" msgid="1250265310929558370">"Преглед на по-малко"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Връзката е прекратена"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Използвали сте <xliff:g id="AMOUNT">%1$s</xliff:g> от данните"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> приложения са инсталирани"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Използвали сте <xliff:g id="SIZE1">%1$s</xliff:g> от <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Адаптивната яркост е ВКЛЮЧЕНА"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Адаптивната яркост е ИЗКЛЮЧЕНА"</string>
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index 4f1deff..74fb349 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"বৃহত্‍"</item>
     <item msgid="7786168277516233536">"বিশাল"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"অত্যন্ত ধীরে"</item>
-    <item msgid="2361722960903353554">"ধীর"</item>
-    <item msgid="1145554631248513562">"স্বাভাবিক"</item>
-    <item msgid="7553665153391107454">"দ্রুত"</item>
-    <item msgid="1370673569131070146">"দ্রুত"</item>
-    <item msgid="4648206845228970803">"খুব দ্রুত"</item>
-    <item msgid="4977949754169483251">"রেপিড"</item>
-    <item msgid="6106302964845503577">"অত্যন্ত রেপিড"</item>
-    <item msgid="6800277205640837264">"দ্রুততম"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"খুব কম"</item>
-    <item msgid="2692137425242433765">"নিম্ন"</item>
-    <item msgid="3332408460740717754">"সাধারণ"</item>
-    <item msgid="4907380534957572531">"উচ্চ"</item>
-    <item msgid="4699640516390840297">"খুব বেশি"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"স্ক্যান করা হচ্ছে…"</item>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index c430610..0dee9eb 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"পাসওয়ার্ড"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"প্রশাসক দ্বারা অক্ষমিত"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"আঙ্গুলের ছাপ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"আঙ্গুলের ছাপগুলি পরিচালনা করুন"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"এর জন্য আঙ্গুলের ছাপ ব্যবহার করুন"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ডকে ট্যাবলেট ঢোকাতে বা বের করতে শব্দ প্লে করবেন না"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ডকে ফোন ঢোকাতে বা বের করতে শব্দ প্লে করবেন না"</string>
     <string name="account_settings" msgid="6403589284618783461">"অ্যাকাউন্টগুলি"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ব্যক্তিগত"</string>
-    <string name="category_work" msgid="8699184680584175622">"কর্মক্ষেত্র"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"কাজের প্রোফাইল অ্যাকাউন্টগুলি - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ব্যক্তিগত প্রোফাইল অ্যাকাউন্টগুলি"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"কাজের অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"অক্ষম করা রয়েছে"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"সবসময় চালু"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"স্বয়ংক্রিয়"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ফাইল এনক্রিপশান রূপান্তর করুন"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"রূপান্তর করুন..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ফাইল ইতিমধ্যেই এনক্রিপ্ট করা রয়েছে"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ফাইল ভিত্তিক এনক্রিপশানে রূপান্তর করা হচ্ছে"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ডেটা পার্টিশানকে ফাইলভিত্তিক এনক্রিপশানে রূপান্তর করুন৷ \n !!সতর্কবাণী!! এটি আপনার সমস্ত ডেটা মুছে ফেলবে৷\n এই বৈশিষ্ট্যটি আলফা এবং সঠিকভাবে কাজ নাও করতে পারে৷\n চালিয়ে যেতে \'মুছুন ও রূপান্তর করুন...\' টিপুন৷"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"মুছুন ও রূপান্তর করুন..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"নিষ্ক্রিয় রয়েছে"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"স্ক্রীন বন্ধ হয়"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয়তার পরে"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"সেটিংস"</string>
     <string name="print_settings" msgid="4742428530112487843">"মুদ্রণ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"মুদ্রণ পরিষেবাগুলি"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যবহার করবেন?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"আপনার দস্তাবেজ মুদ্রকে যাওয়ার সময় এক বা একাধিক সার্ভারের মাধ্যমে পাস হতে পারে।"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"কোনো পরিষেবা ইনস্টল করা নেই"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"কোনো মুদ্রক পাওয়া যায়নি"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"সেটিংস"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"পূর্ণ হটওয়ার্ড ও ইন্টারঅ্যাকশন"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"সাধারণ কথন থেকে পাঠ্যে"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"এই ভয়েস ইনপুট পরিষেবা আপনার হয়ে সর্বদা-চালু ভয়েস মনিটরিং সম্পাদন এবং ভয়েস সক্ষমিত অ্যাপ্লিকেশানগুলি নিয়ন্ত্রণ করতে পারবে। এটি <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> অ্যাপ্লিকেশান থেকে আসছে। এই পরিষেবার ব্যবহার সক্ষম করবেন?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"পাঠ্য থেকে ভাষ্য আউটপুট সেটিংস"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"লেখিত-থেকে-ভাষ্য"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"সর্বদা আমার সেটিংস ব্যবহার করুন"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ওভাররাইড অ্যাপ্লিকেশান সেটিংসের নীচের ডিফল্ট সেটিংস"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ডিফল্ট সেটিংস"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ডিফল্ট ইঞ্জিন"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"উচ্চারিত পাঠ্যের জন্য স্পীচ সংশ্লেষণ ইঞ্জিনের ব্যবহার সেট করুন"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"ভাষ্য হার"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"যে গতিতে পাঠ্য উচ্চারিত হয়"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"পিচ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"কথ্য পাঠ্যের স্বর প্রভাবিত করে"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ভাষা"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"সিস্টেমের ভাষা ব্যবহার করুন"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ভাষা নির্বাচন করা নেই"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"কথ্য পাঠ্যের জন্য ভাষা-নির্দিষ্ট ভয়েস সেট করে"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"একটি উদাহরণ শুনুন"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"কথন সংশ্লেষণের উপর একটি ছোট ডেমো প্লে করুন"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ভয়েস ডেটা ইনস্টল করুন"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"বিবৃতি সংশ্লেষণের জন্য প্রয়োজনীয় ভয়েস ডেটা ইনস্টল করুন"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ভাষ্য সংশ্লেষণের জন্য প্রয়োজনীয় ভয়েসে ইতিমধ্যে সঠিকভাবে ইনস্টল করা আছে"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"আপনার সেটিংস পরিবর্তিত হয়েছে। কিরকম শব্দ হবে এটি হল তার একটি উদাহরণ।"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"আপনি যে ইঞ্জিনটি চয়ন করেছেন তা চালানো যাবে না।"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"কনফিগার করুন"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"আরেকটি ইঞ্জিন চয়ন করুন"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"এই বিবৃতি সংশ্লেষণ ইঞ্জিন হয়তো পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ কথ্য সমস্ত পাঠ্য সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ইঞ্জিন থেকে আসে। এই বিবৃতি সংশ্লেষণ ইঞ্জিন সক্ষম করবেন?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"পাঠ্য থেকে ভাষ্য আউটপুটের জন্য এই ভাষার একটি কাজ করছে এমন নেটওয়ার্ক সংযোগ প্রয়োজন।"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"এটি হল ভাষ্য সংশ্লেষণের একটি উদাহরণ"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ডিফল্ট ভাষা স্থিতি"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> সম্পূর্ণ সমর্থিত"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> এর নেটওয়ার্ক সংযোগের প্রয়োজন"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> সমর্থিত নয়"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"চেক করা হচ্ছে..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"ইঞ্জিন"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> সেটিংস"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> সক্ষম"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> অক্ষম"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"ইঞ্জিন সেটিংস"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> জন্য সেটিংস"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ভাষা ও ভয়েস"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ইনস্টল হয়েছে"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ইনস্টল করা নেই"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"মহিলা"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"পুরুষ"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"কথন সংশ্লেষণ ইঞ্জিন ইনস্টল করা আছে"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ব্যবহারের আগে নতুন ইঞ্জিন সক্ষম করুন।"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ইঞ্জিন সেটিংস লঞ্চ করুন"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"পছন্দের ইঞ্জিন"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"সাধারণ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"পাওয়ার নিয়ন্ত্রণ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi সেটিং আপডেট করা হচ্ছে"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth সেটিং আপডেট করা হচ্ছে"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"পশ্চাদপটের অ্যাপ্লিকেশানগুলির জন্য অ্যাপ্লিকেশান কোনো প্রতিক্রিয়া দিচ্ছে না এমন কথোপকথন দেখান"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"বহিরাগততে বলপূর্বক মঞ্জুরি"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ম্যানিফেস্ট মানগুলি নির্বিশেষে যেকোনো অ্যাপ্লিকেশানকে বাহ্যিক সঞ্চয়স্থানে লেখার উপযুক্ত বানায়"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"আকার পরিবর্তনযোগ্য করার জন্য ক্রিয়াকলাপগুলিকে জোর করুন"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"ম্যানিফেস্ট মানগুলির নির্বিশেষে মাল্টি-উইন্ডোর জন্য সমস্ত ক্রিয়াকলাপগুলিকে আকার পরিবর্তনযোগ্য করে তোলে৷"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটা ব্যবহার"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"অ্যাপ ডেটা ব্যবহার"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইস থেকে ভিন্ন হতে পারে।"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"শুধুমাত্র অ্যালার্মগুলি"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"একদম নিরব"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ভিজ্যুয়াল বাধাগুলি"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ফোন রিংটোন"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"বিজ্ঞপ্তির ডিফল্ট রিংটোন"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে স্পন্দিত করুন"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তিগুলি"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"বিষয় বিজ্ঞপ্তিগুলি"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"অন্যান্য শব্দগুলি"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ডায়াল প্যাডের টোনগুলি"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"স্ক্রিন লক হওয়ার শব্দ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"সমস্ত অবরুদ্ধ করুন"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"এই অ্যাপ্লিকেশান থেকে কখনোই বিজ্ঞপ্তিগুলি দেখাবেন না"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"অগ্রাধিকার হিসেবে বিবেচনা করুন"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"যখন \'বিরক্ত করবেন না\' কে শুধুমাত্র অগ্রাধিকার এ সেট করা থাকবে তখন অ্যাপ্লিকেশান বিজ্ঞপ্তিকে বাজার অনুমতি দিন"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"বেছে নেওয়ার অনুমতি দিন"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"বর্তমান স্ক্রীনে নির্দিষ্ট বিজ্ঞপ্তিগুলিকে দর্শনের মধ্যে সংক্ষিপ্ত সময়ের মধ্যে স্লাইড করার দ্বারা, অ্যাপ্লিকেশানটিকে সেগুলির উপর বেশি গুরুত্ব দিতে দিন"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"যখন শুধুমাত্র অগ্রাধিকার সাপেক্ষে \'বিরক্ত করবেন না\' সেট করা থাকবে তখন বাধাদানের ক্ষেত্রে এই বিজ্ঞপ্তিগুলিকে চালু থাকতে দিন"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"সংবেদনশীল সামগ্রী লুকান"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"ডিভাইসটি লক করা থাকলে, এই অ্যাপ্লিকেশান বিজ্ঞপ্তির মধ্যে, ব্যক্তিগত তথ্য প্রকাশ করতে পারে এমন সামগ্রী লুকান"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"ডিভাইস লক করা অবস্থায় থাকাকালীন ব্যক্তিগত তথ্য প্রকাশ করতে পারে এমন সামগ্রীকে এই বিজ্ঞপ্তিগুলির মধ্যে লুকান"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"অবরুদ্ধ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"অগ্রাধিকার"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"সংবেদনশীল"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"শুধুমাত্র <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"কোনো স্ক্রীন বাধা নেই"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"\'বিরক্ত করবেন না\' এর দ্বারা নীরব করা আটকানো বিজ্ঞপ্তিগুলির কারণে বর্তমান স্ক্রীনে উঁকি মারে বা উপস্থিত হয়"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"কোনো বিজ্ঞপ্তি আলো নেই"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"\'বিরক্ত করবেন না\' এর দ্বারা নীরব করা আটকানো বিজ্ঞপ্তিগুলির কারণে লাইটটি জ্বলে ও নেভে"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
     <string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"আনপিন করার আগে পিন চান"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"আনপিন করার আগে পাসওয়ার্ড চান"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"আনপিন করার সময় ডিভাইস লক করুন"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"কর্মস্থলের প্রোফাইল"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"এর দ্বারা এই কাজের প্রোফাইলটি পরিচালিত হয়:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> এর দ্বারা পরিচালিত"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(পরীক্ষামূলক)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"বিজ্ঞপ্তিগুলি"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"স্বাভাবিক"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"অবরুদ্ধ করুন"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"সংবেদনশীল সামগ্রী লুকানো রয়েছে"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"অগ্রাধিকার"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"বেছে নেওয়ার সুবিধা নেই"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"কাজ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"অবরুদ্ধ রয়েছে"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"অগ্রাধিকার"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"সংবেদনশীল সামগ্রী লুকানো রয়েছে"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"বেছে নেওয়ার সুবিধা নেই"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ডোমেনের URLগুলি সহ"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"প্রশাসক দ্বারা অক্ষমিত"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="configure_apps" msgid="6685680790825882528">"অ্যাপ্লিকেশান কনফিগার করুন"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"প্রোফাইল বেছে নিন"</string>
     <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশানের অনুমতি"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান অতিরিক্ত অ্যাক্সেস মঞ্জুরিপ্রাপ্ত"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান মঞ্জুরিপ্রাপ্ত"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ছবি রঙ মোড"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ব্যবহার করুন"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"স্কেল প্রদর্শন করুন"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ঘনত্বের হিসাবে জুম স্কেলের মাপ প্রদর্শন করুন"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ক্ষুদ্র"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"স্বাভাবিক"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"বড়"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"খুব বড়"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"বৃহত্তম"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"কাস্টম (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"সবগুলি দেখুন"</string>
+    <string name="see_less" msgid="1250265310929558370">"কম দেখুন"</string>
+    <string name="disconnected" msgid="5787956818111197212">"সংযোগ বিচ্ছিন্ন হয়েছে"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ডেটা ব্যবহৃত হয়েছে"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপ্লিকেশান ইনস্টল করা হয়েছে"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> এর মধ্যে <xliff:g id="SIZE1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"অভিযোজিত উজ্জ্বলতা চালু রয়েছে"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"অভিযোজিত উজ্জ্বলতা বন্ধ রয়েছে"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index a452e15..940dd08 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Gran"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Molt lenta"</item>
-    <item msgid="2361722960903353554">"Lenta"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Ràpida"</item>
-    <item msgid="1370673569131070146">"Més ràpida"</item>
-    <item msgid="4648206845228970803">"Molt ràpida"</item>
-    <item msgid="4977949754169483251">"Ràpida"</item>
-    <item msgid="6106302964845503577">"Molt ràpida"</item>
-    <item msgid="6800277205640837264">"Màxima"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Molt baix"</item>
-    <item msgid="2692137425242433765">"Baixa"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alt"</item>
-    <item msgid="4699640516390840297">"Molt alt"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"S\'està cercant..."</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 047dc28..cb1c390 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Opció desactivada per l\'administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empremta digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gest. empremtes digit."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. digit. per"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Feina"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Comptes del perfil professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes del perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desactivat"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre activat"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automàtic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteix en l\'encriptació de fitxers"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converteix…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"El fitxer ja està encriptat"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"S\'està convertint en l\'encriptació basada en fitxers"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converteix la partició de dades en una encriptació basada en fitxers.\n Advertiment: s\'esborraran totes les teves dades.\n Aquesta funció és alfa i és possible que no funcioni correctament.\n Per continuar, prem Esborra i converteix…"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Esborra i converteix…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressió"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serveis d\'impressió"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"És possible que el document passi per un o més servidors abans d\'imprimir-se."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No hi ha cap servei instal·lat"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No s\'ha trobat cap impressora"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuració"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Paraula activa i interacció completes"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Síntesi de veu simple"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Aquest servei d\'entrada de veu podrà supervisar sempre la veu i controlar les aplicacions compatibles amb l\'entrada de veu en nom teu. Procedeix de l\'aplicació <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vols activar l\'ús d\'aquest servei?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configuració de síntesi de veu"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Síntesi de veu"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilitza sempre la meva configuració"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"La configuració predeterminada que hi ha a continuació substitueix la configuració d\'aplicacions"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuració predeterminada"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminat"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Defineix el motor de síntesi de veu que es farà servir per al text en veu alta"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocitat de veu"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocitat de lectura del text"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"To"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el to del text parlat"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utilitza l\'idioma del sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"No has seleccionat cap idioma"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Defineix la llengua utilitzada per a la síntesi de veu"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Vull escoltar un exemple"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reprodueix una breu demostració de síntesi de veu"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instal·la dades de veu"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instal·la les dades de veu necessàries per a la síntesi de veu"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Les veus necessàries per a la síntesi de la parla no estan instal·lades correctament"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"La configuració ha canviat. Això és un exemple de com sonen."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"El motor que has triat no es pot executar."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecciona un altre motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Pot ser que aquest motor de síntesi de la parla pugui recopilar tot el text que es dirà en veu alta, incloses les dades personals, com ara les contrasenyes i els números de les targetes de crèdit. Ve del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voleu activar l\'ús d\'aquest motor de síntesi de la parla?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Aquest idioma requereix una connexió de xarxa activa per a la sortida de síntesi de veu."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Això és un exemple de síntesi de veu"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Estat de l\'idioma predeterminat"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> és totalment compatible"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Es necessita una connexió de xarxa per a <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> no és compatible"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"S\'està comprovant..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motors"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuració de: <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> està activat"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> està desactivat"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuració del motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configuració de: <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomes i veus"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instal·lada"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"No instal·lada"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Dona"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Home"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor de síntesi de parla instal·lat"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Act. el motor nou abans d\'ús."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Obre la configuració del motor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferit"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control d\'energia"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"S\'està actualitzant la configuració Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració de Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informa que una aplicació en segon pla no respon"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Força permís d\'aplicacions a l\'emmagatzem. extern"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Permet que les aplicacions es puguin escriure en un dispositiu d’emmagatzematge extern, independentment dels valors definits"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Força l\'ajust de la mida de les activitats"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permet ajustar la mida de totes les activitats per al mode multifinestra, independentment dels valors definits."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ús de dades de l\'aplicació"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Només alarmes"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silenci total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupcions visuals"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"So de trucada"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"So de notificació predeterminat"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibra també en trucades"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Com vols que es mostrin les notificacions quan el dispositiu estigui bloquejat?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificacions"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacions d\'aplicacions"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificacions per tema"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Altres sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons del teclat"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons en bloquejar la pantalla"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostris mai les notificacions d\'aquesta aplicació"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tracta com a prioritària"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permet que se sentin les notificacions d\'aquesta aplicació quan el mode No molesteu estigui definit en Només amb prioritat"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permet la previsualització"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permet que aquesta aplicació destaqui algunes notificacions mostrant-les breument a la pantalla actual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substitueix No molesteu"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions segueixin interrompent quan el mode No molesteu estigui configurat com a Només amb prioritat"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Amaga el contingut sensible"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Quan el dispositiu estigui bloquejat, amaga el contingut de les notificacions d\'aquesta aplicació que pugui revelar informació privada"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Quan el dispositiu està bloquejat, amaga el contingut d\'aquestes notificacions que pugui revelar informació privada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloquejat"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritat"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Canvia al mode Només alarmes fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Canvia al mode Interromp sempre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Cap interrupció"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedeix que les notificacions silenciades pel mode No molesteu apareguin a la pantalla"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Cap llum notificació"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedeix que les notificacions silenciades pel mode No molesteu activin el llum"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions d\'aplicacions"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envia suggeriments sobre el dispositiu"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demana el codi PIN per anul·lar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demana la contrasenya per anul·lar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloqueja el dispositiu en anul·lar la fixació"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil professional"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"L\'administrador d\'aquest perfil professional és:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestionat per <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificacions"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normals"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquejades"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contingut sensible amagat"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritat"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Sense previsualització"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personals"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Professionals"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloquejades"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritat"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contingut sensible amagat"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Sense previsualització"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Amb URL del domini"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desactivat per l\'administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura aplicacions"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Triar un perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos d\'aplicacions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacions disposen d\'accés addicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacions permeses"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode de color de la imatge"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilitza sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de visualització"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"visualització densitat zoom escala mida"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Petita"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Gran"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Molt gran"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"La més gran"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalitzada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Mostra-ho tot"</string>
+    <string name="see_less" msgid="1250265310929558370">"Mostra\'n menys"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desconnectada"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"S\'ha utilitzat un <xliff:g id="AMOUNT">%1$s</xliff:g> de dades"</string>
+    <string name="apps_summary" msgid="193158055537070092">"S\'han instal·lat <xliff:g id="COUNT">%1$d</xliff:g> aplicacions"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> utilitzats de <xliff:g id="SIZE2">%2$s</xliff:g> en total"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"La brillantor automàtica està activada"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"La brillantor automàtica està desactivada"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index afa3657..e374abe 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Velké"</item>
     <item msgid="7786168277516233536">"Velmi velké"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Velmi pomalá"</item>
-    <item msgid="2361722960903353554">"Pomalá"</item>
-    <item msgid="1145554631248513562">"Běžná"</item>
-    <item msgid="7553665153391107454">"Rychlá"</item>
-    <item msgid="1370673569131070146">"Rychlejší"</item>
-    <item msgid="4648206845228970803">"Velmi rychlá"</item>
-    <item msgid="4977949754169483251">"Svižná"</item>
-    <item msgid="6106302964845503577">"Velmi svižná"</item>
-    <item msgid="6800277205640837264">"Nejrychlejší"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Velmi nízká"</item>
-    <item msgid="2692137425242433765">"Nízká"</item>
-    <item msgid="3332408460740717754">"Běžná"</item>
-    <item msgid="4907380534957572531">"Vysoká"</item>
-    <item msgid="4699640516390840297">"Velmi vysoká"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Vyhledávání..."</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4310c70..4f564cb 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Zakázáno administrátorem"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisk prstu"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa otisků prstů"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"K čemu otisk používat"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Při vložení nebo vyjmutí tabletu z doku nepřehrávat zvuk"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nepřehrávat zvuk při vkládání nebo vyjímání telefonu z doku"</string>
     <string name="account_settings" msgid="6403589284618783461">"Účty"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobní"</string>
-    <string name="category_work" msgid="8699184680584175622">"Pracovní"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Účty s pracovním profilem – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Účty s osobním profilem"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Pracovní účet – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Vypnuto"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vždy zapnuto"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatický"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Převést na šifrování souborů"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Převést…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Obsah je již na úrovni souborů zašifrován"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Převod na šifrování založené na souborech"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Chystáte se převést datový oddíl na šifrování založené na souborech.\n!!Upozornění!! Všechna vaše data budou vymazána.\nTato funkce je ve verzi alfa a nemusí fungovat správně.\nChcete-li pokračovat, vyberte možnost Vymazat a převést…"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Vymazat a převést…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Nastavení"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tisk"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tiskové služby"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Chcete používat službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokument může cestou do tiskárny projít jedním i více servery."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Žádná služba není nainstalována"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nebyly nalezeny žádné tiskárny"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavení"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Úplná aktivace klíčových slov a interakce"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednoduchý převod řeči na text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Služba hlasového zadávání bude moci neustále monitorovat hlas a ovládat za vás aplikace s aktivovaným hlasovým zadáváním. Služba pochází z <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Chcete použití této služby povolit?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Nastavení převodu textu na řeč"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Převod textu na řeč"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vždy používat moje nastavení"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Výchozí nastavení níže přepíše nastavení jednotlivých aplikací"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Výchozí nastavení"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Výchozí modul"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nastavit modul syntézy řeči, který se bude používat pro mluvený text"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Rychlost řeči"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Rychlost mluveného textu"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje rejstřík mluveného textu"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Použít jazyk systému"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebyl vybrán jazyk"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavení jazyka hlasu pro mluvený text"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Poslechnout příklad"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Přehrát krátkou ukázku syntézy řeči"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Nainstalovat hlasová data"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Nainstalovat hlasová data pro syntézu řeči"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Hlas pro syntézu řeči je již řádně nainstalován."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavení se změnilo. Toto je příklad současného znění."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Modul, který jste vybrali, nelze spustit."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovat"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vyberte jiný modul"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Modul pro syntézu řeči může shromažďovat veškerý mluvený text, včetně osobních dat jako jsou hesla nebo čísla kreditních karet. Je založen na modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete modul pro syntézu řeči aktivovat?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Pro tento jazyk je k převodu textu na hlasový výstup potřeba připojení k síti."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Toto je příklad syntézy řeči"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Stav výchozího jazyka"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> je plně podporován"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> vyžaduje připojení k síti"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> není podporován"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Probíhá kontrola..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Moduly"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavení modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Položka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivována"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Možnost <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je deaktivována"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Nastavení modulu"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jazyky a hlasy"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Nainstalováno"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Není nainstalováno"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Žena"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Muž"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Nainstalován modul syntézy řeči"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Před použitím modul povolte."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Spustit vyhledávač"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferovaný modul"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Obecné"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrola spotřeby energie"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Probíhá aktualizace nastavení Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Probíhá aktualizace nastavení Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobrazovat dialog „Aplikace neodpovídá“ pro aplikace na pozadí"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Vynutit povolení aplikací na externím úložišti"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Každou aplikaci bude možné zapsat do externího úložiště, bez ohledu na hodnoty manifestu"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Vynutit možnost změny velikosti aktivit"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Velikost všech aktivit bude možné změnit na několik oken (bez ohledu na hodnoty manifestu)."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využití dat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využití dat apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtování dat operátora se může lišit od údajů zařízení."</string>
@@ -2422,7 +2375,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby mobilem"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby dotykem telefonu"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Jak to funguje"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Plaťte v obchodech telefonem"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Výchozí platební aplikace"</string>
@@ -2431,14 +2384,14 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Použít výchozí"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Vždy"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Kromě případů, kdy je spuštěna jiná platební aplikace"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace, která bude použita u terminálu pro platby mobilem:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace, která bude použita u terminálu pro platby dotykem telefonu:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Platba na terminálu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Nastavte platební aplikaci. Poté jen přidržte telefon zadní stranou u terminálu se symbolem bezkontaktních plateb."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Rozumím"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Další..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nastavit jako předvolbu?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Chcete při platbě mobilem vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Chcete při platbě mobilem namísto aplikace <xliff:g id="APP_0">%1$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_1">%2$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Chcete při platbě dotykem telefonu vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Chcete při platbě dotykem telefonu namísto aplikace <xliff:g id="APP_0">%1$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_1">%2$s</xliff:g>?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Pouze budíky"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Úplné ticho"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Viditelná vyrušení"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Výchozí tón oznámení"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrovat také u volání"</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Jak chcete zobrazovat oznámení, když bude zařízení uzamčeno?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Oznámení"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Oznámení"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Tematická oznámení"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Ostatní zvuky"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tóny číselníku"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvuky zámku obrazovky"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovat oznámení z této aplikace"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Považovat za prioritní"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Umožní aplikaci informovat o oznámeních, i když je režim Nerušit nastaven pouze na prioritní vyrušení."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Povolit rychlý náhled"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Umožní aplikaci zdůraznit určitá upozornění tím, že je krátce zobrazí na aktuální obrazovce."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Přepsat nastavení Nerušit"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožnit těmto oznámením vyrušit mě, pokud je v nastavení Nerušit vybrána možnost Pouze prioritní"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skrýt citlivý obsah"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Když je zařízení uzamčeno, skryje se obsah oznámení této aplikace, která by mohla vyzradit soukromé údaje."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Pokud je zařízení uzamčeno, skrýt v těchto oznámeních obsah, který by mohl odhalit soukromé informace"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokované"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritní"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Důvěrné"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Přepnout do režimu Pouze budíky až do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Přejít do režimu Vždy vyrušit"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Nerušit na obrazovce"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Zabránit, aby se v režimu Nerušit zobrazovala oznámení v rychlém náhledu nebo na aktuální obrazovce"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Kontrolka vypnuta"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Zabránit, aby v režimu Nerušit po doručení oznámení začala blikat kontrolka"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Před uvolněním požádat o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Před uvolněním požádat o heslo"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Při uvolnění uzamknout zařízení"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Pracovní profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovní profil je spravován pomocí aplikace:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravováno aplikací <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentální)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Oznámení"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normální"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokováno"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Citlivý obsah byl skryt"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritní"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Rychlý náhled zakázán"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobní"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Práce"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokované"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritní"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Citlivý obsah byl skryt"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Bez rychlého náhledu"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S adresami URL domény"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Zakázáno administrátorem"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurace aplikací"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Vyberte profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Oprávnění aplikací"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"U <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací povolen rozšířený přístup"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povoleno u <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací"</string>
@@ -2978,4 +2927,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Režim barev obrázku"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije se barevný prostor sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Měřítko displeje"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"displej hustota přiblížení měřítko"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Malé"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normální"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Velké"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Větší"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Největší"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Vlastní (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Zobrazit vše"</string>
+    <string name="see_less" msgid="1250265310929558370">"Zobrazit méně"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Odpojeno"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Využití dat: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Počet nainstalovaných aplikací: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Využito <xliff:g id="SIZE1">%1$s</xliff:g> z <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Adaptivní jas je zapnutý"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Adaptivní jas je vypnutý"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 3580214..e17a5e3 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Stor"</item>
     <item msgid="7786168277516233536">"Meget stor"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Meget langsom"</item>
-    <item msgid="2361722960903353554">"Langsom"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Hurtig"</item>
-    <item msgid="1370673569131070146">"Hurtigere"</item>
-    <item msgid="4648206845228970803">"Meget hurtig"</item>
-    <item msgid="4977949754169483251">"Hurtig"</item>
-    <item msgid="6106302964845503577">"Meget hurtig"</item>
-    <item msgid="6800277205640837264">"Hurtigst"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Meget lav"</item>
-    <item msgid="2692137425242433765">"Lav"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Høj"</item>
-    <item msgid="4699640516390840297">"Meget høj"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanner ..."</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 82a1d4d..fc73694 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Deaktiveret af administratoren"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeraftryk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. fingeraftryk"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Brug fingeraftryk til"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Afspil ikke lyd, når tabletcomputeren isættes eller fjernes fra dockingstation"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personlig"</string>
-    <string name="category_work" msgid="8699184680584175622">"Arbejde"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Arbejdsprofilkonti – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personlig profilkonti"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Arbejdskonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Deaktiveret"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Altid slået til"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisk"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertér til filkryptering"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertér…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Allerede filkrypteret"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Konverterer til filbaseret kryptering"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konvertér datapartitionen til filbaseret kryptering.\nAdvarsel! Alle dine data vil blive slettet.\n Dette er en alfafunktion, og den fungerer muligvis ikke korrekt.\n Tryk på \"Ryd og konvertér…\" for at fortsætte."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Ryd og konvertér…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</string>
     <string name="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Udskrivningstjenester"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dit dokument går muligvis gennem én eller flere servere på vej til printeren."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Der blev ikke fundet nogen printere"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Indstillinger"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Komplet kommandoord og handling"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Enkel oplæsning"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Denne indtalingstjeneste vil kunne foretage lydovervågning, der altid er slået til, og styre taleaktiverede apps på dine vegne. Den kommer fra appen <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vil du aktivere brugen af denne tjeneste?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Indstillinger for oplæsning"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Oplæsning"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Brug altid mine indstil."</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardindstillingerne nedenfor tilsidesætter indstillinger for app"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardindstillinger"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmaskine"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Angiv, at talesyntesprogrammet skal bruges til at oplæse tekst"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Talehastighed"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Oplæsningshastighed for tekst"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toneleje"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påvirker tonen af den talte tekst"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprog"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Brug systemsprog"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Der er ikke valgt sprog"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Angiver det sprog, der skal bruges til oplæsning af tekst"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Lyt til et eksempel"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Afspil en kort demonstration af talesyntese"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installer stemmedata"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer de påkrævede stemmedata for talesyntese"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"De påkrævede stemmer til talesyntese er allerede installeret korrekt"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Dine indstillinger er blevet ændret. Dette er et eksempel på, hvordan de lyder."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Maskinen, som du har valgt, kan ikke køre."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vælg en anden maskine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne funktion kan indsamle al den tekst, der læses op, inklusive personlige data såsom adgangskoder og kreditkortnumre. Den kommer fra <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-maskinen. Vil du aktivere brug af denne talesyntesemaskine?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Oplæsning på dette sprog fungerer kun, når der findes en aktiv netværksforbindelse."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dette er et eksempel på talesyntese."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status for standardsprog"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> er fuldt understøttet"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> kræver netværksforbindelse"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> understøttes ikke"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Kontrollerer..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Maskiner"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-indstillinger"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktiveret"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er deaktiveret"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine-indstillinger"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Indstillinger for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Sprog og stemmer"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installeret"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Ikke installeret"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kvinde"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mand"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Talesyntesemaskine er installeret"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktivér ny maskine før brug."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Åbn indstillinger for maskinen"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Foretrukken maskine"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Generelt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Strømkontrol"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Opdaterer indstillinger for Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Opdaterer Bluetooth-indstilling"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis \"Appen svarer ikke\" for baggrundsapps"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Gennemtving tilladelse til eksternt lager"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Gør det muligt at overføre enhver app til et eksternt lager uafhængigt af manifestværdier"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Tving aktiviteter til at kunne tilpasses"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Sørger for, at alle aktiviteter kan tilpasses flere vinduer uafhængigt af manifestværdier."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataforbrug"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kun alarmer"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total stilhed"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuelle afbrydelser"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone ved opkald"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardringetone for underretninger"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også ved opkald"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hvordan skal underretninger vises, når din enhed er låst?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Underretninger"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Emneunderretninger"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andre lyde"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toner for numerisk tastatur"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Lyde for skærmlås"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldrig underretninger fra denne app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Vis som prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Tillad, at underretninger fra denne app høres, når \"Forstyr ikke\" er indstillet til \"Kun prioritet\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillad smugkig"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lad denne app fremhæve visse underretninger ved kortvarigt at lade dem glide ind i synsfeltet på den aktuelle skærm"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Tilsidesæt Forstyr ikke"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er slået til med angivelsen Kun prioritet"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skjul følsomt indhold"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Skjul indholdet i underretninger fra denne app, som kan afsløre personlige oplysninger, når enheden er låst"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Skjul indhold i disse underretninger, som kan afsløre personlige oplysninger, når enheden er låst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeret"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Følsomme"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Skift til Kun alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Skift til Afbryd altid"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ingen skærmafbrydelser"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, vises på den aktuelle skærm"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Intet underretningslys"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, får lyset til at blinke"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Bed om pinkode inden frigørelse"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Bed om adgangskode inden frigørelse"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheden ved frigørelse"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Arbejdsprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbejdsprofil administreres af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administreret af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Underretninger"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloker"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Følsomt indhold skjules"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteret"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ingen smugkig"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Arbejde"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeret"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Følsomt indhold skjules"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ingen smugkig"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domænets webadresser"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Deaktiveret af administratoren"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurer apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Vælg profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Apptilladelser"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ud af <xliff:g id="COUNT_1">%d</xliff:g> apps har yderligere adgangstilladelse"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ud af <xliff:g id="COUNT_1">%d</xliff:g> apps har tilladelse"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Farvetilstand for billeder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Brug sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Visningsskala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"visningstæthed zoom skala skalering"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Lille"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stor"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Større"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Størst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Tilpasset (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Se alle"</string>
+    <string name="see_less" msgid="1250265310929558370">"Se mindre"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Afbrudt"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Du har brugt <xliff:g id="AMOUNT">%1$s</xliff:g> data"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps er installeret"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Du har brugt <xliff:g id="SIZE1">%1$s</xliff:g> af <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Tilpasset lysstyrke er slået TIL"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Tilpasset lysstyrke er slået FRA"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index ab3e0e9..f369933 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Groß"</item>
     <item msgid="7786168277516233536">"Sehr groß"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Sehr langsam"</item>
-    <item msgid="2361722960903353554">"Langsam"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Schnell"</item>
-    <item msgid="1370673569131070146">"Schneller"</item>
-    <item msgid="4648206845228970803">"Sehr schnell"</item>
-    <item msgid="4977949754169483251">"Schnell"</item>
-    <item msgid="6106302964845503577">"Sehr schnell"</item>
-    <item msgid="6800277205640837264">"Am schnellsten"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Sehr niedrig"</item>
-    <item msgid="2692137425242433765">"Niedrig"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Hoch"</item>
-    <item msgid="4699640516390840297">"Sehr hoch"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scan läuft…"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 962844e..5ea5799 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Vom Administrator deaktiviert"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerabdruck"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Fingerabdrücke verwalten"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Abdruck nutzen für"</string>
@@ -812,8 +813,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Beim Anschließen oder Trennen des Tablets vom Dock keinen Sound abspielen"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Beim Anschließen oder Trennen des Telefons vom Dock keinen Ton abspielen"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konten"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Nutzer"</string>
-    <string name="category_work" msgid="8699184680584175622">"Geschäftlich"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Konten für Arbeitsprofil – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Konten für persönliches Profil"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Arbeitskonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -836,6 +835,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Deaktiviert"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Immer an"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisch"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Zu Dateiverschlüsselung wechseln"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Wechseln…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dateiverschlüsselung wird bereits verwendet."</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Zu Dateiverschlüsselung wechseln"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Wechseln Sie von Datenpartitions- zu dateibasierter Verschlüsselung.\n !!Achtung!! Dadurch werden alle Ihre Daten gelöscht.\n Es handelt sich um eine Alphaversion, die möglicherweise nicht korrekt funktioniert.\n Wählen Sie \"Wischen und wechseln…\" aus, um fortzufahren."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Wischen und wechseln…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -909,7 +914,7 @@
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Akku- und Netzwerkstatus und andere Informationen"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonnummer, Signal usw."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Speicher"</string>
-    <string name="storage_usb_settings" msgid="642612065405691122">"Speicher &amp; USB"</string>
+    <string name="storage_usb_settings" msgid="642612065405691122">"Speicherplatz &amp; USB"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Speichereinstellungen"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-Speicher trennen, verfügbaren Speicher anzeigen"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-Karte entnehmen, verfügbaren Speicher anzeigen"</string>
@@ -1698,8 +1703,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drucken"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Druckdienste"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Ihr Dokument passiert bei der Übermittlung an den Drucker möglicherweise einen oder mehrere Server."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Keine Dienste installiert"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Keine Drucker gefunden"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Einstellungen"</string>
@@ -1880,54 +1883,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Vollständiger Sprachinteraktionsdienst einschließlich der Verwendung von Hotwords"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Einfache Text-in-Sprache-Funktion"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Dieser Spracheingabedienst kann Spracheingaben jederzeit überwachen und Anwendungen, die Sprachbefehle unterstützen, für Sie steuern. Er wird von der Anwendung <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> bereitgestellt. Möchten Sie diesen Dienst aktivieren?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Text-in-Sprache"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Text-in-Sprache-Ausgabe"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einstellungen verwenden"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardeinstellungen unten überschreiben App-Einstellungen."</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardeinstellungen"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmodul"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Engine für die Sprachsynthese festlegen, die für gesprochenen Text verwendet werden soll"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Sprechgeschwindigkeit"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Geschwindigkeit, mit der der Text gesprochen wird"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonlage"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Beeinflusst den Klang des gesprochenen Textes"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprache"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Systemsprache verwenden"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keine Sprache ausgewählt"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Legt die sprachspezifische Stimme für den gesprochenen Text fest"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Beispiel anhören"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Kurzes Beispiel der Sprachsynthese abspielen"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Sprachdaten installieren"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sprachdaten für Sprachsynthese installieren"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Die für die Sprachsynthese erforderlichen Stimmen sind bereits installiert."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ihre Einstellungen wurden geändert. Dies ist ein Klangbeispiel."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Das ausgewählte Modul kann nicht ausgeführt werden."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurieren"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Anderes Modul auswählen"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Dieses Sprachsynthesemodul kann den gesamten gesprochenen Text erfassen, einschließlich personenbezogener Daten wie Passwörter und Kreditkartennummern. Es ist Teil der App \"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>\". Möchten Sie dieses Sprachsynthesemodul aktivieren?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Für diese Sprache ist zur Text-in-Sprache-Ausgabe eine aktive Netzwerkverbindung erforderlich."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dies ist ein Beispiel für Sprachsynthese."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status der Standardsprache"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> wird vollständig unterstützt."</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> erfordert eine Netzwerkverbindung."</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> wird nicht unterstützt."</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Wird geprüft..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Module"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-Einstellungen"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ist aktiviert."</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ist deaktiviert."</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Moduleinstellungen"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Einstellungen für <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Sprachen und Stimmen"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installiert"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nicht installiert"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Weiblich"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Männlich"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Sprachsynthese installiert"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Modul vor Verwendung aktivieren"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Einstellungen der Suchmaschine starten"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Bevorzugtes Modul"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Allgemein"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiesteuerung"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"WLAN-Einstellung wird aktualisiert..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
@@ -2168,10 +2123,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialogfeld \"App antwortet nicht\" für Hintergrund-Apps anzeigen"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Externe Speichernutzung von Apps erlauben"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Ermöglicht es jeder qualifizierten App, Daten auf externen Speicher zu schreiben, unabhängig von den Manifestwerten"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Anpassen der Größe von Aktivitäten erzwingen"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Ermöglicht es, die Größe aller Aktivitäten an den Mehrfenstermodus anzupassen, unabhängig von den Manifestwerten."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datenverbrauch"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Datennutzung durch Apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ihr Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
@@ -2563,6 +2516,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Nur Wecker"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Lautlos"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuelle Unterbrechungen"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardton für Benachrichtigungen"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bei Anrufen auch vibrieren"</string>
@@ -2576,6 +2530,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Wie sollen Benachrichtigungen angezeigt werden, wenn Ihr Gerät gesperrt ist?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Benachrichtigungen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Benachrichtigungen zu Themen"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andere Töne"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Wähltastentöne"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Töne für die Displaysperre"</string>
@@ -2603,12 +2558,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Benachrichtigungen von dieser App nie anzeigen"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Als Priorität behandeln"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Die Benachrichtigungen dieser App dürfen hörbar sein, wenn \"Nicht stören\" auf \"Nur wichtige\" festgelegt ist."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Kurzes Einblenden zulassen"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Diese App darf bestimmte Benachrichtigungen durch kurzes Einblenden auf dem aktuellen Bildschirm hervorheben."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" überschreiben"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Vertrauliche Inhalte ausblenden"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Wenn das Gerät gesperrt ist, werden Inhalte aus den Benachrichtigungen der App ausgeblendet, die personenbezogene Daten preisgeben könnten."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Wenn das Gerät gesperrt ist, werden Inhalte aus diesen Benachrichtigungen ausgeblendet, die personenbezogene Daten offenlegen könnten."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockiert"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Wichtig"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensibel"</string>
@@ -2679,6 +2632,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Bis <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> zur Option \"Nur Wecker\" wechseln"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zur Option \"Immer unterbrechen\" wechseln"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Keine Unterbrechungen auf dem Bildschirm"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Kein Erscheinen von Benachrichtigungen auf dem aktuellen Bildschirm, die mittels \"Bitte nicht stören\" stummgeschaltet wurden"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Keine Benachrichtigungsleuchte"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Kein Pulsieren der Leuchte bei mittels \"Bitte nicht stören\" stummgeschalteten Benachrichtigungen"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
@@ -2691,7 +2648,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vor Beenden nach PIN fragen"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vor dem Beenden nach Passwort fragen"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Gerät beim Beenden sperren"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Arbeitsprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dieses Arbeitsprofil wird verwaltet von:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Verwaltet von <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentell)"</string>
@@ -2744,9 +2700,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Benachrichtigungen"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Aus"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Vertrauliche Inhalte verborgen"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Wichtig"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Kein kurzes Einblenden"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2768,15 +2721,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Nutzer"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Arbeit"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blockiert"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Wichtig"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Vertrauliche Inhalte verborgen"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Kein kurzes Einblenden"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Mit Domain-URLs"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Vom Administrator deaktiviert"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps konfigurieren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil auswählen"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App-Berechtigungen"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps haben zusätzliche Zugriffsrechte."</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps sind berechtigt."</string>
@@ -2813,7 +2762,7 @@
     <string name="permit_usage_access" msgid="4012876269445832300">"Zugriff auf Nutzungsdaten gewähren"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"App-Nutzungseinstellungen"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Der Zugriff auf die Nutzungsdaten ermöglicht es einer App, verschiedene Informationen zu erfassen, unter anderem, welche anderen Apps Sie wie oft verwenden, welchen Mobilfunkanbieter Sie nutzen und welche Spracheinstellungen Sie festgelegt haben."</string>
-    <string name="memory_settings_title" msgid="7490541005204254222">"Speicher"</string>
+    <string name="memory_settings_title" msgid="7490541005204254222">"Arbeitsspeicher"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Speicherdetails"</string>
     <string name="always_running" msgid="6042448320077429656">"Immer ausgeführt (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="6611250683037700864">"Gelegentlich ausgeführt (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -2935,4 +2884,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Farbmodus für Bilder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB verwenden"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Displaymaßstab"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display dichte zoom maßstab skalierung"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Klein"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Mittel"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Groß"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Größer"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Am größten"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Benutzerdefiniert (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Alle anzeigen"</string>
+    <string name="see_less" msgid="1250265310929558370">"Weniger anzeigen"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Verbindung getrennt"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> der Daten genutzt"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> Apps installiert"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> von <xliff:g id="SIZE2">%2$s</xliff:g> genutzt"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Für \"Adaptive Helligkeit\" ist \"An\" festgelegt."</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Für \"Adaptive Helligkeit\" ist \"Aus\" festgelegt."</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 4666f36..721367a 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Μεγάλο μέγεθος"</item>
     <item msgid="7786168277516233536">"Τεράστια"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Πολύ αργός"</item>
-    <item msgid="2361722960903353554">"Αργός"</item>
-    <item msgid="1145554631248513562">"Κανονική"</item>
-    <item msgid="7553665153391107454">"Γρήγορη"</item>
-    <item msgid="1370673569131070146">"Γρήγορα"</item>
-    <item msgid="4648206845228970803">"Πολύ γρήγορα"</item>
-    <item msgid="4977949754169483251">"Εξαιρετικά γρήγορα"</item>
-    <item msgid="6106302964845503577">"Πάρα πολύ γρήγορα"</item>
-    <item msgid="6800277205640837264">"Ταχύτατα"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Πολύ χαμηλός"</item>
-    <item msgid="2692137425242433765">"Χαμηλή"</item>
-    <item msgid="3332408460740717754">"Κανονική"</item>
-    <item msgid="4907380534957572531">"Υψηλή"</item>
-    <item msgid="4699640516390840297">"Πολύ υψηλός"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Σάρωση..."</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b1b2f38..dd21bd7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Απενεργοποιήθηκε από το διαχειριστή"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Δακτυλικά αποτυπώματα"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Διαχείριση μον.χαρακτ."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Χρήση μον.χαρακτ.για"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του tablet από τη βάση σύνδεσης"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
     <string name="account_settings" msgid="6403589284618783461">"Λογαριασμοί"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Προσωπικό"</string>
-    <string name="category_work" msgid="8699184680584175622">"Εργασία"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Λογαριασμοί προφίλ εργασίας - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Λογαριασμοί προσωπικών προφίλ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Λογαριασμός εργασίας - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Ανενεργό"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Πάντα ενεργό"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Αυτόματο"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Μετατροπή σε κρυπτογράφηση αρχείου"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Μετατροπή…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Με κρυπτογράφηση αρχείου"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Μετατροπή σε κρυπτογράφηση βάσει αρχείου…"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Μετατροπή τμήματος δεδομένων σε κρυπτογράφηση βάσει αρχείου.\n !!Προσοχή!! Με αυτήν την ενέργεια, θα διαγραφούν όλα τα δεδομένα σας.\n Αυτή η λειτουργία βρίσκεται σε δοκιμαστικό στάδιο alpha και ενδέχεται να μην λειτουργεί σωστά.\n Πατήστε \"Εκκαθάριση και μετατροπή…\" για να συνεχίσετε."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Εκκαθάριση και μετατροπή…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Χρόνος αδράνειας"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Η οθόνη απενεργοποιείται"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</string>
     <string name="print_settings" msgid="4742428530112487843">"Εκτύπωση"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Υπηρεσίες εκτύπωσης"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Το έγγραφό σας μπορεί να περάσει από έναν ή περισσότερους διακομιστές κατά τη μετάβαση στον εκτυπωτή."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Δεν βρέθηκαν εκτυπωτές"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ρυθμίσεις"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Πλήρης λέξη-κλειδί και αλληλεπίδραση"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Μετατροπή απλής ομιλίας σε κείμενο"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Αυτή η υπηρεσία φωνητικής εισαγωγής θα έχει τη δυνατότητα να εκτελεί διαρκώς ενεργή παρακολούθηση φωνητικών εντολών και να ελέγχει τις εφαρμογές με ενεργοποιημένες τις φωνητικές εντολές εκ μέρους σας. Προέρχεται από την εφαρμογή <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Ενεργοποίηση της χρήσης αυτής της υπηρεσίας;"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Ρυθμίσεις μετατροπής κειμένου σε ομιλία"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Έξοδος μετατροπής κειμένου σε ομιλία"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Χρήση των ρυθμίσεών μου πάντα"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Οι παρακάτω προεπιλεγμένες ρυθμίσεις αντιγράφουν τις ρυθμίσεις της εφαρμογής"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Προεπιλεγμένες ρυθμίσεις"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Προεπιλεγμένη μηχανή"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Ρύθμιση του μηχανισμού σύνθεσης ομιλίας για χρήση με προφορικό κείμενο"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Ταχύτητα λόγου"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Ταχύτητα με την οποία εκφωνείται το κείμενο"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Επηρεάζει τον τόνο του προφορικού κειμένου"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Γλώσσα"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Χρήση γλώσσας συστήματος"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Δεν έχει επιλεγεί γλώσσα"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ορίζει τη φωνή που σχετίζεται με τη γλώσσα για το κείμενο ομιλίας"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Ακούστε ένα παράδειγμα"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Αναπαραγωγή μιας σύντομης αναπαράστασης σύνθεσης λόγου"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Εγκατάσταση δεδομένων φωνής"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Εγκατάσταση δεδομένων ήχου που απαιτούνται για τη σύνθεση ήχου"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Οι φωνές που απαιτούνται για τη σύνθεση λόγου έχουν ήδη εγκατασταθεί σωστά"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Οι ρυθμίσεις σας άλλαξαν. Το παρόν είναι ένα παράδειγμα του ήχου τους."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Δεν είναι δυνατή η εκτέλεση της μηχανής που επιλέξατε."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Διαμόρφωση"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Επιλέξτε μια άλλη μηχανή"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Αυτή η μηχανή σύνθεσης ομιλίας μπορεί να συγκεντρώσει όλο το κείμενο που θα εκφωνηθεί, συμπεριλαμβανομένων προσωπικών δεδομένων όπως οι κωδικοί πρόσβασης και οι αριθμοί πιστωτικών καρτών. Προέρχεται από τη μηχανή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Να ενεργοποιηθεί η μηχανή σύνθεσης ομιλίας;"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Αυτή η γλώσσα απαιτεί μια ενεργή σύνδεση δικτύου για τη μετατροπή κειμένου σε ομιλία."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Αυτό είναι ένα παράδειγμα σύνθεσης λόγου"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Κατάσταση προεπιλεγμένης γλώσσας"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Τα <xliff:g id="LOCALE">%1$s</xliff:g> υποστηρίζονται πλήρως"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Τα <xliff:g id="LOCALE">%1$s</xliff:g> απαιτούν σύνδεση δικτύου"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Δεν υποστηρίζονται τα <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Γίνεται έλεγχος"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Μηχανές"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ρυθμίσεις <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Η επιλογή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> είναι ενεργοποιημένη"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Η επιλογή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> είναι απενεργοποιημένη"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Ρυθμίσεις μηχανής"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Ρυθμίσεις για: <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Γλώσσες και φωνές"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Εγκατεστημένο"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Δεν έχει εγκατασταθεί"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Γυναίκα"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Άντρας"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Εγκατ. μηχανής σύνθεσης λόγου"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Ενερ. νέας μηχ. πριν τη χρήση."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Εκκίνηση ρυθμίσεων μηχανής"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Προτεινόμενη μηχανή"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Γενικά"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Έλεγχος ισχύος"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ενημέρωση ρύθμισης Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ενημέρωση ρύθμισης Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Εμφ.του παραθ. \"Η εφαρμ.δεν αποκρ.\" για εφ.παρασκ."</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Να επιτρέπονται υποχρεωτικά εφαρμογές σε εξωτ.συσ."</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Κάνει κάθε εφαρμογή κατάλληλη για εγγραφή σε εξωτερικό χώρο αποθήκευσης, ανεξάρτητα από τις τιμές του μανιφέστου"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Αναγκαστική δυνατότητα αλλαγής μεγέθους δραστηριοτήτων"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Να έχουν όλες οι δραστηριότητες δυνατότητα αλλαγής μεγέθους για την προβολή πολλαπλών παραθύρων, ανεξάρτητα από τις τιμές του μανιφέστου."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Χρήση δεδομένων εφαρμογής"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ο υπολογισμός δεδομένων εταιρείας κινητής τηλεφωνίας μπορεί να διαφέρει από τη συσκευή σας."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Μόνο ειδοποιήσεις"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Πλήρης σίγαση"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Οπτικές διακοπές"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Και δόνηση στις κλήσεις"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Πώς θέλετε να εμφανίζονται οι ειδοποιήσεις στη συσκευή σας, όταν η συσκευή σας είναι κλειδωμένη;"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Ειδοποιήσεις"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Ειδοπ/σεις εφ/γών"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Ειδοποιήσεις θέματος"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Άλλοι ήχοι"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Ήχοι πληκτρολογίου κλήσης"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ήχοι κλειδώματος οθόνης"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Αποκλεισμός όλων"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Να μην εμφανίζονται ποτέ ειδοποιήσεις από αυτήν την εφαρμογή"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Αντιμετώπιση ως προτεραιότητα"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Να επιτρέπεται η εκφώνηση των ειδοποιήσεων αυτής της εφαρμογής όταν η λειτουργία \"Μην ενοχλείτε\" έχει οριστεί μόνο για ειδοποιήσεις προτεραιότητας."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Να επιτρέπεται η σύντομη προβολή"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Να επιτρέπεται σε αυτήν την εφαρμογή να δίνει έμφαση σε συγκεκριμένες ειδοποιήσεις, σύροντάς τες σύντομα στην προβολή στην τρέχουσα οθόνη"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Παράκαμψη λειτουργίας \"Μην ενοχλείτε\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Να επιτραπεί σε αυτές τις ειδοποιήσεις να εξακολουθήσουν να διακόπτουν τη λειτουργία \"Μην ενοχλείτε\" όταν έχει οριστεί σε Μόνο προτεραιότητας"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Απόκρυψη ευαίσθητου περιεχομένου"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Όταν η συσκευή είναι κλειδωμένη, να γίνεται απόκρυψη του περιεχομένου στις ειδοποιήσεις αυτής της εφαρμογής που ενδέχεται να αποκαλύπτουν προσωπικά στοιχεία"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Όταν η συσκευή είναι κλειδωμένη, η απόκρυψη περιεχομένου σε αυτές τις ειδοποιήσεις ενδέχεται να αποκαλύψει ιδιωτικές πληροφορίες"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Έχει αποκλειστεί"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Προτεραιότητα"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ευαίσθητο"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Αλλαγή σε ξυπνητήρια μόνο έως τις <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Αλλαγή σε διακοπές πάντα"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Όχι διακοπές οθόνης"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Αποτρέπει τη σύντομη προβολή ή την εμφάνιση ειδοποιήσεων που έχουν τεθεί σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Όχι φως ειδοποίησης"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Αποτρέπει την ενεργοποίηση της φωτεινής ένδειξης από τις ειδοποιήσεις που έχουν τεθεί σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Να ζητείται το PIN πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Να ζητείται κωδικός πρόσβασης πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Κλείδωμα της συσκευής κατά το ξεκαρφίτσωμα"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Προφίλ εργασίας"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Η διαχείριση αυτού του προφίλ γίνεται από:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Διαχείριση από <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Πειραματικό)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Ειδοποιήσεις"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Κανονικό"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Αποκλεισμός"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Το ευαίσθητο περιεχόμενο είναι κρυφό"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Προτεραιότητας"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Χωρίς σύντομη προβολή"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Προσωπικό"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Εργασία"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Αποκλεισμένες"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Προτεραιότητας"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Το ευαίσθητο περιεχόμενο είναι κρυφό"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Χωρίς σύντομη προβολή"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Με διευθύνσεις URL τομέα"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Απενεργοποιήθηκε από το διαχειριστή"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Διαμόρφωση εφ/γών"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Επιλογή προφίλ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Δικαιώματα εφαρμογών"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Επιτρέπεται επιπλέον πρόσβαση σε <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμ."</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Επιτρέπονται <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμογές"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Λειτουργία χρώματος εικόνας"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Χρήση sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Κλίμακα προβολής"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"κλιμάκωση κλίμακας εστίασης πυκνότητας προβολής"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Μικρά"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Κανονικά"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Μεγάλα"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Πιο μεγάλα"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Μεγαλύτερα"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Προσαρμοσμένη (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Εμφάνιση όλων"</string>
+    <string name="see_less" msgid="1250265310929558370">"Εμφάνιση λιγότερων"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Αποσυνδεδεμένο"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Χρησιμοποιήθηκε το <xliff:g id="AMOUNT">%1$s</xliff:g> των δεδομένων"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Εγκαταστάθηκαν <xliff:g id="COUNT">%1$d</xliff:g> εφαρμογές"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Χρησιμοποιήθηκαν <xliff:g id="SIZE1">%1$s</xliff:g> από <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Η προσαρμόσιμη φωτεινότητα είναι ΕΝΕΡΓΗ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Η προσαρμόσιμη φωτεινότητα είναι ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΗ"</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index a3af33e..2ebad91 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Large"</item>
     <item msgid="7786168277516233536">"Huge"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Very slow"</item>
-    <item msgid="2361722960903353554">"Slow"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Fast"</item>
-    <item msgid="1370673569131070146">"Faster"</item>
-    <item msgid="4648206845228970803">"Very fast"</item>
-    <item msgid="4977949754169483251">"Rapid"</item>
-    <item msgid="6106302964845503577">"Very rapid"</item>
-    <item msgid="6800277205640837264">"Fastest"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Very low"</item>
-    <item msgid="2692137425242433765">"Low"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"High"</item>
-    <item msgid="4699640516390840297">"Very high"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanning…"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 9e63401..3a32303 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disabled by administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Work"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disabled"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Always on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convert…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Converting to file-based encryption"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convert data partition to file-based encryption.\n !!Warning!! This will delete all your data.\n This feature is alpha, and may not work correctly.\n Press \'Wipe and convert…\' to continue."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Wipe and convert…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Your document may pass through one or more servers on its way to the printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Full hotword and interaction"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Simple speech to text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"This voice input service will be able to perform always-on voice monitoring, and control voice enabled applications on your behalf. It comes from the <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> application. Enable the use of this service?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Text-to-speech settings"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Text-to-speech output"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Always use my settings"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Default engine"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Set the speech synthesis engine to be used for spoken text"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Speech rate"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Speed at which the text is spoken"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Use system language"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Install voice data"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Install the voice data required for speech synthesis"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voices required for speech synthesis already properly installed"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Your settings have changed. This is an example of how they sound."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"The engine you have chosen can\'t run."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"This language requires a working network connection for text-to-speech output."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"This is an example of speech synthesis"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Default language status"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> is fully supported"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requires network connection"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> is not supported"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Checking..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is disabled"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine settings"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Settings for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Languages and voices"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installed"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Not installed"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Female"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Male"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Speech synthesis engine installed"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Enable a new engine before use."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Launch engine settings"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferred engine"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Show App Not Responding dialogue for background apps"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Force allow apps on external"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Makes any app eligible to be written to external storage, regardless of manifest values"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Force activities to be re-sizable"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Makes all activities re-sizable for multi-window, regardless of manifest values."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visual interruptions"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"When your device is locked, how do you want notifications to show?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Topic notifications"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Treat as priority"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Let this app\'s notifications be heard when Do not disturb is set to Priority only"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Allow peeking"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Let this app emphasise certain notifications by sliding them briefly into view on the current screen"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hide sensitive content"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"When the device is locked, hide content in this app\'s notifications that might reveal private information"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"When the device is locked, hide content in these notifications that might reveal private information"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"No screen interruptions"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"No notification light"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Prevent notifications silenced by Do Not Disturb from causing the light to pulse"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifications"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Block"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Sensitive content hidden"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Priority"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"No peeking"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Sensitive content hidden"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"No peeking"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Display scale"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale scaling"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Small"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Large"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Larger"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Largest"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"See all"</string>
+    <string name="see_less" msgid="1250265310929558370">"See less"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Disconnected"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> of data used"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps installed"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> of <xliff:g id="SIZE2">%2$s</xliff:g> used"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Adaptive brightness is ON"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Adaptive brightness is OFF"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index a3af33e..2ebad91 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Large"</item>
     <item msgid="7786168277516233536">"Huge"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Very slow"</item>
-    <item msgid="2361722960903353554">"Slow"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Fast"</item>
-    <item msgid="1370673569131070146">"Faster"</item>
-    <item msgid="4648206845228970803">"Very fast"</item>
-    <item msgid="4977949754169483251">"Rapid"</item>
-    <item msgid="6106302964845503577">"Very rapid"</item>
-    <item msgid="6800277205640837264">"Fastest"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Very low"</item>
-    <item msgid="2692137425242433765">"Low"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"High"</item>
-    <item msgid="4699640516390840297">"Very high"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanning…"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9e63401..3a32303 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disabled by administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Work"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disabled"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Always on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convert…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Converting to file-based encryption"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convert data partition to file-based encryption.\n !!Warning!! This will delete all your data.\n This feature is alpha, and may not work correctly.\n Press \'Wipe and convert…\' to continue."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Wipe and convert…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Your document may pass through one or more servers on its way to the printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Full hotword and interaction"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Simple speech to text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"This voice input service will be able to perform always-on voice monitoring, and control voice enabled applications on your behalf. It comes from the <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> application. Enable the use of this service?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Text-to-speech settings"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Text-to-speech output"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Always use my settings"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Default engine"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Set the speech synthesis engine to be used for spoken text"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Speech rate"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Speed at which the text is spoken"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Use system language"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Install voice data"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Install the voice data required for speech synthesis"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voices required for speech synthesis already properly installed"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Your settings have changed. This is an example of how they sound."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"The engine you have chosen can\'t run."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"This language requires a working network connection for text-to-speech output."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"This is an example of speech synthesis"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Default language status"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> is fully supported"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requires network connection"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> is not supported"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Checking..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is disabled"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine settings"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Settings for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Languages and voices"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installed"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Not installed"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Female"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Male"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Speech synthesis engine installed"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Enable a new engine before use."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Launch engine settings"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferred engine"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Show App Not Responding dialogue for background apps"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Force allow apps on external"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Makes any app eligible to be written to external storage, regardless of manifest values"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Force activities to be re-sizable"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Makes all activities re-sizable for multi-window, regardless of manifest values."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visual interruptions"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"When your device is locked, how do you want notifications to show?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Topic notifications"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Treat as priority"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Let this app\'s notifications be heard when Do not disturb is set to Priority only"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Allow peeking"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Let this app emphasise certain notifications by sliding them briefly into view on the current screen"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hide sensitive content"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"When the device is locked, hide content in this app\'s notifications that might reveal private information"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"When the device is locked, hide content in these notifications that might reveal private information"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"No screen interruptions"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"No notification light"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Prevent notifications silenced by Do Not Disturb from causing the light to pulse"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifications"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Block"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Sensitive content hidden"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Priority"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"No peeking"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Sensitive content hidden"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"No peeking"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Display scale"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale scaling"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Small"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Large"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Larger"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Largest"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"See all"</string>
+    <string name="see_less" msgid="1250265310929558370">"See less"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Disconnected"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> of data used"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps installed"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> of <xliff:g id="SIZE2">%2$s</xliff:g> used"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Adaptive brightness is ON"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Adaptive brightness is OFF"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index a3af33e..2ebad91 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Large"</item>
     <item msgid="7786168277516233536">"Huge"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Very slow"</item>
-    <item msgid="2361722960903353554">"Slow"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Fast"</item>
-    <item msgid="1370673569131070146">"Faster"</item>
-    <item msgid="4648206845228970803">"Very fast"</item>
-    <item msgid="4977949754169483251">"Rapid"</item>
-    <item msgid="6106302964845503577">"Very rapid"</item>
-    <item msgid="6800277205640837264">"Fastest"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Very low"</item>
-    <item msgid="2692137425242433765">"Low"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"High"</item>
-    <item msgid="4699640516390840297">"Very high"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanning…"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 9e63401..3a32303 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disabled by administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Work"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disabled"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Always on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convert…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Converting to file-based encryption"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convert data partition to file-based encryption.\n !!Warning!! This will delete all your data.\n This feature is alpha, and may not work correctly.\n Press \'Wipe and convert…\' to continue."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Wipe and convert…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Your document may pass through one or more servers on its way to the printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Full hotword and interaction"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Simple speech to text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"This voice input service will be able to perform always-on voice monitoring, and control voice enabled applications on your behalf. It comes from the <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> application. Enable the use of this service?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Text-to-speech settings"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Text-to-speech output"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Always use my settings"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"default settings"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Default engine"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Set the speech synthesis engine to be used for spoken text"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Speech rate"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Speed at which the text is spoken"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Use system language"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Install voice data"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Install the voice data required for speech synthesis"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voices required for speech synthesis already properly installed"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Your settings have changed. This is an example of how they sound."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"The engine you have chosen can\'t run."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"This language requires a working network connection for text-to-speech output."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"This is an example of speech synthesis"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Default language status"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> is fully supported"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requires network connection"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> is not supported"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Checking..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is disabled"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine settings"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Settings for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Languages and voices"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installed"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Not installed"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Female"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Male"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Speech synthesis engine installed"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Enable a new engine before use."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Launch engine settings"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferred engine"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Show App Not Responding dialogue for background apps"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Force allow apps on external"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Makes any app eligible to be written to external storage, regardless of manifest values"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Force activities to be re-sizable"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Makes all activities re-sizable for multi-window, regardless of manifest values."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarms only"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total silence"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visual interruptions"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"When your device is locked, how do you want notifications to show?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Topic notifications"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Never show notifications from this app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Treat as priority"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Let this app\'s notifications be heard when Do not disturb is set to Priority only"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Allow peeking"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Let this app emphasise certain notifications by sliding them briefly into view on the current screen"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hide sensitive content"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"When the device is locked, hide content in this app\'s notifications that might reveal private information"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"When the device is locked, hide content in these notifications that might reveal private information"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"No screen interruptions"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"No notification light"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Prevent notifications silenced by Do Not Disturb from causing the light to pulse"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifications"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Block"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Sensitive content hidden"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Priority"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"No peeking"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocked"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priority"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Sensitive content hidden"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"No peeking"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"With domain URLs"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disabled by administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Display scale"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale scaling"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Small"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Large"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Larger"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Largest"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"See all"</string>
+    <string name="see_less" msgid="1250265310929558370">"See less"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Disconnected"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> of data used"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps installed"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> of <xliff:g id="SIZE2">%2$s</xliff:g> used"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Adaptive brightness is ON"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Adaptive brightness is OFF"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 27677d8..2118469 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Muy lento"</item>
-    <item msgid="2361722960903353554">"Lento"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rápido"</item>
-    <item msgid="1370673569131070146">"A mayor velocidad"</item>
-    <item msgid="4648206845228970803">"A velocidad muy alta"</item>
-    <item msgid="4977949754169483251">"Veloz"</item>
-    <item msgid="6106302964845503577">"Muy rápido"</item>
-    <item msgid="6800277205640837264">"A velocidad máxima"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Muy bajo"</item>
-    <item msgid="2692137425242433765">"Bajo"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alta"</item>
-    <item msgid="4699640516390840297">"Muy alto"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Explorando..."</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 69c6c01..afb4e9f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Inhabilitada por el administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. huellas digitales"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella dig. para"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"No reproducir sonido cuando se inserte o elimine un tablet de la base."</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"No reproducir sonido al insertar o retirar el dispositivo de la base."</string>
     <string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabajo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Cuentas de perfil de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Cuentas de perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Cuenta de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Inhabilitado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Siempre activado"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir a encriptación de archivo"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está encriptado"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Convertir a encriptación basada en archivos"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convierte la partición de datos en una encriptación basada en archivos.\n Advertencia: Esta acción borrará todos los datos.\n Esta función se encuentra en fase Alfa y es posible que no funcione correctamente.\n Para continuar, presiona la opción para borrar y convertir."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Borrar y convertir…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Es posible que el documento pase por uno o varios servidores antes de imprimirse."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se instaló ningún servicio."</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No se encontraron impresoras"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuración"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Interacción y palabra clave completa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Voz a texto simple"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este servicio de entrada de voz puede supervisar que siempre esté activada la voz y controlar en tu nombre las aplicaciones que pueden utilizar la entrada de voz. Procede de <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. ¿Quieres habilitar el uso de este servicio?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configuración de texto a voz"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Salida de texto a voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar siempre mi config."</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"La configuración predeterminada anula la de la aplicación."</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminado"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Establecer el motor de síntesis de voz para usar con el texto por voz"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidad de voz"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidad en la que se habla el texto"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el tono del texto hablado"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Usar el idioma del sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establece la voz específica de un idioma para el texto hablado"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Escuchar un ejemplo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una pequeña demostración de síntesis de voz"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar datos de voz"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar los datos de voz necesarios para la síntesis de voz"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Las voces necesarias para la síntesis de voz ya han sido instaladas correctamente"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tu configuración ha cambiado. Éste es un ejemplo de cómo suenan."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"No se puede ejecutar el motor que elegiste."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Elegir otro motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz pueda recopilar todo el texto que se hablará, incluidos los datos personales como las contraseñas y los números de tarjetas de crédito. Proviene del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Deseas activar el uso de este motor de síntesis de voz?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma necesita una conexión de red en funcionamiento para la salida de texto a voz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ejemplo de síntesis de voz"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Estado del idioma predeterminado"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> es totalmente compatible."</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> requiere una conexión de red."</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> no es compatible."</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Comprobando…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuración de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está habilitado."</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está inhabilitada."</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuración del motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configuración de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas y voces"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalada"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"No se ha instalado."</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femenino"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Se instaló motor de síntesis de voz"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Habilita el motor para usarlo."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configuración de motor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar diálogo cuando las aplic. en 2do plano no responden"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forzar permisos en almacenamiento externo"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Cualquier aplicación puede escribirse en una memoria externa, independientemente de los valores del manifiesto."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forzar actividades para que cambien de tamaño"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permite que todas las actividades puedan cambiar de tamaño para el modo multiventana, sin importar los valores del manifiesto."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La forma en que el proveedor contabiliza los datos puede variar en tu dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silencio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupciones visuales"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo deseas ver las notificaciones cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificaciones"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificaciones por tema"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonos del teclado"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sonidos al bloquear pantalla"</string>
@@ -2600,12 +2555,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridad"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permita que se escuchen las notificaciones de esta app cuando No molestar está configurado solo para Prioridad"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir dar un vistazo"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permita que esta aplicación enfatice ciertas notificaciones deslizándolas brevemente a la vista en la pantalla actual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No interrumpir"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No interrumpir esté configurado como Solo prioridad"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar contenido confidencial"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Cuando el dispositivo está bloqueado, oculte el contenido de las notificaciones de esta aplicación que podría revelar información privada"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Cuando el dispositivo está bloqueado, ocultar cualquier contenido de estas notificaciones que pueda revelar información privada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Personal"</string>
@@ -2676,6 +2629,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a solo alarmas hasta la(s) <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Sin interrupciones de pantalla"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Previene que las notificaciones silenciadas por \"No molestar\" se visualicen o aparezcan en la pantalla"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Sin luz de notificación"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Previene que las notificaciones silenciadas por el modo \"No molestar\" emitan luz"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
@@ -2688,7 +2645,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar PIN para quitar fijación"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar contraseña para quitar fijación"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo al quitar fijación"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"La siguiente aplicación administra este perfil de trabajo:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2741,9 +2697,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificaciones"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloqueadas"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contenido confidencial oculto"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritarias"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Sin visualización"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2765,15 +2718,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarias"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contenido confidencial oculto"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Sin visualización"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Inhabilitado por el administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Elegir perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplic. con permiso de acceso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
@@ -2930,4 +2879,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de color de la imagen"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usa sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de visualización"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"configuración de la escala de zoom de densidad de la pantalla"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequeña"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Más grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Máxima"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ver todas"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desconectado"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de datos usados"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps instaladas"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> usados de <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"El brillo automático está ACTIVADO"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"El brillo automático está DESACTIVADO"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 652ea44..521a2cf 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Muy lenta"</item>
-    <item msgid="2361722960903353554">"Lenta"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="1370673569131070146">"Más rápida"</item>
-    <item msgid="4648206845228970803">"Muy rápida"</item>
-    <item msgid="4977949754169483251">"Superrápida"</item>
-    <item msgid="6106302964845503577">"Hiperrrápida"</item>
-    <item msgid="6800277205640837264">"Lo más rápido posible"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Muy bajo"</item>
-    <item msgid="2692137425242433765">"Bajo"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alto"</item>
-    <item msgid="4699640516390840297">"Muy alto"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Buscando..."</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 024e5ba..8178476 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Inhabilitado por el administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Administrar huellas"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella para"</string>
@@ -383,7 +384,7 @@
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Cifrar dispositivo?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado tarda aproximadamente 1 hora o más y el tablet se reinicia varias veces durante este proceso."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"La operación de cifrado no se puede deshacer y, si la interrumpes, perderás datos. El cifrado puede tardar 1 hora o más y el teléfono se reinicia varias veces durante este proceso."</string>
-    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Cifrando"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se cifra el tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se cifra el teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
     <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mientras se cifra el tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"No reproducir sonido al insertar o extraer el tablet de la base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"No reproducir sonido al insertar o extraer el teléfono de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabajo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Cuentas de perfil de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Cuentas de perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Cuenta de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Inhabilitado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Siempre activado"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir a cifrado de archivo"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está cifrado"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Convirtiendo a un cifrado basado en archivos"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convierte la partición de datos en un cifrado basado en archivos.\n Advertencia: Este proceso borrará todos los datos.\n Esta función es alpha y es posible que no funcione correctamente.\n Pulsa la opción Borrar y convertir… para continuar."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Borrar y convertir…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla se apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Ajustes"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Es posible que el documento pase por uno o varios servidores antes de imprimirse."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se ha instalado ningún servicio."</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No se encontraron impresoras"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ajustes"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Interacción y palabra activa completa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Síntesis de voz simple"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este servicio de entrada de voz podrá supervisar que la voz siempre esté activada y controlar las aplicaciones compatibles con la entrada de voz en tu nombre. Procede de la aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. ¿Quieres habilitar el uso de este servicio?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configuración síntesis voz"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Síntesis de voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar siempre mi configuración"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"La configuración predeterminada anula la de la aplicación."</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Ajustes predeterminados"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminado"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Establece el motor de síntesis de voz para que lo utilice el texto hablado"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidad de la voz"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidad a la que se lee el texto"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta al tono del texto hablado."</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Usar idioma del sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establecer la voz del idioma específico para el texto hablado"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Escuchar un ejemplo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una breve demostración de síntesis de voz"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar archivos de voz"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar los archivos de datos de voz necesarios para la síntesis de voz"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Las voces necesarias para la síntesis de voz ya están instaladas correctamente."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tu configuración ha cambiado. Este es un ejemplo de cómo suena."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"El motor seleccionado no se puede ejecutar."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Seleccionar otro motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz recopile todo el texto hablado, incluidos datos personales, como contraseñas y números de tarjeta de crédito. Procede del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Quieres habilitar el uso de este motor de síntesis de voz?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requiere una conexión de red activa para la salida de síntesis de voz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Este es un ejemplo de síntesis de voz"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Estado del idioma predeterminado"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"El <xliff:g id="LOCALE">%1$s</xliff:g> se admite completamente"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> requiere conexión a Internet"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"No se admite el <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Comprobando..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ajustes de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Se ha habilitado <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>."</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Se ha inhabilitado <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>."</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuración del motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Ajustes de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas y voces"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalada"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Sin instalar"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Mujer"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Hombre"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor síntesis de voz instalado"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Habilita el nuevo motor para usarlo."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configuración de motor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de la conexión Wi-Fi..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informar de que una aplicación en segundo plano no responde"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forzar permiso de aplicaciones de forma externa"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Hace que cualquier aplicación se pueda escribir en un dispositivo de almacenamiento externo, independientemente de los valores definidos"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forzar el ajuste de tamaño de las actividades"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permite que se pueda ajustar el tamaño de todas las actividades para el modo multiventana, independientemente de los valores establecidos."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de datos de la aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silencio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupciones visuales"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo quieres que se muestren las notificaciones cuando esté bloqueado el dispositivo?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificaciones"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificaciones de tema"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonos del teclado"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sonidos de bloqueo de pantalla"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"No mostrar nunca notificaciones de esta aplicación"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioritaria"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permitir que se escuchen las notificaciones de esta aplicación cuando la opción Solo prioritarias del modo No molestar esté activada"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir vista previa"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que esta aplicación destaque algunas notificaciones expandiéndolas en la pantalla actual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular la opción No molestar"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear estas notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar contenido confidencial"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Cuando el dispositivo esté bloqueado, ocultar el contenido de las notificaciones de esta aplicación que pueda revelar información privada"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Oculta el contenido de las notificaciones que pueda revelar información privada cuando el dispositivo está bloqueado"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueada"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a Solo alarmas hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Sin interrupciones"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedir que las notificaciones silenciadas por el modo No molestar aparezcan en la pantalla actual"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Sin luz de notificación"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedir que las notificaciones silenciadas por el modo No molestar activen la luz"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar PIN para desactivar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar contraseña para desactivar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo al desactivar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabajo está administrado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificaciones"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contenido sensible oculto"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioridad"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Sin vista previa"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioridad"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contenido sensible oculto"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Sin vista previa"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URLs de dominio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Inhabilitado por el administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicaciones"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones tienen permitidos accesos adicionales"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de color de imagen"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de pantalla"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"pantalla, densidad, zoom, escala"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequeños"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normales"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grandes"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Muy grandes"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Lo más grandes posible"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ver todo"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desconectado"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de datos utilizados"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Aplicaciones instaladas: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> utilizado"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Brillo automático activado"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Brillo automático desactivado"</string>
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index 5c7c82e..06b45fa 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Suur"</item>
     <item msgid="7786168277516233536">"Väga suur"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Väga aeglane"</item>
-    <item msgid="2361722960903353554">"Aeglane"</item>
-    <item msgid="1145554631248513562">"Tavaline"</item>
-    <item msgid="7553665153391107454">"Kiire"</item>
-    <item msgid="1370673569131070146">"Kiirem"</item>
-    <item msgid="4648206845228970803">"Väga kiire"</item>
-    <item msgid="4977949754169483251">"Kiire"</item>
-    <item msgid="6106302964845503577">"Väga kiire"</item>
-    <item msgid="6800277205640837264">"Kõige kiirem"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Väga madal"</item>
-    <item msgid="2692137425242433765">"Madal"</item>
-    <item msgid="3332408460740717754">"Tavaline"</item>
-    <item msgid="4907380534957572531">"Kõrge"</item>
-    <item msgid="4699640516390840297">"Väga kõrge"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skannimine…"</item>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 83a7253..60a41c5 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroolid"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administraator on keelanud"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sõrmejälg"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sõrmejälgede haldamine"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sõrmej. kasutatakse:"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ära esita heli tahvelarvuti sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ära esita heli telefoni sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="account_settings" msgid="6403589284618783461">"Kontod"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Isiklik"</string>
-    <string name="category_work" msgid="8699184680584175622">"Töö"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Tööprofiili kontod – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Isikliku profiili kontod"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Töökonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Keelatud"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alati sees"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automaatne"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Teisendamine failikrüpteeringuga andmeteks"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Teisenda …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Juba failikrüpteeringuga"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Teisendamine failipõhiseks krüpteeringuks"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Teisendage andmete sektsioon failipõhiseks krüpteeringuks.\n !!Hoiatus!! See kustutab kõik teie andmed.\n See funktsioon on alfaversioonis ega pruugi õigesti töötada.\n Jätkamiseks vajutage käsku „Kustuta ja teisenda …”."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Kustuta ja teisenda …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Seaded"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printimine"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printimisteenused"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Printerini jõudmiseks võib dokument läbida ühe või mitu serverit."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ühtki teenust pole installitud"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Printereid ei leitud"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Seaded"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Täielik otsetee sõna ja interaktsioon"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Lihtne kõnesüntees"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"See häälsisendi teenus suudab pakkuda alati sisse lülitatud hääle jälgimisteenust ja juhtida teie nimel rakendusi, kus on lubatud häälefunktsioon. See pärineb rakendusest <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Kas lubada teenuse kasutamine?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Kõnesünteesi seaded"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Kõnesünteesi väljund"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Kasuta alati minu seadeid"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Allolevad vaikeseaded alistavad rakenduse seaded"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Vaikeseaded"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Vaikemootor"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Kõneldava teksti jaoks kõnesünteesi mootori määramine"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Kõnekiirus"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Teksti rääkimise kiirus"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Helikõrgus"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mõjutab räägitava teksti tooni"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Keel"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Süsteemi keele kasutamine"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keelt pole valitud"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Määrab räägitud teksti keelespetsiifilise hääle"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Kuulake näidet"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Esita lühike kõnesünteesi demo"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installi hääleandmed"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installi kõnesünteesi jaoks vajalikud hääleandmed"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Kõnesünteesi jaoks vajalikud hääled on juba installitud."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Teie seadeid on muudetud. See on näide, kuidas need võiks kõlada."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Valitud mootorit ei saa käitada."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Seadista"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vali teine ​​mootor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"See kõnesünteesimootor võib koguda kogu kõneldud teksti, sh isiklikke andmeid, nagu paroolid ja krediitkaardinumbrid. Selle aluseks on mootor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Kas lubada kõnesünteesimootori kasutamine?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Selle keele puhul on kõnesünteesi väljundi jaoks vaja toimivat võrguühendust."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"See on kõnesünteesi näide"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Vaikekeele olek"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> on täielikult toetatud"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> vajab võrguühendust"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> pole toetatud"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Laadimine ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mootorid"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Mootori <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> seaded"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on lubatud"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on keelatud"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Mootoriseaded"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Seaded: <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Keeled ja hääled"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installitud"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Installimata"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Naine"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mees"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Kõnesünteesimootor on installitud"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Lubage enne kasut. uus mootor."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Käivita mootori seaded"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Eelistatud mootor"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Üldine"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Toite juhtimine"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"WiFi-seade värskendamine"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetoothi seade värskendamine"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Kuva taustarakendustele dial. Rakendus ei reageeri"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Luba rakendused välises salvestusruumis"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Lubab rakendusi kirjutada välisesse salvestusruumi olenemata manifesti väärtustest"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Muuda tegevuste suurused muudetavaks"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Muudab kõigi tegevuste suurused mitme aknaga vaates olenemata manifesti väärtustest muudetavaks."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Rakenduse andmekasutus"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ainult alarmid"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Täielik vaikus"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuaalsed katkestused"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Märguande vaikehelin"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreeri ka kõnede puhul"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kuidas tuleks märguanded kuvada siis, kui seade on lukus?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Märguanded"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduse märguanded"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Teema märguanded"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Muud helid"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Valimisklahvistiku toonid"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekraani lukustamise helid"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ära kuva kunagi selle rakenduse märguandeid"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Käsitle prioriteetsena"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Lubatakse selle rakenduse märguandeid kuulda, kui funktsioon Mitte segada on lülitatud valikule Ainult prioriteetsed"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Luba piilumine"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lubatakse sellel rakendusel teatud märguanded esile tuua, lohistades need praegusel ekraanil korraks kuvale"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Funktsiooni Mitte segada alistamine"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Peida tundlik sisu"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Kui seade on lukus, peidetakse selle rakenduse märguannete sisu, mis võib avaldada privaatset teavet"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kui seade on lukustatud, peidetakse nende märguannete sisu, mis võivad avalikustada privaatset teavet"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeeritud"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Tundlik"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Muudetakse valikule Ainult alarmid kuni kella <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Muudetakse valikule Katkesta alati"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ekraanikatkest. pole"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Keelab režiimiga „Mitte segada” vaigistatud märguannete piilumise või praegusel ekraanil kuvamise"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Märguandetuld pole"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Keelab režiimiga „Mitte segada” vaigistatud märguannetel tuld vilgutada"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Enne vabastamist küsi PIN-koodi"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Enne vabastamist küsi parooli"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Vabastamise korral lukusta seade"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Tööprofiil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Seda tööprofiili hallatakse rakendusega"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Haldab <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Katseline)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Märguanded"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Tavaline"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokeerimine"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Tundlik sisu on peidetud"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteetne"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Piilumine pole lubatud"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Isiklik"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Töö"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeeritud"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteetne"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Tundlik sisu on peidetud"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Piilumine pole lubatud"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeeni URL-idega"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administraator on keelanud"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Rakenduste seadistamine"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profiili valimine"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Rakenduse load"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> rakendusel <xliff:g id="COUNT_1">%d</xliff:g>-st on täiendav juurdepääs"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> rakendust <xliff:g id="COUNT_1">%d</xliff:g>-st on lubatud"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Pildi värvirežiim"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB kasutamine"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Ekraani skaala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekraan tihedus suum skaala skaleerimine"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Väike"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Tavaline"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Suur"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Suurem"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Suurim"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Kohandatud (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Kuva kõik"</string>
+    <string name="see_less" msgid="1250265310929558370">"Kuva vähem"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Ühendus on katkestatud"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Kasutatud andmemaht on <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Installitud on <xliff:g id="COUNT">%1$d</xliff:g> rakendust"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Kasutatud on <xliff:g id="SIZE1">%1$s</xliff:g> <xliff:g id="SIZE2">%2$s</xliff:g>-st"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Kohanduv heledus on SEES"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Kohanduv heledus on VÄLJAS"</string>
 </resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 9c2fbc2..4057e2b 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Handia"</item>
     <item msgid="7786168277516233536">"Erraldoia"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Oso motela"</item>
-    <item msgid="2361722960903353554">"Motela"</item>
-    <item msgid="1145554631248513562">"Normala"</item>
-    <item msgid="7553665153391107454">"Bizkorra"</item>
-    <item msgid="1370673569131070146">"Bizkorragoa"</item>
-    <item msgid="4648206845228970803">"Oso bizkorra"</item>
-    <item msgid="4977949754169483251">"Bizkorra"</item>
-    <item msgid="6106302964845503577">"Oso bizkorra"</item>
-    <item msgid="6800277205640837264">"Bizkorrena"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Oso baxua"</item>
-    <item msgid="2692137425242433765">"Baxua"</item>
-    <item msgid="3332408460740717754">"Normala"</item>
-    <item msgid="4907380534957572531">"Altua"</item>
-    <item msgid="4699640516390840297">"Oso altua"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Bilatzen…"</item>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 9c7a969..5fe8d67 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Pasahitzak"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administratzaileak desgaitu du"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Hatz-marka digitala"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kudeatu hatz-markak"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Hatz-marken erabilera"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ez erreproduzitu soinua tableta oinarrira konektatzean edo handik kentzean"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ez erreproduzitu soinua telefonoa oinarrira eranstean edo handik kentzean."</string>
     <string name="account_settings" msgid="6403589284618783461">"Kontuak"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pertsonalak"</string>
-    <string name="category_work" msgid="8699184680584175622">"Lanekoak"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Laneko profilaren kontuak - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Profil pertsonalen kontuak"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Laneko kontua - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desgaituta"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Beti aktibatuta"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatikoa"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Eman fitxategietan oinarritutako enkriptatzea"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Enkriptatu…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fitxategietan oinarritutako enkriptatzea dauka dagoeneko"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Fitxategietan oinarritutako enkriptatzea ematea"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Eman datuen partizioari fitxategietan oinarritutako enkriptatzea.\n Kontuz!! Ekintza horrek ezabatu egingo ditu datu guztiak.\n Eginbidearen alpha bertsioa da; beraz, baliteke behar bezala ez funtzionatzea.\n Aurrera egiteko, sakatu \"Ezabatu eduki guztia eta enkriptatu…\"."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Ezabatu eduki guztia eta enkriptatu…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Ezarpenak"</string>
     <string name="print_settings" msgid="4742428530112487843">"Inprimatzea"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Inprimatze-zerbitzuak"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili nahi duzu?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Baliteke dokumentuak zerbitzari bat edo gehiagotan zehar igarotzea inprimagailurako bidean."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ez dago zerbitzurik instalatuta"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Ez da inprimagailurik aurkitu"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ezarpenak"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ahozko pasahitzak eta erabateko interakzioa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Ahoz idazteko eginbide arrunta"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Aginduak ahoz emateko zerbitzu honek uneoro kontrolatuko du ahotsa eta ahozko gaitasuna duten aplikazioak ere kontrolatu ahal izango ditu. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikazioarena da. Zerbitzu hau erabiltzeko aukera gaitu nahi duzu?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Testua ahots bihurtzeko eginbidearen ezarpenak"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Testua ahots bihurtzeko eginbidearen irteera"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Erabili beti nire ezarpenak"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Ezarpen lehenetsi hauek aplikazio-ezarpenak gainidazten dituzte"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Ezarpen lehenetsiak"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor lehenetsia"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Konfiguratu ahots bidezko idazketarako erabili nahi duzun ahots-sintetizagailua"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Hizketa-abiadura"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Testua zer abiaduran esaten den"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonua"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Esandako testuaren tonuari eragiten dio"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Hizkuntza"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Erabili sistemaren hizkuntza"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Ez da hizkuntza hautatu"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Esandako testuaren ahotsa hizkuntzaren arabera ezartzen du"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Entzun adibide bat"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Erreproduzitu hizketa-sintesiaren demostrazio laburra"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalatu ahotsaren datuak"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalatu hizketaren sintesirako behar diren ahots-datuak"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Hizketa-sintesirako beharreko ahotsak dagoeneko instalatu dira behar bezala."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ezarpenak aldatu egin dira. Hona hemen horien soinua."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Ezin da aukeratutako motorra exekutatu."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguratu"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Aukeratu beste motor bat"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hizketaren sintesi-motorrak idazten duzun testu guztia bil dezake, pasahitzak eta kreditu-txarteleko zenbakiak bezalako datu pertsonalak barne. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motorrak egin du eskaera. Hizketaren sintesi-motor hori erabili nahi duzu?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Testua ahots bihurtzeko eginbidea erabiltzeko, hizkuntza honek sareko konexioa behar du."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Hizketa-sintesiaren adibide bat da hau"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Hizkuntza lehenetsiaren egoera"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> guztiz onartzen da."</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> eskualde-ezarpenak sareko konexioa behar du"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Ez da <xliff:g id="LOCALE">%1$s</xliff:g> onartzen"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Egiaztatzen…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motorrak"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ezarpenak"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> gaituta dago"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> desgaituta dago"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Motorraren ezarpenak"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> motorraren ezarpenak"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Hizkuntzak eta ahotsak"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalatuta"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Instalatu gabe"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Emakumezkoa"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Gizonezkoa"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Hizketa-sintesiaren motorra instalatu da"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Erabili aurretik, gaitu motor berria."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Abiarazi motorraren ezarpenak"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor hobetsia"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Orokorra"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiaren kontrola"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi ezarpena eguneratzen"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ezarpena eguneratzea"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"\"Erantzunik ez\" mezua atz. planoko aplikazioetarako"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Behartu aplikazioak onartzea kanpoko biltegian"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Aplikazioek kanpoko memorian idatz dezakete, manifestuaren balioak kontuan izan gabe"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Behartu jardueren tamaina doitu ahal izatea"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Manifestuan jartzen duena jartzen duela ere, jarduera guztien tamaina doitzeko aukera ematen du, hainbat leihotan erabili ahal izan daitezen."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu-erabilera"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Aplikazioaren datu-erabilera"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmak soilik"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Isiltasun osoa"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Eten bisualak"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonu-jotzailea"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Jakinarazpenen tonu lehenetsia"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Egin dar-dar deietan ere"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Gailua blokeatuta dagoenean, nola ikusi nahi dituzu jakinarazpenak?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Jakinarazpenak"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Aplikazioen jakinarazpenak"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Gaien araberako jakinarazpenak"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Beste soinu batzuk"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Markagailuaren tonuak"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Pantaila blokeatzearen soinua"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ez erakutsi inoiz aplikazio honen jakinarazpenak"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Hartu lehentasunezkotzat"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Baimendu aplikazioari jakinarazpenak entzunaraztea \"Ez molestatu\" aukera aukeratuta dagoenean, baina lehentasunezko jakinarazpenen salbuespenarekin."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Baimendu agerraraztea"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Baimendu aplikazioari jakinarazpenetako batzuk nabarmentzea, uneko pantailan une batez agerrarazita."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ez erabili \"Ez molestatu\" aukera"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera lehentasunezko jakinarazpenen salbuespenarekin aukeratuta dagoenean"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ezkutatu isilpeko informazioa"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Gailua blokeatuta dagoenean, ezkutatu aplikazio honen jakinarazpenak, isilpeko edukia badute"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Gailua blokeatuta dagoenean, ezkutatu informazio pribatua izan dezakeen jakinarazpenetako edukia"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeatuta"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Lehentasuna"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Isilpekoa"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Aldatu \"Alarmak soilik\" modura <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Aldatu \"Eten beti\" modura"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Pantaila-etenik ez"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Eragotzi \"Ez molestatu\" moduan isilarazitako jakinarazpenak pantailan agertzea"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Abisu-argirik ez"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Eragotzi \"Ez molestatu\" moduan isilarazitako jakinarazpenek argi keinukaria aktibatzea"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Eskatu PIN kodea aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Eskatu pasahitza aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blokeatu gailua aingura kentzean"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Laneko profila"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Laneko profil hau honen bidez kudeatzen da:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Kudeatzailea: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Esperimentala)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Jakinarazpenak"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normala"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokeatu"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Isilpeko edukia ezkutatuta"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Lehentasuna"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ezin da agertu"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pertsonalak"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Lanekoak"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeatutakoak"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Lehentasunezkoak"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Isilpeko edukia ezkutatuta"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ezin da agertu"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domeinuaren URLekin"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administratzaileak desgaitu du"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguratu aplikazioak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Aukeratu profila"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Aplikaziorako baimenak"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikaziok sarbide gehigarria dute"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikazio baimenduta"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Irudiaren kolore modua"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Erabili sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Pantailaren eskala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"pantaila dentsitatea zooma eskala tamaina"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Txikia"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normala"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Handia"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Oso handia"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Handiena"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Pertsonalizatua (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ikusi guztiak"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ikusi gutxiago"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Deskonektatuta"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Datuen <xliff:g id="AMOUNT">%1$s</xliff:g> erabili da"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplikazio instalatu dira"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g>/<xliff:g id="SIZE2">%2$s</xliff:g> erabilita"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"AKTIBATUTA dago distira doigarria"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"DESAKTIBATUTA dago distira doigarria"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 17da73a..2de25f4 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"بزرگ"</item>
     <item msgid="7786168277516233536">"بسیار بزرگ"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"بسیار آهسته"</item>
-    <item msgid="2361722960903353554">"آهسته"</item>
-    <item msgid="1145554631248513562">"معمولی"</item>
-    <item msgid="7553665153391107454">"سریع"</item>
-    <item msgid="1370673569131070146">"سریع‌تر"</item>
-    <item msgid="4648206845228970803">"خیلی سریع"</item>
-    <item msgid="4977949754169483251">"تند"</item>
-    <item msgid="6106302964845503577">"خیلی تند"</item>
-    <item msgid="6800277205640837264">"سریع‌ترین"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"بسیار کم"</item>
-    <item msgid="2692137425242433765">"کم"</item>
-    <item msgid="3332408460740717754">"معمولی"</item>
-    <item msgid="4907380534957572531">"زیاد"</item>
-    <item msgid="4699640516390840297">"بسیار زیاد"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"اسکن کردن..."</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b47582e..5624a4b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"گذرواژه‌ها"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"توسط سرپرست غیرفعال شده است"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"اثر انگشت"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"مدیریت اثر انگشت"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"استفاده از اثر انگشت برای"</string>
@@ -372,8 +373,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی به داده کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی به داده کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"رمزگذاری رایانهٔ لوحی شخصی"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"هنگام اتصال یا جدا کردن رایانهٔ لوحی از جایگاه، صدا پخش نشود"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"هنگام اتصال یا جدا کردن گوشی از دستگاه، صدا پخش نشود"</string>
     <string name="account_settings" msgid="6403589284618783461">"حساب‌ها"</string>
-    <string name="category_personal" msgid="1299663247844969448">"شخصی"</string>
-    <string name="category_work" msgid="8699184680584175622">"محل کار"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"حساب‌های نمایه کاری - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"حساب‌های نمایه شخصی"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"حساب کاری - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"غیرفعال است"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"همیشه روشن"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"تبدیل به رمزگذاری برحسب فایل"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"تبدیل…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"از قبل به رمزگذاری بر حسب فایل تبدیل شده است"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"تبدیل به رمزگذاری مبتنی بر فایل"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"تبدیل پارتیشن داده‌ای به رمزگذاری مبتنی بر فایل.\n !!هشدار!! این کار تمام داده‌هایتان را پاک می‌کند.\n این قابلیت در نسخه آلفا قرار دارد و ممکن است به درستی کار نکند.\n برای ادامه، «پاک کردن و تبدیل…» را فشار دهید."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"پاک کردن و تبدیل…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"صفحه نمایش خاموش می‌شود"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
@@ -1108,7 +1113,7 @@
     <string name="network_reset_not_available" msgid="7188610385577164676">"بازنشانی شبکه برای این کاربر در دسترس نیست"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"تنظیمات شبکه بازنشانی شد"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"بازنشانی دستگاه"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده‌های کارخانه"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی داده‌های کارخانه"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"تنیمات و داده‌های برنامه و سیستم"</li>\n<li>"برنامه‌های دانلود شده"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
@@ -1278,7 +1283,7 @@
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
     <string name="applications_settings" msgid="1721442176406964682">"برنامه‌ها"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"مدیریت برنامه‌ها، تنظیم میانبرهای راه‌اندازی سریع"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"مدیریت برنامه‌ها، تنظیم میان‌برهای راه‌اندازی سریع"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"تنظیمات برنامه"</string>
     <string name="install_applications" msgid="4872012136210802181">"منابع ناشناس"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"همه منابع برنامه مجاز است"</string>
@@ -1599,7 +1604,7 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"نمایشگر"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"زیرنویس‌ها"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"حرکات بزرگ‌نمایی"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"وقتی این قابلیت فعال است، می‌توانید با سه ضربه روی صفحه بزرگ‌نمایی یا کوچک‌نمایی کنید.\n\nهنگام بزرگ‌نمایی می‌توانید:\n"<ul><li>"حرکت کنید: دو یا چند انگشت خود را روی صفحه بکشید."</li>\n<li>"تنظیم سطح بزرگ‌نمایی: دو یا چند انگشتتان را به هم نزدیک کنید یا از هم دور کنید."</li></ul>\n\n"همچنین می‌توانید به صورت موقت آنچه را که در زیر انگشتان شما قرار دارد با سه بار ضربه روی صفحه و نگهداشتن آن بزرگ کنید. در این حالت بزرگ‌نمایی شده، می‌توانید انگشتتان را برای کاوش قسمت‌های مختلف صفحه بکشید. برای بازگشت به حالت قبلی، انگشتتان را بردارید.\n\nتوجه: همه جا به‌غیراز صفحه کلید و نوار پیمایش، سه بار ضربه برای بزرگ‌نمایی کار می‌کند."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"وقتی این قابلیت فعال است، می‌توانید با سه ضربه روی صفحه بزرگ‌نمایی یا کوچک‌نمایی کنید.\n\nهنگام بزرگ‌نمایی می‌توانید:\n"<ul><li>"حرکت کنید: دو یا چند انگشت خود را روی صفحه بکشید."</li>\n<li>"تنظیم سطح بزرگ‌نمایی: دو یا چند انگشتتان را به هم نزدیک کنید یا از هم دور کنید."</li></ul>\n\n"همچنین می‌توانید به صورت موقت آنچه را که در زیر انگشتان شما قرار دارد با سه بار ضربه روی صفحه و نگهداشتن آن بزرگ کنید. در این حالت بزرگ‌نمایی شده، می‌توانید انگشتتان را برای کاوش قسمت‌های مختلف صفحه بکشید. برای بازگشت به حالت قبلی، انگشتتان را بردارید.\n\nتوجه: همه جا به‌غیراز صفحه‌کلید و نوار پیمایش، سه بار ضربه برای بزرگ‌نمایی کار می‌کند."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"میان‌برهای دسترسی‌پذیری"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"روشن"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"خاموش"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</string>
     <string name="print_settings" msgid="4742428530112487843">"چاپ کردن"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"خدمات چاپ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"از <xliff:g id="SERVICE">%1$s</xliff:g> استفاده شود؟"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ممکن است سندتان برای رسیدن به چاپگر از یک یا چند سرور عبور کند."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"هیچ چاپگری یافت نشد"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"تنظیمات"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"کلیدگفته کامل و تعامل"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ویژگی ساده گفتار به نوشتار"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"این سرویس ورودی گفتاری می‌تواند کنترل صوتی همیشه فعال را اجرا کند و از طرف شما برنامه‌هایی را کنترل کند که صدا در آنها فعال است. از <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> است. استفاده از این سرویس فعال شود؟"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"تنظیمات متن به گفتار"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"خروجی تبدیل متن به گفتار"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"همیشه از تنظیمات من استفاده شود"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"تنظیمات پیش‌فرض زیر تنظیمات برنامه را لغو می‌کنند"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"تنظیمات پیش‌فرض"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"موتور پیش‌فرض"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"موتور ترکیب گفتار را تنظیم کنید تا برای پیامک گفتاری استفاده شود"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"سرعت گفتار"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"سرعتی که متن خوانده می‌شود"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"زیر و بمی صدا"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"بر صدای متن گفته شده تأثیر می‌گذارد"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"زبان"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"استفاده از زبان سیستم"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"زبان انتخاب نشده است"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"صدای خاص یک زبان را برای متن گفتاری تنظیم می‌کند"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"به نمونه‌ای گوش کنید"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"قسمت کوتاهی از ترکیب گفتار پخش شود"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"نصب داده‌های صوتی"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"نصب داده‌های صوتی مورد نیاز برای ترکیب گفتار"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"صداهای مورد نیاز برای ترکیب گفتار از قبل به‌درستی نصب نشده‌اند."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"تنظیمات شما تغییر کرد. این یک نمونه از نحوه کارکرد آنهاست."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"موتوری که انتخاب کردید اجرا نمی‌شود."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"پیکربندی"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"انتخاب یک موتور دیگر"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"این موتور ترکیب صوتی ممکن است بتواند تمام متن گفته شده را جمع‌آوری کند، از جمله اطلاعات شخصی مانند رمزهای ورود و شماره‌های کارت اعتباری. این کارها توسط موتور<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> انجام می‌شود. استفاده از این موتور ترکیب صوتی را فعال می‌کنید؟"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"این زبان به یک اتصال شبکه فعال برای خروجی نوشتار به گفتار نیاز دارد."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"این نمونه‌ای از ترکیب گفتار است"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"وضعیت زبان پیش‌فرض"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> کاملاً پشتیبانی می‌شود"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> به اتصال شبکه نیاز دارد"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> پشتیبانی نمی‌شود"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"در حال بررسی..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"موتورها"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> تنظیمات"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> فعال است"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> غیرفعال است"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"تنظیمات موتور"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"تنظیمات برای <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"زبان‌ها و صداها"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"نصب شده"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"نصب نشد"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"مؤنث"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"مذکر"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"موتور ترکیب گفتار نصب شد"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"قبل از استفاده، موتور جدید را فعال کنید."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"راه‌اندازی تنظیمات موتور"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"موتور ترجیحی"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"کلی"</string>
     <string name="gadget_title" msgid="5519037532720577836">"کنترل نیرو"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"‏به‌روزرسانی تنظیم Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"به‌روزرسانی تنظیمات بلوتوث"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"نمایش گفتگوی \"برنامه پاسخ نمی‌دهد\" برای برنامه‌های پس‌زمینه"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"اجازه اجباری به برنامه‌های دستگاه ذخیره خارجی"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"بدون توجه به مقادیر مانیفست، هر برنامه‌ای را برای نوشتن در حافظه خارجی واجد شرایط می‌کند"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"اجبار فعالیت‌ها به قابل تغییر اندازه بودن"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"بدون درنظر گرفتن مقادیر مانیفست، همه فعالیت‌ها را برای چندپنجره قابل تغییر اندازه می‌کند."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"مصرف داده"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"میزان مصرف داده در برنامه"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ممکن است شرکت مخابراتی داده‌ها را به گونه‌ای متفاوت با دستگاه شما محاسبه کند."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"فقط هشدارها"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"سکوت کامل"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: ‏<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"وقفه‌های بصری"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"آهنگ زنگ پیش‌فرض اعلان"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"برای تماس‌ لرزش هم داشته باشد"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"هنگامی که دستگاه شما قفل است، مایلید اعلان‌ها چگونه نشان داده شوند؟"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"اعلان‌ها"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"اعلان‌های برنامه"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"اعلان‌های موضوعی"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"سایر صداها"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"آهنگ‌های صفحه شماره‌گیری"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"صداهای قفل شدن صفحه"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"هرگز اعلانی از این برنامه نشان داده نمی‌شود"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"اولویت‌دار حساب شود"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"به این برنامه اجازه داده شود هنگامی که «مزاحم نشوید» روی «فقط اولویت‌دار» تنظیم شده، اعلان‌هایش شنیده شود"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"نمایش اجمالی مجاز است"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"به این برنامه امکان می‌دهد با کشیدن اعلان‌های خاصی (برای زمان کوتاهی) روی صفحه کنونی و در معرض دید، روی آن‌ها تأکید کند"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"لغو «مزاحم نشوید»"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"به این اعلان‌ها اجازه داده شود در شرایطی که «مزاحم نشوید» روی «فقط اولویت‌دار» تنظیم شده است، همچنان وقفه ایجاد کنند"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"پنهان کردن محتوای حساس"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"زمانی که دستگاه قفل است، محتوایی که ممکن است اطلاعات خصوصی را افشا کند از اعلان‌های این برنامه مخفی شود"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"وقتی دستگاه قفل است، محتوای این اعلان‌ها که شاید اطلاعات خصوصی را افشا کنند پنهان شود"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"مسدود شده"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"اولویت‌دار"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"تغییر به «فقط هشدارها» تا <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"تغییر در «همیشه وقفه»"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"بدون وقفه صفحه"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"مانع از آن می‌شود که اعلان‌های بی‌صدا شده با «مزاحم نشوید» در صفحه فعلی ظاهر شوند"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"بدون چراغ اعلان"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"مانع از آن می‌شود که اعلان‌های بی‌صدا شده با «مزاحم نشوید» باعث چشمک زدن چراغ شوند"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"درخواست کد پین قبل از برداشتن پین"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"درخواست گذرواژه قبل از برداشتن پین"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل کردن دستگاه هنگام برداشتن پین"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"نمایه کاری"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"سرپرست زیر این نمایه کاری را مدیریت می‌کند:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"مدیریت شده توسط <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(آزمایشی)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"اعلان‌ها"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"معمولی"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"مسدود"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"محتوای حساس پنهان است"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"اولویت‌دار"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"بدون نمایش اجمالی"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"شخصی"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"کاری"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود شده"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"اولویت‌دار"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"محتوای حساس پنهان است"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"بدون نمایش اجمالی"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"با نشانی‌های وب دامنه"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"توسط سرپرست سیستم غیرفعال شد"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="configure_apps" msgid="6685680790825882528">"پیکربندی برنامه‌ها"</string>
     <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"انتخاب نمایه"</string>
     <string name="app_permissions" msgid="4148222031991883874">"مجوزهای برنامه"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه اجازه دسترسی اضافی دارد"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه مجاز است"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"حالت رنگ عکس"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استفاده از sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"مقیاس نمایش"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"نمایشگر تراکم بزرگ‌نمایی مقیاس مقیاس‌بندی"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"کوچک"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"معمولی"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"بزرگ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"بزرگ‌تر"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"بزرگ‌ترین"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"سفارشی (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"مشاهده همه"</string>
+    <string name="see_less" msgid="1250265310929558370">"مشاهده موارد کمتر"</string>
+    <string name="disconnected" msgid="5787956818111197212">"قطع ارتباط"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> داده استفاده‌شده"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> برنامه نصب‌شده"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> از <xliff:g id="SIZE2">%2$s</xliff:g> استفاده شده است"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"روشنایی تطبیقی ​​روشن است"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"روشنایی تطبیقی خاموش است"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 0f1c372..9e5994d 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Suuri"</item>
     <item msgid="7786168277516233536">"Valtava"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Hyvin hidas"</item>
-    <item msgid="2361722960903353554">"Hidas"</item>
-    <item msgid="1145554631248513562">"Normaali"</item>
-    <item msgid="7553665153391107454">"Nopea"</item>
-    <item msgid="1370673569131070146">"Nopeampi"</item>
-    <item msgid="4648206845228970803">"Hyvin nopea"</item>
-    <item msgid="4977949754169483251">"Nopea"</item>
-    <item msgid="6106302964845503577">"Erittäin nopea"</item>
-    <item msgid="6800277205640837264">"Nopein"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Hyvin matala"</item>
-    <item msgid="2692137425242433765">"Matala"</item>
-    <item msgid="3332408460740717754">"Normaali"</item>
-    <item msgid="4907380534957572531">"Korkea"</item>
-    <item msgid="4699640516390840297">"Hyvin korkea"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Etsitään..."</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6e64241..fcd5fb7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Järjestelmänvalvojan käytöstä poistama"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sormenjälki"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sormenjälkien hallinta"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sormenj. käyttökohde"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Älä toista ääntä, kun tabletti asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
     <string name="account_settings" msgid="6403589284618783461">"Tilit"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Henkilökohtainen"</string>
-    <string name="category_work" msgid="8699184680584175622">"Työ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Työprofiilit – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Henkilökohtaiset profiilit"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Työtili – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Ei käytössä"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Aina käytössä"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automaattinen"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Muunna tiedostojen salaukseksi"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Muunna…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Tiedostot on jo salattu."</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Muunnetaan tiedostopohjaiseksi salaukseksi"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Muunna dataosio tiedostopohjaiseksi salaukseksi.\n Varoitus! Kaikki tiedot poistetaan.\n Tämä ominaisuus on alfavaiheessa eikä välttämättä toimi oikein.\n Jatka painamalla Poista ja muunna…"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Poista ja muunna…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Siirtyminen virransäästöön"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tulostus"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tulostuspalvelut"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Asiakirja saattaa kulkea yhden tai useamman palvelimen kautta matkalla tulostimeen."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ei asennettuja palveluita"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tulostimia ei löydy"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Asetukset"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Toimintosanat ja vuorovaikutus"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Yksinkertainen puheesta tekstiksi -palvelu"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Tämä puheohjauspalvelu huolehtii, että puheohjaus on aina päällä ja ohjaa puheohjausta käyttäviä sovelluksia automaattisesti puolestasi. Palvelu sisältyy sovellukseen <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Otetaanko palvelu käyttöön?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Tekstistä puheeksi -asetukset"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Tekstistä puheeksi -toisto"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Käytä aina omia asetuksiani"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Alla olevat oletusasetukset ohittavat sovelluksen asetukset."</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Oletusasetukset"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Oletusmoottori"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Aseta puhesynteesimoottori puhuttua tekstiä varten"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Puheen nopeus"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Tekstin puhumisnopeus"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Äänenkorkeus"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vaikuttaa puhutun tekstin äänenkorkeuteen"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Kieli"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Käytä järjestelmän kieltä"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kieltä ei ole valittu"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Asettaa puhutulle tekstille kielikohtaisen äänen"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Kuuntele esimerkki"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Toista lyhyt esittely puhesynteesistä"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Asenna äänitiedot"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Asenna puhesynteesiin tarvittavat äänitiedot"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Puhesynteesiin tarvittavat äänet on jo asennettu"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Asetuksia muutettiin. Tässä esimerkki, miltä ne kuulostavat:"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Valitsemaasi syntetisaattoria ei voi käyttää."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Määritä"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Valitse toinen moottori"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Tämä puhesynteesimoottori saattaa kerätä kaiken puhutun tekstin, mukaan lukien henkilökohtaiset tiedot kuten salasanat ja luottokorttinumerot. Se on lähtöisin moottorista <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Haluatko ottaa tämän puhesynteesimoottorin käyttöön?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Tämä kieli vaatii verkkoyhteyden, jotta tekstistä puheeksi muuntaminen toimii."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Tämä on esimerkki puhesynteesistä."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Oletuskieliasetus"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Kieltä <xliff:g id="LOCALE">%1$s</xliff:g> tuetaan"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Kieli <xliff:g id="LOCALE">%1$s</xliff:g> tarvitsee yhteyden verkostoon"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Kieltä <xliff:g id="LOCALE">%1$s</xliff:g> ei tueta"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Tarkistetaan"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Moottorit"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-asetukset"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on käytössä"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on poistettu käytöstä"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Koneen asetukset"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Asetukset: <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Kielet ja äänet"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Asennettu"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Ei asennettu"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Nainen"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mies"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Puhesynteesimoottori asennettu"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Ota puhesynt. ensin käyttöön"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Käynnistä moottorin asetukset"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ensisijainen kone"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Yleiset"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Virranhallinta"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Päivitetään Wi-Fi-asetuksia"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Päivitetään Bluetooth-asetuksia"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Näytä Sovellus ei vastaa -ikkuna taustasovell."</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Salli aina ulkoinen tallennus"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Mahdollistaa sovellusten tallentamisen ulkoiseen tall.tilaan luettelosta riippumatta"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Pakota kaikki toiminnot hyväksymään koon muutos"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Pakottaa kaikki toiminnot hyväksymään koon muuttamisen rinnakkaisnäkymään luettelon arvoista riippumatta."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datan käyttö"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Sovelluksen tiedonsiirto"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vain herätykset"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Täydellinen hiljaisuus"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuaaliset keskeytykset"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ilmoitusten oletussoittoääni"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Värinä myös puheluille"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Miten haluat ilmoitusten näkyvän, kun laite on lukittu?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Ilmoitukset"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Sovellusilmoitukset"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Aihekohtaiset ilmoitukset"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Muut äänet"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Näppäimistön näppäinäänet"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ruudun lukitusäänet"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Älä koskaan näytä ilmoituksia tästä sovelluksesta."</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Merkitse tärkeäksi"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Anna sovelluksen toistaa ilmoituksia, kun älä häiritse -tila on vain tärkeät -asetuksella."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Salli kurkistaminen"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Anna sovelluksen korostaa tiettyjä ilmoituksia näyttämällä ne nykyisellä näytöllä hetkellisesti."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ohita Älä häiritse -asetus"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Salli ilmoituksien näyttö, vaikka Älä häiritse -asetus on Vain tärkeät."</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Piilota arkaluontoinen sisältö"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Piilota mahdollisesti yksityisluontoinen sisältö tämän sovelluksen ilmoituksista, kun laite on lukittu."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kun laite on lukittu, piilota ilmoituksien sisältö, jossa voi olla yksityisiä tietoja."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Estetty"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Tärkeät"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Yksityisluontoinen"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ota vain herätykset käyttöön kello <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> asti."</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ei keskeytyksiä"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Estä Älä häiritse -tilan hiljentämiä ilmoituksia kurkistamasta tai näkymästä näytöllä."</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Ei merkkivaloa"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Estä Älä häiritse -tilan hiljentämiä ilmoituksia näyttämästä vilkkuvaa valoa."</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Sovellusilmoitukset"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pyydä PIN ennen irrotusta"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pyydä salasana ennen irrotusta"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lukitse laite irrotuksen aikana"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Työprofiili"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tätä työprofiilia hallinnoi"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Hallinnoija: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kokeellinen)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Ilmoitukset"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normaali"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Estä"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Arkaluontoinen sisältö on piilotettu"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Tärkeät"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ei kurkistamista"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Henkilökohtaiset"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Työ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Estetyt"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Tärkeät"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Arkaluontoinen sisältö ei näy"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ei kurkistamista"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Sis. verkkotun. URL-osoitteita"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Järjestelmänvalvojan käytöstä poistama"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Sovellusten konfigurointi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Valitse profiili"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Sovelluksen käyttöoikeudet"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> sovelluksella on ylimääräinen käyttöoikeus"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> sovelluksella käyttöoikeus"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Kuvien värit"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Ota sRGB käyttöön"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Näytön skaalaus"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"näytön tiheys zoomaus skaala skaalaus"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pieni"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normaali"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Suuri"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Suurempi"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Suurin"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Muokattu (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Näytä kaikki"</string>
+    <string name="see_less" msgid="1250265310929558370">"Näytä vähemmän"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Yhteys katkaistu"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> datasta käytetty"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> sovellusta asennettu"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g>/<xliff:g id="SIZE2">%2$s</xliff:g> käytetty"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Kirkkauden säätö on KÄYTÖSSÄ."</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Kirkkauden säätö on POIS KÄYTÖSTÄ."</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index d1ca885..cb856c4 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Très grande"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Très lente"</item>
-    <item msgid="2361722960903353554">"Lente"</item>
-    <item msgid="1145554631248513562">"Normale"</item>
-    <item msgid="7553665153391107454">"Rapide"</item>
-    <item msgid="1370673569131070146">"Plus rapide"</item>
-    <item msgid="4648206845228970803">"Très rapide"</item>
-    <item msgid="4977949754169483251">"Rapide"</item>
-    <item msgid="6106302964845503577">"Très rapide"</item>
-    <item msgid="6800277205640837264">"Le plus rapide"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Très grave"</item>
-    <item msgid="2692137425242433765">"Faible"</item>
-    <item msgid="3332408460740717754">"Normale"</item>
-    <item msgid="4907380534957572531">"Élevée"</item>
-    <item msgid="4699640516390840297">"Très aigu"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Recherche…"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1a6f079..c422117 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Désactivé par l\'administrateur"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Lecteur d\'empreintes digitales"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer les empreintes digitales"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. dig. pour"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personnel"</string>
-    <string name="category_work" msgid="8699184680584175622">"Travail"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Comptes de profil professionnel - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes de profil personnel"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professionnel - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Désactivé"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Toujours actif"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatique"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir en chiffrement basé sur un fichier"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré par un fichier"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Conversion en chiffrement basé sur un fichier en cours"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convertir la partition de données en chiffrement basé sur un fichier.\n Avertissement! Cette opération supprimera toutes vos données. \nCette fonctionnalité est en version alpha et peut ne pas fonctionner correctement. \nTouchez « Effacer et convertir » pour continuer."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Effacer et convertir..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Votre document peut passer par un ou plusieurs serveurs avant d\'arriver à l\'imprimante."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Aucune imprimante trouvée"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Paramètres"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Détection de mot clé et interaction totales"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Synthèse vocale simple"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ce service d\'entrée vocale pourra contrôler en permanence les fonctionnalités vocales et utiliser en votre nom les applications commandées par la voix. Il provient de l\'application <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Autoriser l\'utilisation de ce service?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Synthèse vocale"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Sortie de la synthèse vocale"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Toujours utiliser mes paramètres"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Moteur par défaut"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Définir le moteur de synthèse vocale à utiliser pour le texte énoncé"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Cadence"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Vitesse à laquelle le texte est énoncé"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utiliser la langue du système"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définit la langue utilisée par la syntèse vocale"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installer les données vocales"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer les données nécessaires à la synthèse vocale"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Les données nécessaires à la synthèse vocale sont déjà correctement installées."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Vos paramètres ont été modifiés. Voici un échantillon illustrant les nouveaux paramètres."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Le moteur sélectionné ne peut pas fonctionner."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurer"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Sélectionner un autre moteur"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ce moteur de synthèse vocale est susceptible d\'enregistrer tout ce que vous direz, y compris des données personnelles telles que les mots de passe et les numéros de carte de paiement. Il provient du moteur <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voulez-vous l\'activer?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Une connexion réseau est nécessaire pour la synthèse vocale dans cette langue."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Voici un échantillon de synthèse vocale"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"État de la langue par défaut"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> sont compatibles"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> nécessitent une connexion réseau"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> ne sont pas compatibles"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Vérification en cours..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Moteurs"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Paramètres <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est activé."</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est désactivé"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Paramètres du moteur"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Paramètres de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Langues et voix"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installée"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Non installée"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femme"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Homme"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Moteur synthèse vocale installé"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Activer moteur avant utilisation"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lancer les paramètres du moteur"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Moteur préféré"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Général"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Contrôle de l\'alimentation"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mise à jour des paramètres Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher « L\'application ne répond plus » pour applis en arrière-plan"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forcer l\'autor. d\'applis sur stockage externe"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Permet enreg. d\'applis sur espace stockage externe"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forcer les activités à être redimensionnables"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permet de redimensionner toutes les activités pour le mode multifenêtre, indépendamment des valeurs du fichier manifeste."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Util. données aplication"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Aucune interruption"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interruptions visuelles"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications s\'affichent?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notifications par sujet"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du clavier"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage d\'écran"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Traiter comme prioritaire"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"N\'activer les notifications sonores de cette application que lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Autoriser l\'aperçu"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permettre à cette application de mettre certaines notifications en évidence en les faisant glisser pour les afficher brièvement sur l\'écran actuel"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode « Ne pas déranger »"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Masquer le contenu sensible"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Lorsque l\'appareil est verrouillé, masquer tout contenu figurant dans les notifications de cette application et susceptible de révéler des données privées"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Lorsque l\'appareil est verrouillé, masquer tout contenu figurant dans les notifications susceptible de révéler des données privées"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorité"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Activer le mode Toujours interrompre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Aucune inter. écran"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Empêcher les notifications désactivées par le mode Ne pas déranger de s\'afficher à l\'écran actuel"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Aucune témoin de notification"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Empêcher les notifications désactivées par le mode Ne pas déranger de faire clignoter le voyant"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander le NIP avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'écran après l\'annulation de l\'épinglage"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Le profil professionnel est géré par :"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimentale)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifications"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normale"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquer"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contenu sensible masqué"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Priorité"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Aucun aperçu"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personnel"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Travail"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqué"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priorité"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contenu sensible masqué"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Aucun aperçu"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec les URL de domaine"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Désactivé par l\'administrateur"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurer les applications"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Sélectionnez un profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Autorisations de l\'application"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode couleur des images"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Échelle d\'affichage"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densité d\'affichage zoom mise à l\'échelle échelle"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Petite"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Plus grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"La plus grande"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personnalisée (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Tout afficher"</string>
+    <string name="see_less" msgid="1250265310929558370">"En voir moins"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Déconnecté"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de données utilisées"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> applications installées"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> utilisé sur <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Luminosité adaptative activée"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Luminosité adaptative désactivée"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index e81843c..4f3d964 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Très grande"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"1 - Très lente"</item>
-    <item msgid="2361722960903353554">"2 - Lente"</item>
-    <item msgid="1145554631248513562">"3 - Normale"</item>
-    <item msgid="7553665153391107454">"4 - Élevée"</item>
-    <item msgid="1370673569131070146">"5 - Plus élevée"</item>
-    <item msgid="4648206845228970803">"6 - Très élevée"</item>
-    <item msgid="4977949754169483251">"7 - Rapide"</item>
-    <item msgid="6106302964845503577">"8 - Très rapide"</item>
-    <item msgid="6800277205640837264">"9 - Le plus rapide"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Très grave"</item>
-    <item msgid="2692137425242433765">"Grave"</item>
-    <item msgid="3332408460740717754">"Normale"</item>
-    <item msgid="4907380534957572531">"Aigu"</item>
-    <item msgid="4699640516390840297">"Très aigu"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Recherche…"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 430cd2d..5a3d0b2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Désactivé par l\'administrateur"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empreinte digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer empreintes num."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utiliser empr. num. pour"</string>
@@ -328,14 +329,14 @@
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"Configurer le mode de verrouillage de secours de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"Ajouter votre empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Déverrouillage avec empreinte"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Il vous suffit d\'appuyer sur le capteur d\'empreinte digitale pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Remarque : Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un code d\'accès fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"En savoir plus"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localiser le capteur"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le capteur d\'empreinte numérique à l\'arrière du téléphone."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du capteur d\'empreinte digitale"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localisez le lecteur d\'empreinte à l\'arrière du téléphone."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Illustration présentant l\'appareil et la position du lecteur d\'empreintes digitales"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Supprimer"</string>
@@ -345,14 +346,14 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Déplacez légèrement votre doigt pour ajouter toutes les parties de votre empreinte digitale."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Empreinte ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il vous suffit de toucher le capteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour activer et déverrouiller votre appareil."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Lorsque cette icône s\'affiche, vous pouvez utiliser votre empreinte digitale."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ignorer config. empreintes digitales ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Vous avez choisi de déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Si vous ignorez cette étape maintenant, vous devrez reprendre la configuration ultérieurement. L\'opération prend environ une minute."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Verrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"OK"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Petit problème… Il ne s\'agit pas du capteur"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez capteur empreinte dig. sur appareil."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Utilisez le lecteur d\'empreintes intégré."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Délai d\'enregistrement de l\'empreinte digitale expiré. Veuillez réessayer."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Veuillez réessayer ou utiliser un autre doigt."</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personnel"</string>
-    <string name="category_work" msgid="8699184680584175622">"Professionnel"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Comptes de profils professionnels – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes de profils personnels"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professionnel – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Désactivé"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Toujours activé"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatique"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir en chiffrement basé sur un fichier"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré via un fichier"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Conversion en chiffrement basé sur un fichier en cours"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convertir la partition de données en chiffrement basé sur un fichier\n Avertissement ! Cette opération supprimera toutes vos données.\n Cette fonctionnalité est en version alpha et peut ne pas fonctionner correctement.\n Appuyez sur \"Effacer et convertir\" pour continuer."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Effacer et convertir…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Votre document peut passer par un ou plusieurs serveurs avant d\'être envoyé sur l\'imprimante."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Aucune imprimante trouvée"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Paramètres"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Détection de mot clé et interaction totales"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Reconnaissance vocale uniquement"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ce service de saisie vocale pourra effectuer une écoute vocale permanente et utiliser en votre nom les applications commandées par la voix. Il provient de l\'application :  <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Autoriser l\'utilisation de ce service ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Paramètres de la synthèse vocale"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Synthèse vocale"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utiliser mes paramètres"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Remplacer les paramètres de l\'application par les paramètres ci-dessous"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Paramètres par défaut"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Moteur par défaut"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Définir le moteur de synthèse vocale à utiliser pour le texte énoncé"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Cadence"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Vitesse à laquelle le texte est énoncé"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utiliser la langue du système"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la synthèse vocale"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installer les données vocales"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer les données nécessaires à la synthèse vocale"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Les données nécessaires à la synthèse vocale sont déjà correctement installées."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Vos paramètres ont été modifiés. Voici un échantillon illustrant les nouveaux paramètres."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Le moteur sélectionné ne peut pas fonctionner."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurer"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Sélectionner un autre moteur"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ce moteur de synthèse vocale est susceptible de collecter tout ce qui sera lu, y compris les données personnelles comme les mots de passe et les numéros de carte de paiement. Il provient du moteur <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voulez-vous activer son utilisation ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Une connexion réseau est nécessaire pour la synthèse vocale dans cette langue."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Voici un échantillon de synthèse vocale."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"État de la langue par défaut"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> sont compatibles."</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> nécessitent une connexion réseau."</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> ne sont pas compatibles."</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Vérification en cours..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Moteurs"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Paramètres <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est activé."</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est désactivé."</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Paramètres du moteur"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Paramètres de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Langues et voix"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installée"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Non installée"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femme"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Homme"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Moteur synthèse vocale installé"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Activer moteur avant utilisation"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lancer les paramètres du moteur"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Moteur préféré"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Paramètres généraux"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Contrôle de l\'alimentation"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mise à jour des paramètres Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher \"L\'application ne répond plus\" pour applis en arrière-plan"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forcer disponibilité stockage externe pour applis"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Rend possible enregistrement de toute appli sur espace stockage externe, indépendamment valeurs fichier manifeste."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forcer possibilité de redimensionner les activités"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permet de redimensionner toutes les activités pour le mode multifenêtre, indépendamment des valeurs du fichier manifeste."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Consommation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Conso données"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Le suivi de la consommation effectué par votre opérateur peut différer de celui de votre appareil."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Aucune interruption"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interruptions visuelles"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer aussi pour les appels"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications s\'affichent ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications appli"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notifications par thème"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du numéroteur"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage de l\'écran"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ne jamais afficher les notifications de cette application"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Considérer comme prioritaire"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"N\'activer les notifications sonores de cette application que lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Autoriser l\'aperçu"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permettre à cette application de mettre certaines notifications en évidence en les faisant glisser pour les afficher brièvement sur l\'écran actuel"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer l\'option \"Ne pas déranger\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Autoriser les interruptions par ces notifications lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Masquer le contenu sensible"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Lorsque l\'appareil est verrouillé, masquer tout contenu figurant dans les notifications de cette application et susceptible de révéler des informations privées"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Lorsque l\'appareil est verrouillé, masquer le contenu de ces notifications qui est susceptible de révéler des informations privées"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritaire"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Toujours interrompre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Aucune interrup. écran"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Empêcher les notifications désactivées par le mode Ne pas déranger de s\'afficher brièvement ou durablement sur l\'écran actuel"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Aucun voyant notif."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Empêcher les notifications désactivées par le mode Ne pas déranger de faire clignoter le voyant"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander code PIN avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'appareil lors de l\'annulation de l\'épinglage"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ce profil professionnel est géré par"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifications"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normales"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquer"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contenu sensible masqué"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritaires"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Aucun aperçu"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personnelles"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Professionnelles"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloquées"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritaires"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contenu sensible masqué"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Aucun aperçu"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Avec des URL de domaine"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Désactivé par l\'administrateur"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurer les applis"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Sélectionner un profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Autoris. des applis"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode de couleur des images"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Échelle d\'affichage"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densité d\'affichage zoom mise à l\'échelle échelle"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Petite"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Plus grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"La plus grande"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personnalisée (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Tout afficher"</string>
+    <string name="see_less" msgid="1250265310929558370">"Moins de détails"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Déconnecté"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> des données sont utilisées."</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> applications installées"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> sur <xliff:g id="SIZE2">%2$s</xliff:g> utilisés"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"L\'option \"Adaptation de la luminosité\" est ACTIVÉE."</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"L\'option \"Adaptation de la luminosité\" est DÉSACTIVÉE."</string>
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index 267e03f..fd7d9a6 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Moi lento"</item>
-    <item msgid="2361722960903353554">"Lento"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rápido"</item>
-    <item msgid="1370673569131070146">"Máis rápido"</item>
-    <item msgid="4648206845228970803">"Moi rápido"</item>
-    <item msgid="4977949754169483251">"Rápido"</item>
-    <item msgid="6106302964845503577">"Moi rápido"</item>
-    <item msgid="6800277205640837264">"O máis rápido"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Moi baixo"</item>
-    <item msgid="2692137425242433765">"Baixo"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alto"</item>
-    <item msgid="4699640516390840297">"Moi alto"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Buscando..."</item>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 83aa952..b73209c 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasinais"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desactivado polo administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Xest. identificación"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar identificac. para"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Non reproduce son ao inserir ou retirar o tablet da base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Non reproduce ningún son ao inserir ou extraer o teléfono da base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Traballo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de traballo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil persoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta do traballo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desactivado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre activada"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter no encriptado baseado en ficheiros"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Xa se encriptou o ficheiro"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Convertendo no encriptado baseado en ficheiros"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converte a partición de datos nun encriptado baseado en ficheiros.\n Advertencia: Esta acción borrará todos os datos.\n Esta función é alfa e quizais non funcione correctamente.\n Toca Borrar e converter... para continuar."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Borrar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensión"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servizos de impresión"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"É posible que o teu documento pase por un ou máis servidores antes de imprimirse."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Non hai servizos instalados"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Non se encontrou ningunha impresora"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuración"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Interacción e palabra activa completa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Síntese de voz simple"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este servizo de entrada de voz poderá supervisar que a voz sempre estea activada e controlar as aplicacións compatibles coa voz no teu nome. Procede da aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Queres activar o uso deste servizo?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configuración da síntese de voz"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Síntese de voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar sempre a miña configuración"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"A configuración predeterminada seguinte anula a configuración da aplicación"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predeterminado"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Define o motor de síntese de voz que se vai utilizar no texto falado"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocidade da fala"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade á que se di o texto"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta ao ton do texto falado"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utilizar idioma do sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma non seleccionado"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Escoitar un exemplo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduce unha breve demostración da síntese de voz"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar datos de voz"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instala os datos de voz necesarios para a síntese de voz"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"As voces requiridas para a síntese de voz xa están instaladas correctamente"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"A túa configuración cambiou. Este é un exemplo de como soa."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"O motor que escolliches non se pode executar."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Escolle outro motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"É posible que este motor de síntese de voz poida recompilar todo o texto falado, incluídos datos persoais como contrasinais e números de tarxetas de crédito. Provén do motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Queres activar o uso deste motor de síntese de voz?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma precisa dispoñer dunha conexión de rede que funcione para emitir a síntese de voz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Este é un exemplo da síntese de voz"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Estado do idioma predeterminado"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é completamente compatible"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> require unha conexión de rede"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Non se admite <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Comprobando..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuración de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está activado"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está desactivado"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuración do motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configuración de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas e voces"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalada"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Non instalada"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Muller"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Home"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor de síntese de voz instalado"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Activar novo motor antes uso."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configuración do motor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Xeral"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control de enerxía"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración da wi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización da configuración Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informa que aplicación segundo plano non responde"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forzar permiso de aplicacións de forma externa"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Fai que calquera aplicación se poida escribir nun almacenamento externo, independentemente dos valores expresados"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forzar o axuste do tamaño das actividades"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permite axustar o tamaño de todas as actividades para o modo de varias ventás, independentemente dos valores definidos."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos da aplicación"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Só alarmas"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silencio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupcións visuais"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de chamada do teléfono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de chamada de notificación predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar tamén nas chamadas"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Cando o teu dispositivo está bloqueado, como queres que se mostren as notificacións?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificacións"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacións de aplicacións"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificacións por tema"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado de marcación"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueo da pantalla"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrar nunca as notificacións desta aplicación"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permite oír as notificacións da aplicación cando a opción Non molestar está definida en Só prioridade"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir unha ollada"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permite que esta aplicación enfatice certas notificacións introducíndoas brevemente na visualización da pantalla actual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular opción Non molestar"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificacións sigan interrompendo cando a opción Non molestar estea configurada como Só prioridade"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar contido confidencial"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Oculta o contido das notificacións desta aplicación que poida revelar información privada cando o dispositivo está bloqueado."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Cando o dispositivo está bloqueado, ocúltase contido nestas notificacións que pode mostrar información privada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueada"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidencial"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar ao modo Só alarmas ata as <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia a interromper sempre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Sen interrupcións na pantalla"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Evita que as notificacións silenciadas pola función Non molestar se asomen ou aparezan na pantalla actual"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Non hai ningunha luz de notificación"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Evita que as notificacións silenciadas pola función Non molestar fagan que se acenda a luz"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notific. aplicacións"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar un PIN antes de soltar a pantalla"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar un contrasinal antes de soltar a pantalla"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao soltar a pantalla"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil do traballo"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de traballo está xestionado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Xestionado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificacións"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloqueadas"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contido confidencial oculto"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ningunha ollada"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Do traballo"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Con prioridade"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contido confidencial oculto"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ningunha ollada"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL de dominio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desactivado polo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicacións"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicacións"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso de acceso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imaxe"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de visualización"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"visualización densidade escala"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Máis grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"A máis grande"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ver todo"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desconectada"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de datos utilizados"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicacións instaladas"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> utilizados"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"O brillo adaptable está ACTIVADO"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"O brillo adaptable está DESACTIVADO"</string>
 </resources>
diff --git a/res/values-gu-rIN/arrays.xml b/res/values-gu-rIN/arrays.xml
index a2a5cbb..c0225ec 100644
--- a/res/values-gu-rIN/arrays.xml
+++ b/res/values-gu-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"મોટું"</item>
     <item msgid="7786168277516233536">"વિશાળ"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ખૂબ જ ધીમી"</item>
-    <item msgid="2361722960903353554">"ધીમી"</item>
-    <item msgid="1145554631248513562">"સામાન્ય"</item>
-    <item msgid="7553665153391107454">"ઝડપી"</item>
-    <item msgid="1370673569131070146">"વધુ ઝડપી"</item>
-    <item msgid="4648206845228970803">"ખૂબ ઝડપી"</item>
-    <item msgid="4977949754169483251">"રેપિડ"</item>
-    <item msgid="6106302964845503577">"ખૂબ જ ઝડપી"</item>
-    <item msgid="6800277205640837264">"સૌથી ઝડપી"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ખૂબ નીચો"</item>
-    <item msgid="2692137425242433765">"ઓછી"</item>
-    <item msgid="3332408460740717754">"સામાન્ય"</item>
-    <item msgid="4907380534957572531">"ઉચ્ચ"</item>
-    <item msgid="4699640516390840297">"ખૂબ ઉંચો"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"સ્કેન કરી રહ્યું છે..."</item>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 616ac79..1d635bc 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"મારું સ્થાન, સ્ક્રીન અનલૉક, SIM કાર્ડ લૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"મારું સ્થાન, સ્ક્રીન અનલૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"પાસવર્ડ્સ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"વ્યવસ્થાપક દ્વારા અક્ષમ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ફિંગરપ્રિન્ટ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ફિંગરપ્રિન્ટનું સંચાલન"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"આ માટે ફિંગરપ્રિન્ટ ઉપયોગ"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ટેબ્લેટને ડૉકમાં શામેલ કરતી અથવા દૂર કરતી વખતે ધ્વનિ ચલાવશો નહીં"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ફોનને ડૉકમાં શામેલ કરતી અથવા દૂર કરતી વખતે ધ્વનિ ચલાવશો નહીં"</string>
     <string name="account_settings" msgid="6403589284618783461">"એકાઉન્ટ્સ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"વ્યક્તિગત"</string>
-    <string name="category_work" msgid="8699184680584175622">"કાર્યાલય"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"કાર્ય પ્રોફાઇલ એકાઉન્ટ્સ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"વ્યક્તિગત પ્રોફાઇલ એકાઉન્ટ્સ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"કાર્ય એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"અક્ષમ કરેલ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"હંમેશાં ચાલુ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"સ્વચલિત"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ફાઇલ એન્ક્રિપ્શનમાં રૂપાંતરિત કરો"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"રૂપાંતરિત કરો..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ફાઇલ પહેલેથી જ એન્ક્રિપ્ટ કરેલ છે"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ફાઇલ આધારિત એન્ક્રિપ્શનમાં રૂપાંતરિત કરી રહ્યાં છીએ"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ડેટા પાર્ટિશનને ફાઇલ આધારિત એન્ક્રિપ્શનમાં રૂપાંતરિત કરો.\n !!ચેતવણી!! આ તમારો બધો ડેટા કાઢી નાખશે.\n આ સુવિધા આલ્ફા છે અને યોગ્ય રીતે કામ ન કરે તેવું બની શકે.\n ચાલુ રાખવા માટે ‘સાફ અને રૂપાંતરિત કરો...’ દબાવો."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"સાફ અને રૂપાંતરિત કરો..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"નિષ્ક્રિય થાઓ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"સ્ક્રીન બંધ કરે છે"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"નિષ્ક્રિયતાનાં <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> પછી"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"સેટિંગ્સ"</string>
     <string name="print_settings" msgid="4742428530112487843">"છાપવું"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"પ્રિન્ટ સેવાઓ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"તમારો દસ્તાવેજ પ્રિન્ટર સુધીના તેના માર્ગમાં એક અથવા વધુ સર્વર્સથી પસાર થઈ શકે છે."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"કોઈ સેવાઓ ઇન્સ્ટોલ કરેલી નથી"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"કોઈ પ્રિન્ટર મળ્યા નથી"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"સેટિંગ્સ"</string>
@@ -1881,54 +1884,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"પૂર્ણ હૉટવર્ડ અને ક્રિયાપ્રતિક્રિયા"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"સરળ સ્પીચ ટુ ટેક્સ્ટ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"આ વૉઇસ ઇનપુટ સેવા તમારા વતી હંમેશા-ચાલુ વૉઇસ મોનિટરિંગ કરવા અને વૉઇસ સક્ષમ એપ્લિકેશન્સને નિયંત્રિત કરવા માટે સમર્થ હશે. તે <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> એપ્લિકેશનમાંથી આવે છે. આ સેવાના ઉપયોગને સક્ષમ કરીએ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ટેક્સ્ટ-ટુ-સ્પીચ સેટિંગ્સ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"ટેક્સ્ટ ટુ સ્પીચ આઉટપુટ"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"હંમેશા મારી સેટિંગ્સનો ઉપયોગ કરો"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"નીચેની ડિફોલ્ટ સેટિંગ્સ એપ્લિકેશન સેટિંગ્સને ઓવરરાઇડ કરે છે"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ડિફોલ્ટ સેટિંગ્સ"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ડિફોલ્ટ એન્જિન"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"બોલાયેલ પાઠ માટે ઉપયોગ હેતુ વાણી સંશ્લેષણ એન્જિન સેટ કરો"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"વાણી દર"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ટેક્સ્ટ બોલાયેલ છે તે ઝડપ"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"પિચ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"બોલાયેલ ટેક્સ્ટનાં ટોન પર અસર કરે છે"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ભાષા"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"સિસ્ટમ ભાષાનો ઉપયોગ કરો"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ભાષા પસંદ કરેલ નથી"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"બોલાયેલ ટેક્સ્ટ માટે ભાષા-વિશિષ્ટ વૉઇસ સેટ કરે છે"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"એક ઉદાહરણ સાંભળો"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"વાણી સંશ્લેષણનું એક ટૂંકુ પ્રદર્શન ચલાવો"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"વૉઇસ ડેટા ઇન્સ્ટોલ કરો"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"વાણી સંશ્લેષણ માટે જરૂરી વૉઇસ ડેટા ઇન્સ્ટોલ કરો"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"પહેલાંથી યોગ્ય રીતે ઇન્સ્ટોલ થયેલ વાણી સંશ્લેષણ માટે વૉઇસ જરૂરી છે"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"તમારી સેટિંગ્સ બદલાઈ ગઈ છે. આ તે કેવી રીતે ધ્વનિ કરે તેનું એક ઉદાહરણ છે."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"તમે પસંદ કરેલ એન્જિન ચલાવી શકાતું નથી."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ગોઠવો"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"બીજું એન્જિન પસંદ કરો"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"આ વાણી સંશ્લેષણ એન્જિન પાસવર્ડ્સ અને ક્રેડિટ કાર્ડ નંબર જેવી વ્યક્તિગત માહિતી સહિત બોલવામાં આવશે તે તમામ ટેક્સ્ટને એકત્રિત કરવા માટે સક્ષમ હોઈ શકે છે. તે <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> એન્જિન પરથી આવે છે. આ વાણી સંશ્લેષણ એન્જિનના ઉપયોગને સક્ષમ કરીએ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"આ ભાષાને ટેક્સ્ટ ટુ સ્પીચ આઉટપુટ માટે ચાલુ નેટવર્કની આવશ્યકતા છે."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"આ વાણી સંશ્લેષણનું એક ઉદાહરણ છે"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ડીફોલ્ટ ભાષા સ્થિતિ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> સંપૂર્ણપણે સમર્થિત છે"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> નેટવર્ક કનેક્શનની આવશ્યકતા છે"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> સમર્થિત નથી"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"તપાસી રહ્યું છે..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"એન્જિન્સ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> સેટિંગ્સ"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ને સક્ષમ કરેલ છે"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> અક્ષમ છે"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"એન્જિન સેટિંગ્સ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> માટેની સેટિંગ્સ"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ભાષાઓ અને વૉઇસેસ"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ઇન્સ્ટોલ કરેલ"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ઇન્સ્ટોલ કરેલ નથી"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"સ્ત્રી"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"પુરુષ"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"વાણી સંશ્લેષણ એન્જિન ઇન્સ્ટોલ કર્યું"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ઉપયોગ પહેલાં નવા એન્જિનને સક્ષમ કરો."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"એન્જિન સેટિંગ્સ લોંચ કરો"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"મનપસંદ એન્જિન"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"સામાન્ય"</string>
     <string name="gadget_title" msgid="5519037532720577836">"પાવર નિયંત્રણ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi સેટિંગ અપડેટ કરી રહ્યાં છે"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth સેટિંગ અપડેટ કરી રહ્યું છે"</string>
@@ -2169,10 +2124,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"પૃષ્ઠભૂમિ એપ્લિકેશનો માટે એપ્લિકેશન પ્રતિસાદ આપતી નથી સંવાદ બતાવો"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"બાહ્ય પર એપ્લિકેશનોને મંજૂરી આપવાની ફરજ પાડો"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"મેનિફેસ્ટ મૂલ્યોને ધ્યાનમાં લીધા સિવાય, કોઈપણ એપ્લિકેશનને બાહ્ય સ્ટોરેજ પર લખાવા માટે લાયક બનાવે છે"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"પ્રવૃત્તિઓને ફરીથી કદ યોગ્ય થવા માટે ફરજ પાડો"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"તમામ પ્રવૃત્તિઓને મલ્ટી-વિંડો માટે ફરીથી કદ બદલી શકે તેવી બનાવે છે, મેનીફેસ્ટ મુલ્યોને ધ્યાનમાં લીધા સિવાય."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ડેટા વપરાશ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"એપ્લિકેશન ડેટા વપરાશ"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
@@ -2564,6 +2517,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ફક્ત એલાર્મ્સ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"સાવ શાંતિ"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"દૃશ્યાત્મક વિક્ષેપો"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ફોન રિંગટોન"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ડિફોલ્ટ સૂચના રિંગટોન"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"કૉલ્સ માટે પણ વાઇબ્રેટ કરો"</string>
@@ -2577,6 +2531,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે સૂચનાઓને કેવી રીતે દર્શાવવામાં આવે તેમ ઇચ્છો છો?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"સૂચનાઓ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"એપ્લિકેશન સૂચનાઓ"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"વિષયદીઠ સૂચનાઓ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"અન્ય ધ્વનિઓ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ડાયલપેડ ટોન્સ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"સ્ક્રીન લૉકિંગ ધ્વનિઓ"</string>
@@ -2604,12 +2559,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"એપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"તમામને અવરોધિત કરો"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"આ એપ્લિકેશનમાંથી ક્યારેય સૂચનાઓ દર્શાવશો નહીં"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"પ્રાધાન્યતા તરીકે ગણો"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"જ્યારે ખલેલ પાડશો નહીં ફક્ત પ્રાધાન્યતા પર સેટ કરેલ હોય ત્યારે આ એપ્લિકેશનની સૂચનાઓ સાંભળવા દો"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ગુપ્તપણે જોવાની મંજૂરી આપો"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"આ એપ્લિકેશનને અમુક સૂચનાઓને વર્તમાન સ્ક્રીન પર દૃશ્યમાં સંક્ષિપ્તમાં સ્લાઇડ કરીને તેમના પર ભાર મૂકવા દો"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ખલેલ પહોંચાડશો નહિ ને ઓવરરાઇડ કરો"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"જયારે ખલેલ પહોંચાડશો નહિ ને માત્ર પ્રાધાન્યતા પર સેટ કરેલું હોય ત્યારે આ સૂચનાઓને દખલગીરી કરવા દો"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"સંવેદનશીલ સામગ્રી છુપાવો"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"જ્યારે ઉપકરણ લૉક કરેલ હોય, ત્યારે આ એપ્લિકેશનની સૂચનાઓમાંની સામગ્રી છુપાવો કે જે ખાનગી માહિતી જણાવી શકે છે"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"જ્યારે ઉપકરણ લૉક કરેલ હોય, ત્યારે આ સૂચનાઓમાં ખાનગી માહિતીને ઉધાડી કરી શકે તેવી સામગ્રીને છુપાવો."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"અવરોધિત"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"પ્રાધાન્યતા"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"સંવેદનશીલ"</string>
@@ -2680,6 +2633,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"એલાર્મ્સ પર ફક્ત <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> સુધી બદલો"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"હંમેશાં ખલેલ પાડો પર બદલો"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"કોઈ સ્ક્રીન વિક્ષેપો નથી"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"ખલેલ પાડશો નહિ દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને વર્તમાન સ્ક્રીન પર દેખાતાં અથવા પિક થતાં અટકાવો"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"કોઈ સૂચના લાઇટ નથી"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ખલેલ પાડશો નહિ દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને કારણે લાઇટને ધબકતી અટકાવો"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"એપ્લિકેશન સૂચનાઓ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"સૂચનાઓની સેટિંગ્સ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"આ ઉપકરણ વિશે પ્રતિસાદ મોકલો"</string>
@@ -2692,7 +2649,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"અનપિન કરતાં પહેલાં PIN માટે પૂછો"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"અનપિન કરતાં પહેલાં પાસવર્ડ માટે પૂછો"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ઉપકરણને અનપિન કરતી વખતે લૉક કરો"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"કાર્ય પ્રોફાઇલ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"આ કાર્ય પ્રોફાઇલ આમના દ્વારા સંચાલિત થાય છે:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા સંચાલિત"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(પ્રાયોગિક)"</string>
@@ -2745,9 +2701,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"સૂચનાઓ"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"સામાન્ય"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"અવરોધિત કરો"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"સંવેદનશીલ સામગ્રી છુપાયેલ છે"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"પ્રાધાન્યતા"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"કોઈ છુપી નજર નહીં"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2769,15 +2722,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"વ્યક્તિગત"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"કાર્યાલય"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"અવરોધિત"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"પ્રાધાન્યતા"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"સંવેદનશીલ સામગ્રી છુપાયેલ છે"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"કોઈ છુપી નજર નહીં"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ડોમેન URL સાથે"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"વ્યવસ્થાપક દ્વારા અક્ષમ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"વિગતવાર"</string>
     <string name="configure_apps" msgid="6685680790825882528">"એપ્લિકેશનો ગોઠવો"</string>
     <string name="unknown_app" msgid="5275921288718717656">"અજાણી એપ્લિકેશન"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"પ્રોફાઇલ પસંદ કરો"</string>
     <string name="app_permissions" msgid="4148222031991883874">"એપ્લિકેશન પરવાનગીઓ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> માંથી <xliff:g id="COUNT_1">%d</xliff:g> એપ્લિકેશન્સને અતિરિક્ત ઍક્સેસની મંજૂરી છે"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> માંથી <xliff:g id="COUNT_0">%d</xliff:g> એપ્લિકેશન્સને મંજૂરી છે"</string>
@@ -2934,4 +2883,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ચિત્ર રંગ મોડ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB નો ઉપયોગ કરો"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"પ્રદર્શન સ્કેલ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"પ્રદર્શન ઘનતા ઝૂમ સ્કેલ સ્કેલિંગ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"નાનું"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"સામાન્ય"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"મોટું"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"વધુ મોટું"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"સૌથી મોટું"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"કસ્ટમ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"બધું જુઓ"</string>
+    <string name="see_less" msgid="1250265310929558370">"ઓછું જુઓ"</string>
+    <string name="disconnected" msgid="5787956818111197212">"ડિસ્કનેક્ટ કર્યું"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ડેટા વાપર્યો"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશનો ઇન્સ્ટોલ કરી"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> માંથી <xliff:g id="SIZE1">%1$s</xliff:g> વાપર્યા"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"અનુકૂલનશીલ તેજસ્વીતા ચાલુ છે"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"અનુકૂલનશીલ તેજસ્વીતા બંધ છે"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 5cdc20a..c3dead3 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"बड़ा"</item>
     <item msgid="7786168277516233536">"बहुत बड़ा"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"अत्‍यधिक धीमा"</item>
-    <item msgid="2361722960903353554">"धीमा"</item>
-    <item msgid="1145554631248513562">"सामान्य"</item>
-    <item msgid="7553665153391107454">"तेज़"</item>
-    <item msgid="1370673569131070146">"अधिक तेज़"</item>
-    <item msgid="4648206845228970803">"अत्‍यधिक तेज़"</item>
-    <item msgid="4977949754169483251">"त्वरित"</item>
-    <item msgid="6106302964845503577">"अत्यधिक त्वरित"</item>
-    <item msgid="6800277205640837264">"सबसे तेज़"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"अत्‍यधिक कम"</item>
-    <item msgid="2692137425242433765">"निम्न"</item>
-    <item msgid="3332408460740717754">"सामान्य"</item>
-    <item msgid="4907380534957572531">"उच्च"</item>
-    <item msgid="4699640516390840297">"अत्‍यधिक उच्‍च"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"स्‍कैन कर रहा है…"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6713690..4900226 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्ड"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"अंगुली की छाप"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"फ़िंगरप्रिंट प्रबंधित करें"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"इनके हेतु फ़िंगरप्रिंट उपयोग करें"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉक में टेबलेट सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डॉक में फ़ोन सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाते"</string>
-    <string name="category_personal" msgid="1299663247844969448">"व्यक्तिगत"</string>
-    <string name="category_work" msgid="8699184680584175622">"कार्यालय"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफ़ाइल खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"व्‍यक्‍तिगत प्रोफ़ाइल खाते"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्यस्‍थल खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"अक्षम"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"हमेशा चालू"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"फ़ाइल एन्क्रिप्शन में रूपांतरित करें"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"रूपांतरित करें..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"फ़ाइल पहले से एन्क्रिप्ट की हुई है"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"फ़ाइल आधारित एन्क्रिप्शन में रूपांतरित कर रहा है"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"डेटा विभाजन को फ़ाइल आधारित एन्क्रिप्शन में रूपांतरित करें.\n !!चेतावनी!! इससे आपका सभी डेटा मिट जाएगा.\n यह सुविधा अल्फ़ा स्थिति में है और ठीक से कार्य नहीं कर सकती.\n जारी रखने के लिए \'वाइप करें और रूपांतरित करें…\' दबाएं."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"वाइप करें और रूपांतरित करें…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद हो जाती है"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग"</string>
     <string name="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"प्रिंट सेवाएं"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"प्रिंटर पर जाते समय आपका दस्तावेज़ एक या अधिक सर्वर से गुज़र सकता है."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कोई प्रिंटर नहीं मिला"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"पूर्ण हॉटवर्ड और इंटरैक्शन"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"आसान वाक् से लेख"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"यह ध्वनि इनपुट सेवा आपकी ओर से, हमेशा चालू रहने वाली ध्वनि निगरानी को निष्पादित कर सकेगी और ध्वनि सक्षम ऐप्लिकेशन नियंत्रित कर सकेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ऐप्लिकेशन की ओर से आती है. क्या इस सेवा का उपयोग सक्षम करें?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"लेख से बोली सेटिंग"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"लेख को सुनें"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"हमेशा मेरी सेटिंग का उपयोग करें"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"नीचे दी गईं डिफ़ॉल्ट सेटिंग ऐप्स सेटिंग को ओवरराइड करती हैं"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"डिफ़ॉल्‍ट सेटिंग"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"डिफ़ॉल्‍ट इंजन"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"वाक् संश्लेषण इंजन को बोले जाने वाले लेख के लिए सेट करें"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"बोली दर"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"बोलने की गति तय करें"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोले गए लेख के लहजे को प्रभावित करता है"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"भाषा"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"सिस्‍टम भाषा का उपयोग करें"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा नहीं चुनी गई है"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"बोले गए लेख के लिए भाषा-विशिष्ट ध्‍वनि सेट करता है"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"एक उदाहरण सुनें"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"बोली संश्लेषण का एक संक्षिप्त प्रदर्शन चलाएं"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ध्‍वनि डेटा इंस्टॉल करें"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"बोली-संश्लेषण के लिए आवश्‍यक ध्‍वनि डेटा इंस्‍टॉल करें"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"बोली संश्लेषण के लिए आवश्‍यक ध्‍वनियां पहले ही इंस्‍टॉल कर दी गई हैं"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"आपकी सेटिंग बदल गई हैं. यह उनके उच्‍चारण के तरीके का उदाहरण है."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"आपके द्वारा चुना गया इंजन चलाया नहीं जा सकता."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"कॉन्फ़िगर करें"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"अन्‍य इंजन चुनें"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"यह बोली संश्लेषण इंजन पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा समेत आपके द्वारा बोले जाने वाले सभी लेख को एकत्र कर सकता है. यह <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजन से आता है. इस बोली संश्लेषण इंजन के उपयोग को सक्षम करें?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"लेख-से-बोली आउटपुट के लिए इस भाषा को क्रियाशील नेटवर्क कनेक्शन की आवश्यकता है."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"यह बोली संश्लेषण का एक उदाहरण है"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"डिफ़ॉल्ट भाषा स्थिति"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> पूरी तरह से समर्थित है"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> के लिए नेटवर्क कनेक्शन की आवश्यकता है"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> समर्थित नहीं है"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"जांच हो रही है..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"इंजन"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सेटिंग"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सक्षम किया गया है"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> अक्षम किया गया है"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"इंजन सेटिंग"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> के लिए सेटिंग"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"भाषाएं और ध्‍वनियां"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"इंस्‍टॉल की गई"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"इंस्‍टॉल नहीं की गई"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"महिला"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"पुरुष"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"बोली संश्लेषण इंजन इंस्‍टॉल किया गया"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"उपयोग के पहले नया इंजन सक्षम करें."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"इंजन सेटिंग लॉन्‍च करें"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"पसंदीदा इंजन"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"सामान्य"</string>
     <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई  सेटिंग के बारे में नई जानकारी मिलना"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग में नई जानकारी मिल रही है"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"पृष्ठभूमि ऐप्स के लिए ऐप्स प्रतिसाद नहीं दे रहा डॉयलॉग दिखाएं"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"ऐप्स को बाहरी मेमोरी पर बाध्‍य करें"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"इससे कोई भी ऐप मेनिफेस्‍ट मान अनदेखा करके, बाहरी मेमोरी पर लिखने योग्‍य बन जाता है"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"आकार बदले जाने के लिए गतिविधियों को बाध्य करें"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"एकाधिक-विंडो के लिए सभी गतिविधियों के आकार को बदले जाने योग्य बनाता है, चाहे मेनिफेस्ट मान कुछ भी हों."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा उपयोग"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ऐप्स डेटा उपयोग"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"वाहक की डेटा गणना आपके डिवाइस से भिन्न हो सकती है."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवल अलार्म"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"पूरी तरह शांत"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"विज़ुअल रुकावटें"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफ़ॉल्ट नोटिफिकेशन रिंगटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप नोटिफिकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"नोटिफिकेशन"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स नोटिफिकेशन"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"विषय नोटिफिकेशन"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पैड टोन"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्क्रीन लॉक करने की ध्वनियां"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"इस ऐप्स से कभी भी नोटिफिकेशन न दिखाएं"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राथमिकता के रूप में व्यवहार करें"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"जब परेशान ना करें केवल प्राथमिकता पर सेट हो, तो इस ऐप के नोटिफिकेशन सुनने दें"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"गुप्त रूप से देखने दें"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"कुछ नोटिफिकेशन को थोड़ी देर के लिए वर्तमान स्‍क्रीन पर स्‍लाइड करके इस ऐप को उन्हें महत्वपूर्ण दर्शाने दें"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान ना करें को ओवरराइड करें"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब परेशान ना करें को केवल प्राथमिकता पर सेट किया गया हो, तब इन नोटिफिकेशन को बाधित करते रहने दें"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री छिपाएं"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"जब डिवाइस लॉक हो, तो इस ऐप के नोटिफिकेशन की सामग्री छिपाएं जो निजी जानकारी को प्रकट कर सकती है"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"जब डिवाइस लॉक किया गया हो, तब इन नोटिफिकेशन की ऐसी सामग्री छिपा दें जिससे निजी जानकारी प्रकट हो सकती है"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राथमिकता"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"केवल <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> तक के लिए अलार्म को बदलें"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"हमेशा बाधित करें में बदलें"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"स्‍क्रीन रुकावट नहीं"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"परेशान ना करें द्वारा मौन किए गए नोटिफिकेशन को वर्तमान स्‍क्रीन पर तांक-झांक करने या दिखाई देने से रोकें"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"नोटिफिकेशन रोशनी नहीं"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"परेशान ना करें द्वारा मौन किए गए नोटिफिकेशन को रोशनी करने से रोकें"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स नोटिफिकेशन"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"नोटिफिकेशन सेटिंग"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करने से पहले पिन के लिए पूछें"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करने से पहले पासवर्ड के लिए पूछें"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करते समय डिवाइस लॉक करें"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफ़ाइल"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यह कार्य प्रोफ़ाइल इनके द्वारा प्रबंधित की जाती है:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा प्रबंधित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"नोटिफिकेशन"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"सामान्य"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"अवरुद्ध करें"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"संवेदनशील सामग्री छिपी हुई है"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"प्राथमिकता"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"कोई तांक-झांक नहीं"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्यस्‍थल"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"अवरोधित"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राथमिकता"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"संवेदनशील सामग्री छिपी हुई है"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"कोई तांक-झांक नहीं"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL के साथ"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"नियंत्रक के द्वारा अक्षम किया गया"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ऐप्स कॉन्‍फ़िगर करें"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"प्रोफ़ाइल चुनें"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ऐप अनुमतियां"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अतिरिक्त एक्सेस की अनुमति है"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अनुमति है"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रंग मोड"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB का उपयोग करें"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"प्रदर्शन पैमाना"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"प्रदर्शन घनत्व ज़ूम पैमाना मापना"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"छोटा"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"सामान्य"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"बड़ा"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"अधिक बड़ा"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"सबसे बड़ा"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"कस्टम (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"सभी देखें"</string>
+    <string name="see_less" msgid="1250265310929558370">"कम देखें"</string>
+    <string name="disconnected" msgid="5787956818111197212">"डिस्कनेक्ट किया गया"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> डेटा का उपयोग किया गया है"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ऐप्‍स इंस्‍टॉल किए गए हैं"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> में से <xliff:g id="SIZE1">%1$s</xliff:g> उपयोग किया गया है"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"अनुकूलनीय स्‍क्रीन की रोशनी चालू है"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"अनुकूलनीय स्‍क्रीन की रोशनी बंद है"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 1a6e04b..6117142 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Velik"</item>
     <item msgid="7786168277516233536">"Ogroman"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Jako sporo"</item>
-    <item msgid="2361722960903353554">"Sporo"</item>
-    <item msgid="1145554631248513562">"Normalni"</item>
-    <item msgid="7553665153391107454">"Brzo"</item>
-    <item msgid="1370673569131070146">"Brže"</item>
-    <item msgid="4648206845228970803">"Vrlo brzo"</item>
-    <item msgid="4977949754169483251">"Ubrzano"</item>
-    <item msgid="6106302964845503577">"Vrlo ubrzano"</item>
-    <item msgid="6800277205640837264">"Najbrže"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Jako nisko"</item>
-    <item msgid="2692137425242433765">"Niski"</item>
-    <item msgid="3332408460740717754">"Normalno"</item>
-    <item msgid="4907380534957572531">"Visoki"</item>
-    <item msgid="4699640516390840297">"Vrlo visoko"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skeniranje..."</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d4980c6..7e2dcf2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -314,6 +314,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogućio administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Otisci prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upotreba otiska prsta"</string>
@@ -819,8 +820,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ne reproduciraj zvuk pri umetanju ili uklanjanju tabletnog uređaja iz priključne stanice"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ne reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
     <string name="account_settings" msgid="6403589284618783461">"Računi"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobno"</string>
-    <string name="category_work" msgid="8699184680584175622">"Posao"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Računi radnih profila – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Računi osobnih profila"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Radni račun – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +842,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Onemogućeno"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Uvijek uključeno"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatska"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvori u enkripciju datoteka"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pretvori…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkripcija datoteka već je izvršena"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Pretvaranje u enkripciju datoteka"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Pretvorite podatkovnu particiju u enkripciju datoteka.\n Upozorenje! Time će se izbrisati svi vaši podaci.\n Značajka je u alfa verziji i možda neće funkcionirati pravilno.\n Pritisnite \"Izbriši i pretvori...\" da biste nastavili."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Izbriši i pretvori…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kada prođe <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -1711,8 +1716,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
     <string name="print_settings" msgid="4742428530112487843">"Ispis"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Usluge ispisa"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Na putu do pisača vaš dokument može proći kroz jedan ili više poslužitelja."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nije pronađen nijedan pisač"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Postavke"</string>
@@ -1893,54 +1896,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Potpuni pokretač značajki i interakcija"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednostavno pretvaranje govora u tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Usluga glasovnog unosa moći će u vaše ime neprekidno nadzirati glasovne unose i kontrolirati aplikacije s omogućenom glasovnom interakcijom. Pruža je <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Želite li omogućiti tu uslugu?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Postavke za tekst u govor"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Pretvaranje teksta u govor"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Uvijek koristi moje postavke"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Donje zadane postavke poništavaju postavke aplikacije"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Zadane postavke"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Zadani alat"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Postavi alat za sintezu govora koji će se upotrebljavati za govorni tekst"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Brzina govora"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Brzina kojom se izgovara tekst"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina glasa"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Utječe na ton izgovorenog teksta"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"upotrijebi jezik sustava"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije odabran"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja jezik govora"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Poslušajte primjer sinteze zvuka"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instaliraj glasovne podatke"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instaliraj glasovne podatke potrebne za sintezu govora"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Glasovi potrebni za sintezu govora već su ispravno instalirani"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Vaše su postavke promijenjene. Ovo je primjer kako zvuče."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Alat koji ste odabrali ne može se pokrenuti."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Odaberite drugi alat"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Alat za sintezu govora može prikupljati izgovoreni sadržaj, uključujući osobne podatke kao što su zaporke i brojevi kreditnih kartica. To omogućuje alat <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Želite li omogućiti alat za sintezu govora?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Da bi se dobili izlazni podaci pretvaranja teksta u govor za taj jezik, potrebna je aktivna veza s mrežom."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ovo je primjer sinteze govora"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status zadanog jezika"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> je u potpunosti podržan"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> zahtijeva mrežnu vezu"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nije podržan"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Provjera..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Alati"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> postavke"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Stavka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogućena"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Stavka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogućena"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Postavke tražilice"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jezici i glasovi"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalirano"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nije instalirano"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Žena"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Muškarac"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Stroj za sintezu govora uključen"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Omogući alat prije upotrebe"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Postavke pokretanja alata"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni alat"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Opće"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Nadzor nad napajanjem"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje Wi-Fi postavki"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje postavke Bluetootha"</string>
@@ -2181,10 +2136,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Prikaz dijaloga o pozad. aplik. koja ne odgovara"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Prisilno dopusti aplikacije u vanjskoj pohrani"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Aplikacije se mogu zapisivati u vanjsku pohranu neovisno o manifestu"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Nametni mogućnost promjene veličine za aktivnosti"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Veličina svih aktivnosti može se mijenjati za više prozora, neovisno o vrijednostima manifesta."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Upotreba podataka za apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
@@ -2576,6 +2529,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Potpuna tišina"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizualni prekidi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Zadana melodija zvona za obavijesti"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
@@ -2589,6 +2543,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kada je uređaj zaključan, kako želite da se obavijesti prikazuju?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Obavijesti"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Obavijesti po temi"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Ostali zvukovi"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi brojčanika"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvukovi zaključavanja zaslona"</string>
@@ -2617,12 +2572,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikad ne prikazuj obavijesti te aplikacije"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tretiraj kao prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Dopusti zvučne signale obavijesti ove aplikacije kada je \"Ne ometaj\" postavljeno na \"Samo prioritetno\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Dopusti zavirivanje"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Dopusti aplikaciji naglašavanje određenih obavijesti tako da ih nakratko prikaže na trenutačnom zaslonu"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Sakrij osjetljiv sadržaj"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Kada je uređaj zaključan, u obavijestima ove aplikacije ne prikazuj sadržaj koji bi mogao otkriti privatne podatke"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kada je uređaj zaključan, u tim obavijestima sakrij sadržaj koji bi mogao otkriti privatne podatke"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
@@ -2695,6 +2648,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Promijeni na \"Samo alarmi\" do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Promijeni na \"Uvijek prekidaj\""</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Bez prekida na zasl."</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Sprječava da se obavijesti utišane opcijom Ne ometaj pojavljuju na trenutačnom zaslonu"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Bez svjetla obav."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Sprječava pulsiranje svjetla za obavijesti utišane opcijom Ne ometaj"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
@@ -2707,7 +2664,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Traži PIN radi otkvačivanja"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Traži zaporku radi otkvačivanja"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Zaključaj uređaj prilikom otkvačivanja"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Radni profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ovim radnim profilom upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
@@ -2760,9 +2716,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Obavijesti"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Uobičajeno"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokiranje"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Skriven osjetljivi sadržaj"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritetno"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Onemogućeno zavirivanje"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2787,15 +2740,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobno"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetno"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Skriven osjetljivi sadržaj"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Onemogućeno zavirivanje"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S URL-ovima domena"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Onemogućio administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguranje aplikacija"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Odabir profila"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Dozvole aplikacijama"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Broj aplikacija s dodatnim pristupom: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Broj aplikacija s dopuštenjem: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2919,7 +2868,7 @@
     <string name="system_alert_window_settings" msgid="1757821151143694951">"Povlačenje preko drugih aplikacija"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikacije"</string>
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"Povlačenje preko drugih aplikacija"</string>
-    <string name="permit_draw_overlay" msgid="6606018549732046201">"Dopusti povlačenje preko drugih aplikacija"</string>
+    <string name="permit_draw_overlay" msgid="6606018549732046201">"Dopusti preslikavanje preko drugih aplikacija"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Dopuštenje za povlačenje aplikacije na vrh"</string>
     <string name="allow_overlay_description" msgid="7895191337585827691">"To dopuštenje omogućuje aplikaciji da se prikazuje iznad drugih aplikacija koje upotrebljavate i može ometati upotrebu sučelja drugih aplikacija ili naizgled promijeniti sadržaj drugih aplikacija."</string>
     <string name="keywords_system_alert_window" msgid="8579673659566564926">"povlačenje prozora upozorenja sustava iznad drugih aplikacija"</string>
@@ -2955,4 +2904,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Način boje slike"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Upotrijebi sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala prikaza"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"prikaz gustoća zumiranje skala skaliranje"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Malo"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Uobičajeno"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Veliko"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Veće"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Najveće"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Prilagođeno (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Prikaži sve"</string>
+    <string name="see_less" msgid="1250265310929558370">"Prikaži manje"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Veza je prekinuta"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Količina iskorištenih podataka: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Broj instaliranih aplikacija: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Iskorišteno <xliff:g id="SIZE1">%1$s</xliff:g> od <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Prilagodljiva je svjetlina uključena"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Prilagodljiva je svjetlina isključena"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index a3ba3b7..d3bc966 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Nagy"</item>
     <item msgid="7786168277516233536">"Hatalmas"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Nagyon lassú"</item>
-    <item msgid="2361722960903353554">"Lassú"</item>
-    <item msgid="1145554631248513562">"Normál"</item>
-    <item msgid="7553665153391107454">"Gyors"</item>
-    <item msgid="1370673569131070146">"Gyorsabb"</item>
-    <item msgid="4648206845228970803">"Nagyon gyors"</item>
-    <item msgid="4977949754169483251">"Gyors"</item>
-    <item msgid="6106302964845503577">"Rendkívül gyors"</item>
-    <item msgid="6800277205640837264">"Leggyorsabb"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Nagyon alacsony"</item>
-    <item msgid="2692137425242433765">"Alacsony"</item>
-    <item msgid="3332408460740717754">"Normál"</item>
-    <item msgid="4907380534957572531">"Magas"</item>
-    <item msgid="4699640516390840297">"Nagyon magas"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Keresés..."</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b6f22c2..08c3178 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Letiltva a rendszergazda által"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Ujjlenyomat"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Ujjlenyomatok kezelése"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Ujjlenyomat ehhez:"</string>
@@ -329,7 +330,7 @@
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"Adja meg ujjlenyomatát"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Feloldás: ujjlenyomat"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"Csak érintse meg az ujjlenyomat-érzékelőt a telefon zárolásának feloldásához, vásárlások jóváhagyásához, illetve alkalmazásokba történő bejelentkezéshez. Gondolja végig, hogy mely ujjlenyomatokat adja meg: az összes megadott ujjlenyomattal végrehajthatók lesznek ezek a műveletek."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Megjegyzés: Az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN kód."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"Megjegyzés: Az ujjlenyomat kevésbé biztonságos, mint egy bonyolult minta vagy PIN-kód."</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"További információ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tovább"</string>
@@ -378,7 +379,7 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Töltse fel az akkumulátort, és próbálja újra."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Csatlakoztassa töltőjét, és próbálja újra."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nincs a zárolási képernyőhöz tartozó PIN kód vagy jelszó"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nincs a zárolási képernyőhöz tartozó PIN-kód vagy jelszó"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Be kell állítani egy zárolási képernyőhöz tartozó PIN kódot vagy jelszót a titkosítás megkezdése előtt."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Titkosítja?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"A titkosítási művelet visszafordíthatatlan, ha megszakítja, adatai elvesznek. A titkosítás legalább egy órát vesz igénybe, mialatt a táblagép többször újra fog indulni."</string>
@@ -404,7 +405,7 @@
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Válassza ki a biztonsági képernyő-zárolási módszert"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Minta, PIN kód és jelszavas védelem módosítása és kikapcsolása"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Minta, PIN-kód és jelszavas védelem módosítása és kikapcsolása"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Válasszon módszert a képernyő lezárásához"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nincs"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
@@ -412,7 +413,7 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nincs védelem"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Minta"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Közepes védelem"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN kód"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-kód"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Közepes/magas védelem"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Magas védelem"</string>
@@ -421,7 +422,7 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Csúsztatás"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Minta"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kód"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kód"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Jelszó"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Képernyőzár beállítását követően a Beállítások &gt; Biztonság részben beállíthatja ujjlenyomatát is."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Képernyőzár kikapcsolása"</string>
@@ -430,8 +431,8 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Az eszközvédelmi funkciók nem működnek a minta nélkül.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Az eszközvédelmi funkciók nem működnek a PIN kód nélkül."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Az eszközvédelmi funkciók nem működnek a PIN kód nélkül.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Az eszközvédelmi funkciók nem működnek a PIN-kód nélkül."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Az eszközvédelmi funkciók nem működnek a PIN-kód nélkül.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Az eszközvédelmi funkciók nem működnek a jelszó nélkül."</string>
@@ -444,7 +445,7 @@
 </xliff:g>A mentett ujjlenyomatok is törlődnek az eszközről, és a segítségükkel nem fogja tudni feloldani a telefon zárolását, jóváhagyni a vásárlásokat, illetve bejelentkezni az alkalmazásokba."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Igen, kikapcsolom"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
-    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN kód módosítása"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"A PIN kódnak legalább %d számjegyűnek kell lennie."</string>
@@ -452,7 +453,7 @@
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél."</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"A PIN kódnak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> számjegynél."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"A PIN kód csak számokat tartalmazhat, 0-tól 9-ig."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"A PIN-kód csak számokat tartalmazhat, 0-tól 9-ig."</string>
     <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Az eszközrendszergazda nem engedélyezi a legutóbbi PIN kódok használatát."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"A jelszó nem használható karaktert tartalmaz."</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A jelszónak tartalmaznia kell legalább egy betűt."</string>
@@ -503,7 +504,7 @@
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"Párosítja a következővel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Bluetooth-párosítókód"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Gépelje be a párosítókódot, majd nyomja meg az Enter vagy a Return gombot"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"A PIN kód betűket vagy szimbólumokat tartalmaz"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"A PIN-kód betűket vagy szimbólumokat tartalmaz"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Általában 0000 vagy 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"16 számjegyűnek kell lennie"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Előfordulhat, hogy a PIN kódot a másik készüléken is meg kell adnia."</string>
@@ -622,7 +623,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi hálózatok"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gomb"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"További lehetőségek"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kód megadása"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN-kód megadása"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Speciális"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ne legyen hangjelzés a táblagépnek a dokkba történő behelyezésekor vagy onnan eltávolításakor"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ne játsszon le hangot a telefon dokkolóba helyezésekor és kivételekor"</string>
     <string name="account_settings" msgid="6403589284618783461">"Fiókok"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Személyes"</string>
-    <string name="category_work" msgid="8699184680584175622">"Munkahelyi"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"„Munkaprofil” fiókok – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"„Személyes profil” fiókok"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Munkahelyi fiók – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Kikapcsolva"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Mindig bekapcsolva"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatikus"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertálás fájlalapú titkosításra"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertálás…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Már fájlalapú titkosítást használ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Konvertálás fájlalapú titkosításra"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konvertálja az adatalapú titkosítást használó partíciót fájlalapú titkosítást használóvá.\n FIGYELEM! A művelet minden adatot töröl.\n A funkció alfatesztelésben van, és lehet, hogy nem megfelelően működik.\n Nyomja meg a „Törlés és konvertálás…” lehetőséget a folytatáshoz."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Törlés és konvertálás…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -859,23 +864,23 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kártya zárolásának beállítása"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kártya zárolása"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kártya lezárása"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN kód kérése a táblagép használatához"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN kód kérése a telefon használatához"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN kód kérése a táblagép használatához"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN kód kérése a telefon használatához"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-kód kérése a táblagép használatához"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kód kérése a telefon használatához"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-kód kérése a táblagép használatához"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kód kérése a telefon használatához"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM kártya PIN kódjának módosítása"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM kártya PIN kódja"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kártya lezárása"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM kártya feloldása"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"SIM kártya régi PIN kódja"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Új PIN kód a SIM kártyához"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Új PIN-kód a SIM kártyához"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Írja be ismét az új PIN kódot"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM kártya PIN kódja"</string>
-    <string name="sim_bad_pin" msgid="2345230873496357977">"Helytelen PIN kód"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"Helytelen PIN-kód"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"A PIN kódok nem egyeznek"</string>
-    <string name="sim_change_failed" msgid="3602072380172511475">"Nem lehet megváltoztatni a PIN kódot.\nLehet, hogy hibás a PIN kód."</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"Nem lehet megváltoztatni a PIN-kódot.\nLehet, hogy hibás a PIN-kód."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"A SIM kártya PIN kódja sikeresen módosításra került"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"Nem lehet megváltoztatni a SIM kártya zárolási állapotát.\nLehet, hogy hibás a PIN kód."</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"Nem lehet megváltoztatni a SIM kártya zárolási állapotát.\nLehet, hogy hibás a PIN-kód."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Több SIM kártyát találtunk"</string>
@@ -884,7 +889,7 @@
     <string name="sim_change_data_message" msgid="1313940695939674633">"A(z) <xliff:g id="NEW_SIM">%1$s</xliff:g> kártyát szeretné használni a(z) <xliff:g id="OLD_SIM">%2$s</xliff:g> helyett mobiladatok esetén?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"Frissíti a preferált SIM-et?"</string>
     <string name="sim_preferred_message" msgid="301251431163650167">"A(z) <xliff:g id="NEW_SIM">%1$s</xliff:g> az egyetlen SIM kártya az eszközben. Ezt a kártyát szeretné használni az adatforgalom, a hívások, és SMS-forgalom lebonyolítására?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Helytelen PIN kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Helytelen PIN-kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="other">A SIM kártya PIN kódja helytelen. <xliff:g id="NUMBER_1">%d</xliff:g> próbálkozás maradt.</item>
       <item quantity="one">A SIM kártya PIN kódja helytelen. <xliff:g id="NUMBER_0">%d</xliff:g> próbálkozás maradt. Utána a szolgáltatótól kell feloldást kérnie.</item>
@@ -1236,22 +1241,22 @@
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Adja meg PIN kódját"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Jelszó megerősítése"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Erősítse meg a mintát"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN kód megerősítése"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"A jelszavak nem egyeznek"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"A PIN kódok nem egyeznek"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Kijelöltek feloldása"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A jelszó beállítva"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN kód beállítva"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN-kód beállítva"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"A minta beállítva"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="7050256155547273836">"A folytatáshoz használja eszköze mintáját."</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="1072670959803859869">"A folytatáshoz adja meg eszköze PIN kódját."</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="1022239625083264596">"A folytatáshoz adja meg eszköze jelszavát."</string>
-    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Helytelen PIN kód"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Helytelen PIN-kód"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Helytelen jelszó"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Helytelen minta"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Eszközbiztonság"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Feloldási minta módosítása"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN kód módosítása"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN-kód módosítása"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rajzoljon egy feloldási mintát"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nyomja meg a Menü gombot, ha segítségre van szüksége."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Emelje fel az ujját, ha kész"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Beállítások"</string>
     <string name="print_settings" msgid="4742428530112487843">"Nyomtatás"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Nyomtatási szolgáltatások"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Használja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"A dokumentum áthaladhat egy vagy több szerveren, mielőtt a nyomtatóhoz érne."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nincs telepített szolgáltatás"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nem található nyomtató"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Beállítások"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Parancsszó és hangvezérlés"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Egyszerű beszédfelismerés"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ez a hangbeviteli szolgáltatás képes lesz a folyamatos beszédhangkeresésre, valamint a hangvezérelt alkalmazásoknak az Ön nevében történő irányítására. A(z) <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> alkalmazás működteti. Engedélyezi a szolgáltatást?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Szöveg-beszéd átalakítás beállításai"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Szövegfelolvasás"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Mindig a saját beállításaim használata"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Az alábbi alapértelmezett beállítások felülírják az alkalmazásbeállításokat"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Alapértelmezett beállítások"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Alapértelmezett motor"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Adja meg a beszédelemző motort a hangalapú szöveg használatához"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Beszéd sebessége"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"A szöveg kimondásának sebessége"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hangmagasság"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"A beszélt szöveg hangszínét befolyásolja"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Nyelv"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"A rendszer nyelvének használata"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nincs nyelv kiválasztva"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Beállítja a beszélt szöveg nyelvspecifikus hangját"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Példa meghallgatása"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Beszédszintézis rövid bemutatása"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Hangadatok telepítése"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"A beszédszintetizáláshoz szükséges hangadatok telepítése"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"A beszédszintézishez szükséges hangok már megfelelően telepítve vannak"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Beállításai megváltoztak. Íme egy példa, hogy hangzanak."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"A kiválasztott motor nem futtatható."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurálás"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Válasszon másik motort"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ez a beviteli módszer alkalmas lehet az elhangzott szövegek -- köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok -- összegyűjtésére. A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motor kapcsolta be. Engedélyezi ennek a beszédszintetizáló motornak a használatát?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Ez a nyelv működő hálózati kapcsolatot igényel a szövegfelolvasáshoz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ez egy példa a beszédszintézisre"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Alapértelmezett nyelv állapota"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"A(z) <xliff:g id="LOCALE">%1$s</xliff:g> nyelv teljes támogatást élvez"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"A(z) <xliff:g id="LOCALE">%1$s</xliff:g> nyelv használatához hálózati kapcsolatra van szükség"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"A(z) <xliff:g id="LOCALE">%1$s</xliff:g> nyelvet nem támogatja a rendszer"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Ellenőrzés..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motorok"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> beállításai"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engedélyezve van"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> le van tiltva"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Motor beállításai"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"A(z) <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> beállításai"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Nyelvek és hangok"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Telepítve"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nincs telepítve"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Nő"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Férfi"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Beszédszint. szoftver telepítve"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Használat előtt engedélyezze az új motort."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Keresőmotor beállításainak indítása"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferált motor"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Általános"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiagazdálkodás"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi beállítás frissítése"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth beállítások frissítése"</string>
@@ -2101,7 +2056,7 @@
     <string name="enter_pattern" msgid="4187435713036808566">"Az Android indításához rajzolja le mintáját"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Helytelen minta"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Helytelen jelszó"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Helytelen PIN kód"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"Helytelen PIN-kód"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"Ellenőrzés…"</string>
     <string name="starting_android" msgid="4001324195902252681">"Az Android indítása"</string>
     <string name="delete" msgid="4219243412325163003">"Törlés"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Az Alkalmazás nem válaszol ablak megjelenítése"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Külső tárhely alkalmazásainak engedélyezése"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Lehetővé teszi, hogy külső tárhelyre lehessen írni"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Tevékenységek átméretezésének kényszerítése"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Lehetővé teszi, hogy az összes tevékenység átméretezhető legyen a többablakos megjelenítés érdekében a jegyzékértékektől függetlenül."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Alkalmazás adathasználata"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
@@ -2413,7 +2366,7 @@
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Mindig a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazást használja a(z) <xliff:g id="APP_1">%2$s</xliff:g> helyett érintéssel történő fizetéshez?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Korlátozások"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Korlátozások feloldása"</string>
-    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kód módosítása"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN-kód módosítása"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Értesítések megjelenítése"</string>
     <string name="help_label" msgid="6886837949306318591">"Súgó és visszajelzés"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Csak riasztások"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Teljes némítás"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizuális zavaró üzenetek"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Értesítések alapértelmezett csengőhangja"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"A hívásoknál rezegjen is"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Ha az eszköz zárolva van, hogyan kívánja megjeleníteni az értesítéseket?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Értesítések"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Témaértesítések"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Egyéb hangok"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"A tárcsázó hangjai"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Képernyő-zárolási hangok"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Soha ne jelenjenek meg az alkalmazás értesítései"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Kezelje prioritást élvezőként"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Az alkalmazásból származó értesítések legyenek hallhatók, amikor a „Ne zavarjanak” mód „Csak prioritást élvezők” értékre van állítva"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Betekintés engedélyezése"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Az alkalmazás kiemelhet bizonyos értesítéseket úgy, hogy rövid időre becsúsztatja azokat az éppen aktuális képernyő szélén"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"A Ne zavarjanak mód felülbírálása"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"A Ne zavarjanak mód „Csak prioritásos” beállítása esetén ezek az értesítések továbbra is zavarhatnak"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Bizalmas tartalom elrejtése"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"A bizalmas tartalom elrejtése az alkalmazás értesítéseiből, ha az eszköz zárolva van"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Amikor az eszköz zárolva van, rejtse el ezen értesítések tartalmát, mert személyes információkat tartalmazhatnak"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Letiltva"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritást élvező"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Bizalmas"</string>
@@ -2678,19 +2631,22 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Váltás „Csak riasztásokra” eddig: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Módosítás a bármikor történő megszakításra"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Nincs zavaró üzenet"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"A „Ne zavarjanak” funkció által elnémított értesítések ne jelenjenek meg részben vagy teljesen az aktuális képernyőn"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Nincs értesítőfény"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"A „Ne zavarjanak” funkció által elnémított értesítések ne aktiválhassák az értesítőfényt"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Rendszergazdai PIN kód megadása"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Rendszergazdai PIN-kód megadása"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Be"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Ki"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Képernyő rögzítése"</string>
     <string name="screen_pinning_description" msgid="1137904524037468263">"Ha bekapcsolta, a képernyő rögzítését használva visszavonásig az aktuális képernyő lesz látható.\n\nA használathoz:\n\n1. Ellenőrizze, hogy bekapcsolta-e a funkciót.\n\n2. Nyissa meg a rögzítendő képernyőt.\n\n3. Érintse meg az Áttekintés elemet.\n\n4. Csúsztasson gyorsan felfelé, majd érintse meg a rögzítés ikont."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Feloldási minta kérése a rögzítés feloldásához"</string>
-    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN kód kérése a feloldáshoz"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-kód kérése a feloldáshoz"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Jelszó kérése a rögzítés feloldásához"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Eszköz zárolása a rögzítés feloldásakor"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Munkaprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"A munkahelyi profil kezelője:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Kezeli: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kísérleti)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Értesítések"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normál"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Letiltás"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Bizalmas tartalom elrejtve"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritást élvező"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Nincs betekintés"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Személyes"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Munkahelyi"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Letiltva"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritást élvező"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Bizalmas tartalom elrejtve"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Nincs betekintés"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domain URL-ekkel"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Letiltva a rendszergazda által"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Alkalmazások konfigurálása"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil kiválasztása"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Engedélyek"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazás kapott további hozzáférést"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazás kapott engedélyt"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Kép színe mód"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB használata"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Megjelenítés méret"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"kijelző, sűrűség, nagyítás/kicsinyítés, méret, méretezés"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kicsi"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normál"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Nagy"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Nagyobb"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Legnagyobb"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Egyéni (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Az összes megjelenítése"</string>
+    <string name="see_less" msgid="1250265310929558370">"Kevesebb megjelenítése"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Kapcsolat bontva"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Az adatok <xliff:g id="AMOUNT">%1$s</xliff:g>-a felhasználva"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> alkalmazás telepítve"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g>/<xliff:g id="SIZE1">%1$s</xliff:g> felhasználva"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Az alkalmazkodó fényerő BE van kapcsolva"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Az alkalmazkodó fényerő KI van kapcsolva"</string>
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index c9681cf..e41fb19 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Մեծ"</item>
     <item msgid="7786168277516233536">"Հսկայական"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Շատ դանդաղ"</item>
-    <item msgid="2361722960903353554">"Դանդաղ"</item>
-    <item msgid="1145554631248513562">"Սովորական"</item>
-    <item msgid="7553665153391107454">"Արագ"</item>
-    <item msgid="1370673569131070146">"Ավելի արագ"</item>
-    <item msgid="4648206845228970803">"Շատ արագ"</item>
-    <item msgid="4977949754169483251">"Սրընթաց"</item>
-    <item msgid="6106302964845503577">"Չափազանց արագ"</item>
-    <item msgid="6800277205640837264">"Ամենաարագ"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Շատ ցածր"</item>
-    <item msgid="2692137425242433765">"Ցածր"</item>
-    <item msgid="3332408460740717754">"Սովորական"</item>
-    <item msgid="4907380534957572531">"Բարձր"</item>
-    <item msgid="4699640516390840297">"Շատ բարձր"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Սկանավորում…"</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 43e650c..690d3c9 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Գաղտնաբառեր"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Կասեցված է ադմինիստրատորի կողմից"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Մատնահետք"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Մատնահետքերի կառավար"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Օգտագործման նպատակը"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ձայնային ազդանշաններ չհնչեցնել գրասալիկը համակցումից հեռացնելիս կամ ներմուծելիս"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ձայնային ազդանշան չհնչեցնել հեռախոսը համակցումից հեռացնելիս կամ ներմուծելիս"</string>
     <string name="account_settings" msgid="6403589284618783461">"Հաշիվներ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Անձնական"</string>
-    <string name="category_work" msgid="8699184680584175622">"Աշխատանքային"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Աշխատանքային պրոֆիլների հաշիվներ՝ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Անձնական պրոֆիլի հաշիվներ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Աշխատանքային հաշիվ՝ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Անջատված"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Միշտ միացված"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Ավտոմատ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Վերածել ֆայլային գաղտնագրման"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Փոխարկել…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ֆայլային գաղտնագրումն արդեն կատարվել է"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Վերածում ֆայլային գաղտնագրման"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Ստեղծեք ֆայլային գաղտնագրում՝ փոխարկելով տվյալների բաժինը:\n !!Ուշադրություն!! Ձեր բոլոր տվյալները կջնջվեն:\n Այս գործառույթը դեռ գտնվում է փորձարկման փուլում և հնարավոր է ճիշտ չաշխատի:\n Շարունակելու համար սեղմեք «Սրբել և փոխարկել...» կոճակը:"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Սրբել և փոխարկել…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Քնել"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Էկրանը անջատվում է"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> պասիվ լինելուց հետո"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Կարգավորումներ"</string>
     <string name="print_settings" msgid="4742428530112487843">"Տպում"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Տպելու ծառայություններ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Հնարավոր է՝ փաստաթուղթը  մի քանի սերվերներով անցնի մինչ տպվելը:"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Տեղադրված ծառայաթյուններ չկան"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Տպիչներ չեն գտնվել"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Կարգավորումներ"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ամբողջական թեժ բառեր և շփում"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Խոսքից տեքստի պարզ տարբերակ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ձայնի ներածման այս ծառայությունը կկարողանա կատարել ձայնի մշտադիտարկում և ձեր անունից վերահսկել ձայնի հնարավորությամբ ծրագրերը: Դրա պատճառը <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ծրագիրն է: Միացնե՞լ այս ծառայությունը:"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Տեքստից-խոսք կարգավորումներ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Գրվածքից խոսք ելք"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Միշտ օգտագործել իմ կարգավորումները"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Լռելյայն կարգավորումները գերազանցում են հավելվածի կարգավորումները"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Լռելյայն կարգավորումներ"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Լռելյայն շարժիչ"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Օգտագործել խոսքի սինթեզի այս գործիքը արտասանվող տեքստի համար"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Խոսքի գնահատական"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Տեքստի արտասանման արագությունը"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Բարձրություն"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ազդում է հնչած տեքստի ձայներանգի վրա"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Լեզու"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Օգտագործել համակարգի լեզուն"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Լեզուն ընտրված չէ"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Կարգավորում է լեզվին բնորոշ ձայնը արտասանվող տեքստի համար"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Լսել օրինակը"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Կարճ հնչեցնել խոսքի սինթեզը"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Տեղադրել ձայնային տվյալները"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Տեղադրել անհրաժեշտ ձայնային տվյալները` խոսքը սինթեզելու համար"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Խոսքային սինթեզի համար պահանջվող ձայները ճշգրտորեն տեղադրված են"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ձեր կարգավորումները փոխվել են: Ահա տարբերակը, թե ինչպես են դրանք հնչում:"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Ձեր ընտրած շարժիչը չի կարող աշխատեցվել"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Կարգավորել"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Ընտրել մեկ այլ շարժիչ"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Այս խոսքային սինթեզի գործիքը կարող է հավաքագրել այն ամենը, ինչ արտասանված է, այդ թվում` անձնական տվյալներ, ինչպիսիք են գաղտնաբառն ու բանկային քարտի համարները: Սկզբնաբյուրը <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> շարժիչն է: Միացնե՞լ խոսքի սինթեզի շարժիչի օգտագործումը:"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Այս լեզուն պահանջում է աշխատող ցանցային կապ գրվածքից խոսք ելքի համար:"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Սա խոսքային սինթեզի մի նմուշ է:"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Լռելյայն լեզվի կարգավիճակը"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>-ը լիովին աջակցվում է"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>-ը պահանջում է ցանցային կապ"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>-ը չի աջակցվում"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Ստուգվում է..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Շարժիչներ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> կարգավորումներ"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-ը ակտիվացված է"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-ը կասեցված է"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Շարժիչի կարգավորումները"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Կարգավորումներ <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>-ի համար"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Լեզուներն ու ձայները"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Տեղադրված է"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Տեղադրված չէ"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Իգական"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Արական"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Խոսք սիթեզող շարժիչը տեղադրված է"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Միացնել նոր շարժիչը մինչ օգտագործումը:"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Գործարկման շարժիչի կարգավորումներ"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Նախընտրած շարժիչը"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Ընդհանուր"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Հոսանքի հսկողություն"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi կարգավորումների թարմացում"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth կարգավորումները թարմացվում են"</string>
@@ -2013,7 +1968,7 @@
     <string name="device_admin_warning" msgid="2026747446313628233">"Այս ադմինիստրատորին ակտիվացնելը հնարավություն կընձեռի <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածին իրականացնելու հետևյալ գործողությունները`"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Այս վարիչը ակտիվ է և թույլ է տալիս <xliff:g id="APP_NAME">%1$s</xliff:g> ծրագրին կատարել հետևյալ գործողությունները`"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Ակտիվացնե՞լ պրոֆիլների կառավարիչը:"</string>
-    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Այս հաշիվը կկառավարվի ձեր ադմինիստրատորի կողմից, որը, ձեր անձնական տվյալներից բացի, կկարողանա նաև պահել այս հաշվի հետ կապակցված տվյալները:\n\nՁեր ադմինիստրատորը կարող է վերահսկել և կառավարել կարգավորումները, մուտքը, հավելվածները և այս հաշվի հետ կապակցված տվյալները՝ ներառյալ ցանցային գործունեությունը և ձեր սարքերի տեղադրության վերաբերյալ տվյալները:"</string>
+    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Այս հաշիվը կկառավարվի ձեր ադմինիստրատորի կողմից, որը, ձեր անձնական տվյալներից բացի, կկարողանա նաև պահել այս հաշվի հետ կապված տվյալները:\n\nՁեր ադմինիստրատորը կարող է վերահսկել և կառավարել կարգավորումները, մուտքը, հավելվածները և այս հաշվի հետ կապված տվյալները՝ ներառյալ ցանցային գործունեությունը և ձեր սարքերի տեղադրության վերաբերյալ տվյալները:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Անվերնագիր"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Ընդհանուր"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Ծանուցումների գրանցամատյան"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Ցուցադրել այն ծրագիրը, որը չի արձագանքում երկխոսությունը հետնաշերտի ծրագրերի համար"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Միշտ թույլատրել ծրագրեր արտաքին պահեստում"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Թույլ է տալիս պահել հավելվածը արտաքին սարքում՝ մանիֆեստի արժեքներից անկախ"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Ստիպել, որ ակտիվությունների չափերը լինեն փոփոխելի"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Բոլոր ակտիվությունների չափերը բազմապատուհան ռեժիմի համար դարձնել փոփոխելի՝ մանիֆեստի արժեքներից անկախ:"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Տվյալների օգտագործում"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ծրագրի տվյալների օգտագործումը"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Օպերատորի հաշվարկները տվյալների կապի օգտագործման վերաբերյալ կարող են տարբերվել սարքի հաշվարկներց:"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Միայն զարթուցիչը"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Ընդհանուր լուռ վիճակը"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>՝ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Տեսողական ընդհատումներ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ծանուցումների կանխադրված զանգերանգը"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Նաև թրթռալ զանգերի ժամանակ"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Ինչպե՞ս եք ուզում ցույց տալ ծանուցումները, երբ սարքը կողպված է:"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Ծանուցումներ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Ծրագրերի ծանուցումներ"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Թեմայի ծանուցումները"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Այլ ձայներ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Թվաշարի հնչերանգները"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Էկրանի կողպման ձայներ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Երբեք ցույց չտալ ծանուցումներ այս ծրագրից"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Դիտարկել որպես առաջնահերթ"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Թույլատրել այս հավելվածի ձայնային ծանուցումները, երբ «Չանհանգստացնել» գործառույթի համար սահմանված է «Միայն կարևոր ծանուցումների դեպքում» արժեքը"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Թույլատրել կարճ ծանուցումներ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Թույլ տալ այս հավելվածին ընդգծել որոշ ծանուցումները՝ դրանք ընթացիկ էկրանին մեկ ակնթարթ ցույց տալու միջոցով"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չընդհատել» պարամետրը"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չընդհատել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Թաքցնել գաղտնի տվյալները"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Երբ սարքը կողպված է, այս հավելվածում թաքցնել գաղտնի տվյալներ պարունակող ծանուցումները"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Երբ սարքը կողպված է, այս ծանուցումներում թաքցնել գաղտնի տվյալներ պարունակող բովանդակությունը"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Արգելափակված է"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Կարևոր"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Զգայուն"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մինչև <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ը"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Չընդհատել էկրանը"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել դիտել ընթացիկ էկրանը կամ հայտնվել այնտեղ"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Անջատել ծանուցման լույսը"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել գործարկել լույսի թարթումը"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ծրագրերի ծանուցումներ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ապամրացման ժամանակ կողպել սարքը"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Աշխատանքային պրոֆիլ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Այս աշխատանքային պրոֆիլը կառավարվում է այս հավելվածի օգնությամբ՝"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Կառավարիչ՝ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Փորձնական)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Ծանուցումներ"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Սովորական"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Արգելափակված է"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Գաղտնի տվյալները թաքցված են"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Առաջնահերթություն"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Կարճ ծանուցումներն անջատված են"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Արգելափակված"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Առաջնահերթ"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Գաղտնի տվյալները թաքցված են"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Կարճ ծանուցումներն անջատված են"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Տիրույթի URL-ներով"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Կասեցված է ադմինիստրատորի կողմից"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Հավելվածների կազմաձևում"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Հավելվածների թույլտվությունները"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Ընդլայնված հասանելիություն ունեցող հավելվածներ՝ <xliff:g id="COUNT_1">%d</xliff:g>-ը <xliff:g id="COUNT_0">%d</xliff:g>-ից"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Թույլատրված է <xliff:g id="COUNT_0">%d</xliff:g> հավելվածի՝ <xliff:g id="COUNT_1">%d</xliff:g>-ից"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Նկարի գունային ռեժիմ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Օգտագործել sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Ցուցադրման սանդղակ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ցուցադրում խտություն մասշտաբ սանդղակ մասշտաբավորում"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Փոքր"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Սովորական"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Մեծ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Ավելի մեծ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Ամենամեծ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Հատուկ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Տեսնել բոլորը"</string>
+    <string name="see_less" msgid="1250265310929558370">"Տեսնել ավելի քիչ"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Անջատված է"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Օգտագործած տվյալներ՝ <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Տեղադրված հավելվածներ՝ <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g>-ից օգտագործվել է <xliff:g id="SIZE1">%1$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Հարմարողական պայծառությունը ՄԻԱՑՎԱԾ է"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Հարմարողական պայծառությունն ԱՆՋԱՏՎԱԾ է"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index f995eb3..deb1ebe 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Besar"</item>
     <item msgid="7786168277516233536">"Raksasa"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Sangat lambat"</item>
-    <item msgid="2361722960903353554">"Lambat"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Cepat"</item>
-    <item msgid="1370673569131070146">"Lebih cepat"</item>
-    <item msgid="4648206845228970803">"Sangat cepat"</item>
-    <item msgid="4977949754169483251">"Cepat sekali"</item>
-    <item msgid="6106302964845503577">"Sangat cepat sekali"</item>
-    <item msgid="6800277205640837264">"Tercepat"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Sangat rendah"</item>
-    <item msgid="2692137425242433765">"Rendah"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Tinggi"</item>
-    <item msgid="4699640516390840297">"Sangat tinggi"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Memindai..."</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 24e16f8..b448e33 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Dinonaktifkan oleh administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sidik jari"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Mengelola sidik jari"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sidik jari untuk"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Jangan memutar suara saat memasukkan atau melepaskan tablet dari dok"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Jangan putar suara ketika memasang atau melepas ponsel dari dok"</string>
     <string name="account_settings" msgid="6403589284618783461">"Akun"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pribadi"</string>
-    <string name="category_work" msgid="8699184680584175622">"Kantor"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Akun profil kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Akun profil pribadi"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akun kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Dinonaktifkan"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Selalu aktif"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Otomatis"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konversi ke enkripsi file"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konversi..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sudah dienkripsi berbasis file"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Mengonversi ke enkripsi berbasis file"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konversi partisi data ke enkripsi berbasis file.\n !!Peringatan!! Tindakan ini akan menghapus semua data.\n Fitur ini masih dalam tahap alfa dan mungkin tidak berfungsi dengan baik.\n Tekan \'Hapus dan konversi…\' untuk melanjutkan."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Hapus dan konversi…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Layanan cetak"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumen Anda dapat melewati satu atau beberapa server saat menuju printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tidak ada layanan terpasang"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tidak ditemukan printer"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Setelan"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Kata cepat dan interaksi lengkap"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Speech to text yang sederhana"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Layanan masukan suara ini akan dapat melakukan pemantauan suara yang selalu aktif dan mengontrol aplikasi yang aktif untuk suara atas nama Anda. Layanan ini berasal dari aplikasi <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Aktifkan penggunaan layanan ini?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Setelan text-to-speech"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Keluaran text-to-speech"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Selalu gunakan setelan saya"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan default di bawah menggantikan setelan apl"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan default"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin default"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Menyetel mesin sintesis ucapan yang akan digunakan untuk teks lisan"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Laju bicara"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kecepatan teks diucapkan"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks yang disampaikan"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gunakan bahasa sistem"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menyetel suara spesifik bahasa untuk teks lisan"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Dengarkan contoh"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesis suara"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesis suara"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesis suara sudah terpasang dengan baik"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setelan Anda telah berubah. Ini adalah contoh bunyinya."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Mesin yang Anda pilih tidak dapat dijalankan."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasikan"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih mesin lain"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesis suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bahasa ini perlu sambungan jaringan yang bekerja untuk keluaran text-to-speech."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ini adalah contoh sintesis suara"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status bahasa default"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> didukung sepenuhnya"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> membutuhkan sambungan jaringan"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> tidak didukung"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Memeriksa..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mesin"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> setelan"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> diaktifkan"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> dinonaktifkan"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Setelan mesin"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Setelan untuk <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Bahasa dan suara"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Terpasang"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Tidak terpasang"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Wanita"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Pria"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Mesin sintetis ucapan terpasang"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktifkan msin br sblm dgunakn."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Luncurkan setelan mesin"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mesin yang dipilih"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrol daya"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Memperbarui setelan Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Memperbarui setelan Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tmplkn dialog Apl Tidak Merespons utk apl ltr blkg"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Paksa izinkan aplikasi di eksternal"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Membuat semua aplikasi dapat ditulis ke penyimpanan eksterna"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Paksa aktivitas agar ukurannya dapat diubah"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Membuat semua aktivitas dapat diubah ukurannya untuk banyak jendela, terlepas dari nilai manifes."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data aplikasi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Hanya alarm"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Senyap total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Gangguan visual"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Dering notifikasi default"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga getar saat ada panggilan"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifikasi"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi apl"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notifikasi topik"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Suara lainnya"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada tombol nomor"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Suara kunci layar"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan pernah tampilkan notifikasi dari aplikasi ini"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Perlakukan sebagai prioritas"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Izinkan notifikasi aplikasi ini didengarkan saat Jangan ganggu disetel menjadi Hanya untuk prioritas"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Izinkan mengintip"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Izinkan aplikasi ini menekankan notifikasi tertentu dengan menggeser sebentar untuk ditampilkan di layar saat ini"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ganti mode Jangan Ganggu"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Sembunyikan konten sensitif"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Jika perangkat terkunci, sembunyikan konten notifikasi aplikasi ini yang dapat mengungkapkan informasi pribadi"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Jika perangkat terkunci, sembunyikan konten dalam notifikasi yang mungkin mengungkapkan informasi pribadi"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Diblokir"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritas"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ubah ke mode hanya alarm hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ubah ke mode selalu ganggu"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Tidak ada gangguan layar"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar tidak diintip atau muncul di layar saat ini"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Tanpa lampu notifikasi"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar lampu tidak berkedip"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifikasi apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan notifikasi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum lepas pin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta sandi sebelum melepas pin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kunci perangkat saat melepas pin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Profil kerja ini dikelola oleh:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Dikelola oleh <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifikasi"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokir"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Konten sensitif disembunyikan"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritas"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Tidak boleh mengintip"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pribadi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kantor"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Diblokir"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritas"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Konten sensitif disembunyikan"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Tidak boleh mengintip"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Dinonaktifkan oleh administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurasi aplikasi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Izin aplikasi"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan akses tambahan"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode warna gambar"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gunakan sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala layar"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"layar kepadatan zoom skala penskalaan"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kecil"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Biasa"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Besar"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lebih besar"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Terbesar"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"(<xliff:g id="DENSITYDPI">%d</xliff:g>) khusus"</string>
+    <string name="see_all" msgid="8883901630052886984">"Lihat semua"</string>
+    <string name="see_less" msgid="1250265310929558370">"Lihat lebih sedikit"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Terputus"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> data digunakan"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplikasi terpasang"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> dari <xliff:g id="SIZE2">%2$s</xliff:g> digunakan"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Kecerahan adaptif AKTIF"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Kecerahan adaptif NONAKTIF"</string>
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index 530f534..8d50e1b 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Stórt"</item>
     <item msgid="7786168277516233536">"Risastórt"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Mjög hægt"</item>
-    <item msgid="2361722960903353554">"Hægt"</item>
-    <item msgid="1145554631248513562">"Venjulegt"</item>
-    <item msgid="7553665153391107454">"Hratt"</item>
-    <item msgid="1370673569131070146">"Hraðar"</item>
-    <item msgid="4648206845228970803">"Mjög hratt"</item>
-    <item msgid="4977949754169483251">"Hratt"</item>
-    <item msgid="6106302964845503577">"Mjög hratt"</item>
-    <item msgid="6800277205640837264">"Hraðast"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Mjög lág"</item>
-    <item msgid="2692137425242433765">"Lág"</item>
-    <item msgid="3332408460740717754">"Venjulegt"</item>
-    <item msgid="4907380534957572531">"Há"</item>
-    <item msgid="4699640516390840297">"Mjög há"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Leitar…"</item>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index c45f646..bf8a741 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Aðgangsorð"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Stjórnandi gerði óvirkt"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingrafar"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Stjórna fingraförum"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nota fingrafar fyrir"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ekki spila hljóð þegar spjaldtölva er sett í eða tekin úr dokku"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ekki spila hljóð þegar sími er settur í eða tekinn úr dokku"</string>
     <string name="account_settings" msgid="6403589284618783461">"Reikningar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persónulegt"</string>
-    <string name="category_work" msgid="8699184680584175622">"Vinna"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Reikningar vinnusniðs – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Reikningar eigin sniðs"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Vinnureikningur – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Óvirkt"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alltaf kveikt"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Sjálfvirkt"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Umbreyta í dulkóðun skráa"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Umbreyta…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Þegar dulkóðað á grundvelli skráa"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Umbreytir í dulkóðun á grundvelli skráa"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Umbreyting gagnaskiptingar í dulkóðun á grundvelli skráa.\n !!Viðvörun!! Þetta eyðir öllum gögnunum þínum.\n Þetta er tilraunaeiginleiki og virkar hugsanlega ekki rétt.\n Ýttu á „Þurrka út og umbreyta…“ til að halda áfram."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Þurrka út og umbreyta…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvíld"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Stillingar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Prentun"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Prentþjónusta"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Nota <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Skjalið gæti þurft að fara í gegnum einn eða fleiri þjóna á leið sinni til prentarans."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Engin þjónusta uppsett"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Engar prentarar fundust"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Stillingar"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Alhliða virkar skipanir og samskipti"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Einföld talkennsl"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Þessi raddinntaksþjónusta mun geta fylgst með raddsamskiptum þínum öllum stundum og stýrt forritum sem notast við raddsamskipti fyrir þína hönd. Hún tilheyrir forritinu <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Viltu leyfa notkun þessarar þjónustu?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Stillingar upplesturs"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Úttak upplesturs"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Nota alltaf mínar stillingar"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Sjálfgefnar stillingar hér að neðan hnekkja stillingum forrits"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Sjálfgefnar stillingar"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Sjálfgefin vél"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Velja talgervil fyrir talað mál"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Talhraði"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hraði talaðs texta"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tónhæð"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Hefur áhrif á blæ lesna textans"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Tungumál"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Nota tungumál kerfis"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Tungumál ekki valið"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Velur rödd hvers tungumáls fyrir lesinn texta"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Hlusta á dæmi"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Spila stutta kynningu á talgervli"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Setja upp raddgögn"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Setja upp nauðsynleg raddgögn fyrir talgervil"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Nauðsynlegar raddir fyrir talgervil hafa þegar verið settar rétt upp"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Stillingarnar þínar hafa breyst. Þetta er dæmi um hvernig þær hljóma."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Ekki er hægt að keyra valda vél."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Stilla"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Velja aðra vél"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Þessi talgervilsvél getur hugsanlega skráð allan texta sem lesin er upp, þ. á m. persónuupplýsingar á borð við aðgangsorð og kreditkortanúmer. Hún kemur frá vélinni <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Viltu gera þessa talgervilsvél virka?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Þetta tungumál þarf nettengingu til að hægt sé að nota talgervil."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Þetta er dæmi um talgervil"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Staða sjálfgefins tungumáls"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> er með fullan stuðning"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> krefst nettengingar"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> er ekki studd"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Athugar..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Vélar"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Stillingar fyrir <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er virk"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er óvirk"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Stillingar vélar"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Stillingar fyrir <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Tungumál og raddir"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Uppsett"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Ekki uppsett"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kona"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Karl"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Vél fyrir talgervil sett upp"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Virkjaðu nýja vél fyrir notkun."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Stillingar vélarræsingar"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Valin vél"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Almennt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Aflstjórnun"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Uppfærir Wi-Fi stillingu"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppfærir Bluetooth-stillingu"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Sýna „Forrit svarar ekki“ fyrir bakgrunnsforrit"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Þvinga fram leyfi forrita í ytri geymslu"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Gerir hvaða forriti sem er kleift að skrifa í ytri geymslu, burtséð frá gildum í upplýsingaskrá"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Þvinga breytanlega stærð virkni"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Gerir stærð allrar virkni breytanlega svo að hún henti fyrir marga glugga, óháð gildum í upplýsingaskrá."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Gagnanotkun"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gagnanotkun forrits"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Aðeins vekjarar"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Algjör þögn"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Sjónrænar truflanir"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Hringitónn síma"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Sjálfgefinn hringitónn tilkynninga"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Titra líka fyrir símtöl"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hvernig viltu að tilkynningar birtist þegar tækið er læst?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Tilkynningar"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Forritatilkynningar"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Efnistilkynningar"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Önnur hljóð"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tónar takkaborðs"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Hljóð skjáláss"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Hleður forrit..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Birta aldrei tilkynningar úr þessu forriti"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Setja í forgang"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Leyfa tilkynningum þessa forrits að heyrast þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Leyfa gægjur"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Leyfa þessu forriti að leggja áherslu á tilteknar tilkynningar með því að birta þær stuttlega á skjánum sem er opinn"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Hnekkja „Ónáðið ekki“"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Láta þessar tilkynningar halda áfram að trufla þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fela viðkvæmt efni"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Fela allt efni úr tilkynningum þessa forrits sem kann að afhjúpa persónulegar upplýsingar þegar tækið er læst"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Fela efni í þessum tilkynningum sem gætu innihaldið trúnaðarupplýsingar þegar tækið er læst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Á bannlista"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Forgangur"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Viðkvæmt"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Breyta í vekjara eingöngu til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Breyta í truflanir alltaf"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Engar truflanir á skjá"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Koma í veg fyrir að tilkynningar birtist á skjánum þegar þær eru þaggaðar með „Ónáðið ekki“"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Ekkert tilkynningaljós"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Koma í veg fyrir að tilkynningaljós blikki þegar tilkynningar eru þaggaðar með „Ónáðið ekki“"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Forritatilkynningar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Biðja um PIN-númer til að losa"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Biðja um aðgangsorð til að losa"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Læsa tækinu við losun"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Vinnusnið"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Þessu vinnusniði er stjórnað af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Stjórnað af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tilraun)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Tilkynningar"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Venjulegt"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Loka fyrir"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Viðkvæmt efni falið"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Forgangur"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ekki hægt að gægjast"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persónulegt"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Vinna"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Á bannlista"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Forgangur"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Viðkvæmt efni falið"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ekki hægt að gægjast"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Með vefslóðum léns"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Stjórnandi gerði óvirkt"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Stillingar forrita"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Veldu snið"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Heimildir forrits"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum veittur frekari aðgangur"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum leyfð"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Litastilling mynda"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Nota sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skjástærð"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"skjár þéttleiki aðdráttur stærð"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Lítið"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Venjulegt"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stórt"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Stærra"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Stærst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Sérsniðið (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Sjá allt"</string>
+    <string name="see_less" msgid="1250265310929558370">"Sjá minna"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Aftengt"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> af gagnamagni í notkun"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> forrit uppsett"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> af <xliff:g id="SIZE2">%2$s</xliff:g> í notkun"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Kveikt á aðlögun birtustigs"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Slökkt á aðlögun birtustigs"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 2a3d855..0b987a9 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grandi"</item>
     <item msgid="7786168277516233536">"Molto grandi"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Molto lenta"</item>
-    <item msgid="2361722960903353554">"Lenta"</item>
-    <item msgid="1145554631248513562">"Normale"</item>
-    <item msgid="7553665153391107454">"Veloce"</item>
-    <item msgid="1370673569131070146">"Più veloce"</item>
-    <item msgid="4648206845228970803">"Molto veloce"</item>
-    <item msgid="4977949754169483251">"Rapida"</item>
-    <item msgid="6106302964845503577">"Molto rapida"</item>
-    <item msgid="6800277205640837264">"Massima velocità"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Molto basso"</item>
-    <item msgid="2692137425242433765">"Basso"</item>
-    <item msgid="3332408460740717754">"Normale"</item>
-    <item msgid="4907380534957572531">"Alto"</item>
-    <item msgid="4699640516390840297">"Molto alto"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Ricerca..."</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 307d49b..ba96826 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Disattivata dall\'amministratore"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impronta digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestisci impronte digitali"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utilizza l\'impronta digitale per"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Non riprodurre suono all\'inserimento o alla rimozione del tablet dal dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Non riprodurre suono all\'inserimento o alla rimozione del telefono dal dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Account"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personali"</string>
-    <string name="category_work" msgid="8699184680584175622">"Lavoro"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Account di profili di lavoro - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Account di profili personali"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Account di lavoro - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disattivato"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre attivo"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatico"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converti in crittografia basata su file"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converti..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Crittografia su base file già eseguita"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Conversione in crittografia basata su file"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converti la partizione di dati in crittografia basata su file.\n Attenzione. Questa operazione eliminerà tutti i tuoi dati.\n Questa funzione è in versione alpha, pertanto potrebbe non funzionare correttamente.\n Premi \"Cancella e converti...\" per continuare."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Cancella e converti..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
     <string name="print_settings" msgid="4742428530112487843">"Stampa"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servizi di stampa"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Il tuo documento potrebbe attraversare uno o più server per raggiungere la stampante."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nessuna stampante trovata"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Impostazioni"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Interazione e hotword completa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Semplice immissione vocale"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Questo servizio di input vocale potrà eseguire sempre il monitoraggio della voce e controllare le applicazioni vocali per tuo conto. Deriva dall\'applicazione <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Attivare l\'utilizzo del servizio?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Impostazioni di sintesi vocale"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Output sintesi vocale"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usa sempre mie imp."</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Le impostazioni predefinite sotto hanno la priorità su quelle delle applicazioni"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Impostazioni predefinite"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motore predefinito"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Imposta il motore di sintesi vocale da utilizzare per il testo pronunciato"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Velocità voce"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocità di pronuncia del testo"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Interessa il tono del testo parlato"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Usa lingua di sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lingua non selezionata"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Imposta la voce specifica della lingua per il testo parlato"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Ascolta un esempio"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Riproduci una breve dimostrazione della sintesi vocale"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installa dati vocali"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installa i dati vocali richiesti per la sintesi vocale"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Voci richieste per la sintesi vocale già installate"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Le tue impostazioni sono cambiate. Ecco un esempio di come possono suonare."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Impossibile eseguire il motore scelto."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Scegli un altro motore"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Questo motore di sintesi vocale potrebbe essere in grado di raccogliere tutto il testo pronunciato, inclusi dati personali come password e numeri di carte di credito. Deriva dal motore <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Abilitare l\'uso di questo motore di sintesi vocale?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Questa lingua richiede una connessione di rete funzionante per l\'output di sintesi vocale."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Questo è un esempio di sintesi vocale"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Stato della lingua predefinita"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> completamente supportato"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> richiede connessione di rete"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> non supportato"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Controllo in corso..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motori"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Impostazioni di <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> è abilitato"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> non è attivo"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Impostazioni motore"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Impostazioni per <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Lingue e voci"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installata"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Non installata"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femminile"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Maschile"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motore sintesi vocale installato"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Attiva nuovo motore per usarlo."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Avvia impostazioni del motore"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motore preferito"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Generali"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controllo risparmio energia"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Aggiornamento impostazione Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aggiornamento impostazione Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostra finestra ANR per applicazioni in background"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forza autorizzazione app su memoria esterna"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Rende l\'app idonea all\'installaz. su mem. esterna, senza considerare i valori manifest"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Imponi formato modificabile alle attività"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Rende il formato di tutte le attività modificabile per la modalità multi-finestra, indipendentemente dai valori manifest."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizzo dati dell\'app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"I dati dell\'operatore potrebbero differire da quelli del dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo sveglie"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silenzio totale"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interruzioni visive"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Suoneria predefinita notifiche"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrazione per le chiamate"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Quando il dispositivo è bloccato, come desideri che vengano visualizzate le notifiche?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifiche"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notifiche per argomento"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Altri suoni"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tastierino"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Toni di blocco schermo"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Non mostrare mai notifiche di questa app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Considera prioritarie"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Attiva l\'audio delle notifiche dell\'app quando l\'opzione \"Non disturbare\" è impostata su \"Solo con priorità\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Consenti breve visualizzazione"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Consenti a questa app di mettere in evidenza determinate notifiche mostrandole brevemente nella schermata corrente"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora Non disturbare"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti interruzione per queste notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Nascondi contenuti riservati"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Quando il dispositivo è bloccato, nascondi i contenuti delle notifiche dell\'app che potrebbero rivelare informazioni private"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Quando il dispositivo è bloccato, nascondi i contenuti di queste notifiche che potrebbero rivelare informazioni private"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloccate"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorità"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Riservate"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambia su Solo sveglie fino alle <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambia su Interrompi sempre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Interruzioni schermo off"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Disattiva visualizzazione di notifiche con modalità \"Non disturbare\" attiva in schermata corrente"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Luce notifica off"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Disattiva luce pulsante per notifiche con modalità \"Non disturbare\" attiva"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Richiedi il PIN per lo sblocco"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Richiedi password prima di sbloccare"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blocca dispositivo per sblocco"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profilo di lavoro"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Questo profilo di lavoro è gestito da:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestito da <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Sperimentale)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notifiche"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normale"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloccate"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Contenuti sensibili nascosti"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritarie"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Nessuna visualizzazione"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personali"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Lavoro"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloccate"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarie"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Contenuti sensibili nascosti"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Nessuna visualizzazione"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Con URL di dominio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Disattivato dall\'amministratore"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura app"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Scegli profilo"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Autorizzazioni app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"A <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> è stato autorizzato un ulteriore accesso"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Sono consentite <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2896,9 +2845,9 @@
     <string name="system_alert_window_settings" msgid="1757821151143694951">"Spostamento su altre app"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"App"</string>
     <string name="system_alert_window_access_title" msgid="8811695381437304132">"Spostamento su altre app"</string>
-    <string name="permit_draw_overlay" msgid="6606018549732046201">"Consenti Posizionamento davanti ad altre appp"</string>
+    <string name="permit_draw_overlay" msgid="6606018549732046201">"Consenti Posizionamento davanti ad altre app"</string>
     <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Autorizzazione Spostamento di app sopra"</string>
-    <string name="allow_overlay_description" msgid="7895191337585827691">"Questa autorizzazione consente a un\'app di spostarsi sopra altre app in uso e potrebbe interferire con il tuo utilizzo dell\'interfaccia in altre applicazioni o cambiare ciò che credi di vedere in altre applicazioni."</string>
+    <string name="allow_overlay_description" msgid="7895191337585827691">"Questa autorizzazione consente di visualizzare un\'app sopra altre app in uso. Potrebbe interferire con il tuo utilizzo dell\'interfaccia in altre applicazioni o modificare ciò che credi di vedere in altre applicazioni."</string>
     <string name="keywords_system_alert_window" msgid="8579673659566564926">"finestra dialogo avviso sistema Posizionamento davanti ad altre appp"</string>
     <string name="overlay_settings" msgid="222062091489691363">"Spostamento su altre app"</string>
     <string name="system_alert_window_summary" msgid="4268867238063922290">"<xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> sono autorizzate a spostarsi sopra altre app"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modalità colori immagini"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Scala display"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"compattezza zoom scala ridimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Piccola"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Più grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Massima"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizzata (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Mostra tutto"</string>
+    <string name="see_less" msgid="1250265310929558370">"Comprimi"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Disconnesso"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> di dati utilizzati"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> app installate"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> su <xliff:g id="SIZE2">%2$s</xliff:g> utilizzati"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Luminosità adattiva ON"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Luminosità adattiva OFF"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index d8c6e82..6e4c0ea 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"גדול"</item>
     <item msgid="7786168277516233536">"ענק"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"איטי מאוד"</item>
-    <item msgid="2361722960903353554">"איטי"</item>
-    <item msgid="1145554631248513562">"רגיל"</item>
-    <item msgid="7553665153391107454">"מהיר"</item>
-    <item msgid="1370673569131070146">"מהר יותר"</item>
-    <item msgid="4648206845228970803">"מהיר מאוד"</item>
-    <item msgid="4977949754169483251">"מהיר"</item>
-    <item msgid="6106302964845503577">"מהיר מאוד"</item>
-    <item msgid="6800277205640837264">"הכי מהיר"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"נמוך מאוד"</item>
-    <item msgid="2692137425242433765">"נמוך"</item>
-    <item msgid="3332408460740717754">"רגיל"</item>
-    <item msgid="4907380534957572531">"גבוה"</item>
-    <item msgid="4699640516390840297">"גבוה מאוד"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"סורק..."</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fca211d..df180dc 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"הושבת על ידי מנהל המערכת"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"טביעת אצבע"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"נהל טביעות אצבע"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"השתמש בטביעות אצבע ל-"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"אל תשמיע צלילים בעת הכנסת הטאבלט לעגינה או הסרתו משם"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"אל תפעיל צליל בעת הכנסת הטלפון לעגינה או הוצאתו מעגינה"</string>
     <string name="account_settings" msgid="6403589284618783461">"חשבונות"</string>
-    <string name="category_personal" msgid="1299663247844969448">"אישי"</string>
-    <string name="category_work" msgid="8699184680584175622">"עבודה"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"חשבונות פרופיל עבודה - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"חשבונות פרופיל אישי"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"חשבון עבודה - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"מושבת"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"פועל תמיד"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"באופן אוטומטי"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"המר להצפנת קבצים"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"המר..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"הצפנת קבצים כבר מוגדרת"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"המרה להצפנה מבוססת קבצים"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"המר את מחיצת הנתונים להצפנה מבוססת-קבצים.\n אזהרה!! פעולה זו תמחק את כל הנתונים.\n תכונה זו זמינה בגרסת אלפא וייתכן שלא תפעל כראוי.\n הקש על \'מחק והמר...\' כדי להמשיך."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"מחק והמר..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"שינה"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"כיבוי מסך"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"הגדרות"</string>
     <string name="print_settings" msgid="4742428530112487843">"הדפסה"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"שירותי הדפסה"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ייתכן שהמסמך שלך יעבור בשרת אחד או יותר בדרכו למדפסת."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"אין שירותים מותקנים"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"לא נמצאו מדפסות"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"הגדרות"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"שירות מלא של אינטראקציה ומילות הפעלה"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"שירות פשוט של דיבור לטקסט"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"שירות הקלט הקולי הזה יוכל לקיים ניטור תמידי של קול ולשלוט בשמך באפליקציות בעלות תכונות הפעלה קולית. מקורו באפליקציה <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. האם להפעיל את השימוש בשירות הזה?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"הגדרות טקסט לדיבור"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"פלט טקסט לדיבור"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"השתמש תמיד בהגדרות שלי"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"הגדרות ברירת המחדל שלמטה עוקפות את הגדרות האפליקציות"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"הגדרות ברירת מחדל"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"מנוע ברירת המחדל"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"הגדר את מנוע סינתזת הדיבור שישמש עבור קריאת טקסט"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"קצב דיבור"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"המהירות שבה הטקסט נאמר"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"גובה צליל"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"משפיע על הטון של הטקסט הנאמר"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"שפה"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"שימוש בשפת המערכת"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"לא נבחרה שפה"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"מגדיר קול ספציפי לשפה עבור הטקסט הנאמר"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"האזן לדוגמה"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"הפעל הדגמה קצרה של סינתזת דיבור"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"התקן נתוני קול"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"התקן את הנתונים הקוליים הדרושים לסינתזת דיבור"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"הקולות הדרושים לסינתזת דיבור כבר הותקנו כראוי"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ההגדרות שלך השתנו. זו דוגמה לאופן שבו הן נשמעות."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"לא ניתן להפעיל את המנוע שבחרת."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"הגדר"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"בחר מנוע אחר"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ייתכן שמנוע סינתזת דיבור זה יכול לאסוף את כל הטקסט המדובר, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיסי אשראי. הוא מגיע מהמנוע <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. להפוך את השימוש במנוע סינתזת דיבור זה לפעיל?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"שפה זו דורשת חיבור רשת פעיל עבור פלט טקסט לדיבור."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"זוהי דוגמה לסינתזת דיבור"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ברירת המחדל לסטטוס שפה"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> נתמכת באופן מלא"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> מצריכה חיבור לרשת"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> אינה נתמכת"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"בודק..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"מנועים"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"הגדרות <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מופעל"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מושבת"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"הגדרות מנוע"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"הגדרות עבור <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"שפות וקולות"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"מותקן"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"לא מותקן"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"אישה"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"גבר"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"מנוע סינתזת דיבור מותקן"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"הפעל את המנוע החדש לפני השימוש."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"השק הגדרות מנוע"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"מנוע מועדף"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"כללי"</string>
     <string name="gadget_title" msgid="5519037532720577836">"בקרת צריכת חשמל"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"‏מעדכן את הגדרת ה-Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"‏מעדכן הגדרת Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"הצג תיבת דו-שיח של \'אפליקציה לא מגיבה\' עבור אפליקציות שפועלות ברקע"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"אילוץ הרשאה של אפליקציות באחסון חיצוני"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"מאפשר כתיבה של כל אפליקציה באחסון חיצוני, ללא התחשבות בערכי המניפסט"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"אלץ יכולת קביעת גודל של הפעילויות"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"מאפשר יכולת קביעת גודל של כל הפעילויות לריבוי חלונות, ללא קשר לערך המניפסט."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"שימוש בנתונים באפליקציות"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
@@ -2592,6 +2545,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"רק התראות"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"שקט מוחלט"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"הפרעות ויזואליות"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"רינגטון להודעות המוגדר כברירת מחדל"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"הפעל גם רטט עבור שיחות"</string>
@@ -2605,6 +2559,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"איך להציג הודעות כשהמכשיר נעול?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"הודעות"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"הודעות לנושא"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"צלילים אחרים"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"צלילים של לוח חיוג"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"צלילי נעילת מסך"</string>
@@ -2634,12 +2589,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"לעולם אל תציג הודעות מהאפליקציה הזו"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"טפל כהודעה בעדיפות"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"אפשר השמעת צליל של הודעות מהאפליקציה הזו כשמצב \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"אפשר הצצה"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"התר לאפליקציה הזו להדגיש הודעות מסוימות על ידי הצגה שלהם לזמן קצר במסך הנוכחי"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ביטול / שינוי של \'נא לא להפריע\'"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"אפשר להודעות אלה להמשיך ולהפריע כאשר \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"להסתיר תוכן רגיש"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"כשהמכשיר נעול, הסתר תוכן בהודעות מהאפליקציה הזו אם הוא עשוי לחשוף מידע אישי"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"כאשר המכשיר נעול, הסתר תוכן שעלול לחשוף מידע פרטי בהודעות אלה"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"חסום"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"עדיפות גבוהה"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"רגיש"</string>
@@ -2714,6 +2667,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"עבור למצב \'התראות בלבד\' עד <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"שנה ל\'הפרעות בכל מצב\'"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ללא הפרעות במסך"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"מנע הצצה או הופעה של הודעות שהושתקו במצב \'נא לא להפריע\' במסך הנוכחי"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"ללא תאורת התראה"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"מנע את הבהוב האור שנגרם על ידי הודעות שהושתקו במצב \'נא לא להפריע\'"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
@@ -2726,7 +2683,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‏בקש PIN לפני ביטול הצמדה"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"בקש סיסמה לפני ביטול הצמדה"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"נעל מכשיר בזמן ביטול הצמדה"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"פרופיל עבודה"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"פרופיל העבודה הזה מנוהל על ידי:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"מנוהל על ידי <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ניסיוני)"</string>
@@ -2779,9 +2735,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"הודעות"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"רגיל"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"חסום"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"תוכן רגיש מוסתר"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"הודעות בעדיפות"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"ללא הצצה"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2809,15 +2762,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"אישיות"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"עבודה"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"חסומות"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"בעדיפות"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"תוכן רגיש מוסתר"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"ללא הצצה"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏עם URL של דומיינים"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"הושבת על ידי מנהל המערכת"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
     <string name="configure_apps" msgid="6685680790825882528">"הגדרת אפליקציות"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"בחר פרופיל"</string>
     <string name="app_permissions" msgid="4148222031991883874">"הרשאות לאפליקציות"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו גישה נוספת"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו הרשאה"</string>
@@ -2980,4 +2929,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"מצב צבע התמונה"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏שימוש ב-sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"קנה מידה של תצוגה"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"תצוגה דחיסות מרחק מתצוגה קנה מידה שינוי גודל"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"קטן"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"רגיל"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"גדול"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"יותר גדול"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"הכי גדול"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"מותאם אישית (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"הצג הכל"</string>
+    <string name="see_less" msgid="1250265310929558370">"הצג פחות"</string>
+    <string name="disconnected" msgid="5787956818111197212">"מנותק"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> מהנתונים בשימוש"</string>
+    <string name="apps_summary" msgid="193158055537070092">"הותקנו <xliff:g id="COUNT">%1$d</xliff:g> אפליקציות"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> מתוך <xliff:g id="SIZE2">%2$s</xliff:g> בשימוש"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"בהירות מסתגלת פועלת"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"בהירות מסתגלת כבויה"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 3d8db3d..3d51518 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"極大"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"非常に遅い"</item>
-    <item msgid="2361722960903353554">"遅い"</item>
-    <item msgid="1145554631248513562">"標準"</item>
-    <item msgid="7553665153391107454">"速い"</item>
-    <item msgid="1370673569131070146">"より速い"</item>
-    <item msgid="4648206845228970803">"非常に速い"</item>
-    <item msgid="4977949754169483251">"高速"</item>
-    <item msgid="6106302964845503577">"非常に高速"</item>
-    <item msgid="6800277205640837264">"最高速"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"非常に低い"</item>
-    <item msgid="2692137425242433765">"低い"</item>
-    <item msgid="3332408460740717754">"標準"</item>
-    <item msgid="4907380534957572531">"高い"</item>
-    <item msgid="4699640516390840297">"非常に高い"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"スキャン中..."</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3b549a0..f1cb538 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"管理者によって無効にされています"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"指紋の管理"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"指紋の用途"</string>
@@ -330,14 +331,14 @@
     <string name="security_settings_fingerprint_enroll_onboard_message_1" msgid="2799884038398627882">"予備の画面ロック方式を設定"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message_2" msgid="4158160658182631304">"指紋を追加"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"指紋によるロック解除"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"指紋センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。これらの操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="9193978734907066950">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。これらの操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_warning" msgid="7173290350577831813">"注: 指紋は複雑なパターンやPINよりも安全面で劣る可能性があります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_risk_link_text" msgid="9129531466157620977">"詳細"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"センサーを探す"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"端末の背面にある指紋センサーを探します。"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"端末の指紋センサーの位置を示した図"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"端末の背面にある指紋認証センサーを探します。"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"端末の指紋認証センサーの位置を示した図"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名前"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"削除"</string>
@@ -347,14 +348,14 @@
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"指を少しずつ動かして、指紋全体を登録します。"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋の登録完了"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用できます。"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"指紋センサーに触れるだけで端末を復帰させてロックを解除できます。"</string>
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"指紋認証センサーに触れるだけで端末を復帰させてロックを解除できます。"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"このアイコンが表示されている場合は指紋を利用できます。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"指紋の設定をスキップしますか？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は1分程度です。"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"画面ロックを設定"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"完了"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"これはセンサーではありません"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"端末の指紋センサーを使用してください。"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"端末の指紋認証センサーを使用してください。"</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"登録を完了できませんでした"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"指紋の登録がタイムアウトになりました。もう一度お試しください。"</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"指紋を登録できませんでした。もう一度試すか、別の指を使用してください。"</string>
@@ -813,8 +814,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"タブレットのホルダー脱着時に音を鳴らさない"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"携帯のホルダー脱着時に音を鳴らさない"</string>
     <string name="account_settings" msgid="6403589284618783461">"アカウント"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人用"</string>
-    <string name="category_work" msgid="8699184680584175622">"仕事用"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"仕事用プロファイルアカウント - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人用プロファイルアカウント"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"仕事用アカウント - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -837,6 +836,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"無効"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"常にON"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ファイル暗号化に変換する"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"変換…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ファイルは既に暗号化済みです"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ファイルベースの暗号化に変換しています"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"データ パーティションをファイルベースの暗号化に変換します。\n 警告: この操作ではユーザーのデータがすべて削除されます。\n この機能はアルファ版であり、正しく機能しないおそれがあります。\n 続行するには [消去して変換] をクリックしてください。"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"消去して変換…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -854,7 +859,7 @@
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"指を離してスリープ状態から復帰"</string>
-    <string name="doze_title" msgid="2259176504273878294">"アンビエント表示"</string>
+    <string name="doze_title" msgid="2259176504273878294">"常に画面表示ディスプレイ"</string>
     <string name="doze_summary" msgid="7128970177894383698">"端末を取り上げたとき、または通知を受信したときにスリープ状態から復帰"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
@@ -1295,7 +1300,7 @@
     <string name="auto_launch_label" msgid="2669236885531442195">"既定で開く"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"デフォルト"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"画面の互換性"</string>
-    <string name="permissions_label" msgid="2605296874922726203">"許可"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"権限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"キャッシュ"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"キャッシュを消去"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"キャッシュ"</string>
@@ -1699,8 +1704,6 @@
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"印刷"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"印刷サービス"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ドキュメントは1つ以上のサーバーを経由してプリンタに送信されることがあります。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"インストールされているサービスはありません"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"プリンタが見つかりません"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
@@ -1881,54 +1884,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"完全な注目ワードと対話"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"シンプルな音声認識"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"この音声入力サービスを使用すると、常時音声監視を実行し、音声対応アプリの管理をユーザーに代わって行えるようになります。これは<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>の一部です。このサービスの使用を有効にしますか？"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"テキスト読み上げの設定"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"テキスト読み上げの出力"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"常に自分の設定を使用"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"アプリの設定を以下のデフォルト設定でオーバーライドする"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"デフォルト設定"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"デフォルトのエンジン"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"テキスト読み上げに使用する音声合成エンジンを設定"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"音声の速度"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"テキストの読み上げ速度"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"音の高さ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"テキスト読み上げの音程を変更する"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"言語"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"システムの言語を使用"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"言語が選択されていません"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"テキスト読み上げに使用する言語固有の音声を設定する"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"サンプルを再生"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"音声合成の短いサンプルを再生する"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"音声データをインストール"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"音声合成に必要な音声データをインストールする"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"音声合成に必要な音声は正常にインストールされています"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"設定が変更されました。これがサンプル音です。"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"選択したエンジンは実行できません。"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"別のエンジンを選択"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"この音声合成エンジンを使用すると、読み上げるすべてのテキストの収集をエンジン（<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この音声合成エンジンを有効にしますか？"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"この言語でテキスト読み上げを出力するには、ネットワーク接続が正常に機能している必要があります。"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"これは音声合成のサンプルです"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"デフォルトの言語のステータス"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>は完全サポート対象です"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>ではネットワーク接続が必要です"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>はサポート対象ではありません"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"確認しています..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"エンジン"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>の設定"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>は有効です"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>は無効です"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"エンジンの設定"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>の設定"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"言語と音声"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"インストール済み"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"未インストール"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"女性"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"男性"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"音声合成エンジンインストール完了"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"使用前に新エンジンをONにします"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"エンジン設定を起動"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"優先するエンジン"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"全般"</string>
     <string name="gadget_title" msgid="5519037532720577836">"電源管理"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi設定の更新"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</string>
@@ -2173,10 +2128,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"バックグラウンドアプリが応答しない場合に通知する"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"外部ストレージへのアプリの書き込みを許可"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"マニフェストの値に関係なく、すべてのアプリを外部ストレージに書き込めるようになります"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"アクティビティをサイズ変更可能にする"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"マニフェストの値に関係なく、マルチウィンドウですべてのアクティビティのサイズを変更できるようになります。"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"アプリのデータ使用"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"端末で記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります。"</string>
@@ -2568,6 +2521,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"アラームのみ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"サイレント"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"視覚的な設定"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"デフォルトの通知音"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"着信時もバイブレーションON"</string>
@@ -2581,6 +2535,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"端末がロックされている場合、通知をどのように表示しますか？"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"トピックの通知"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"その他の音"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ダイヤルパッドの操作音"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"画面ロック音"</string>
@@ -2608,12 +2563,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"すべてブロック"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"このアプリからの通知を表示しない"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"優先通知"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"[通知を非表示]が[優先する通知のみ]に設定されている場合でも、このアプリの通知を鳴らす"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"通知の瞬間表示を許可"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"現在の画面で特定の通知をスライド表示することをこのアプリに許可する"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"[通知を非表示] をオーバーライドする"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"[通知を非表示] が [優先する通知のみ] に設定されているとき、この通知を引き続き表示する"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"プライベートな内容を非表示"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"端末がロックされている場合、プライベートな情報を公開する可能性があるコンテンツをこのアプリの通知に表示しない"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"端末がロックされている場合、プライベートな情報を公開する可能性があるコンテンツをこの通知に表示しない"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ブロック済み"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"優先"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"プライベート"</string>
@@ -2684,6 +2637,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>までアラームのみに変更します"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"常に割り込みに変更します"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"画面に表示しない"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"[通知を非表示] でサイレントに設定した通知を受信したときに画面にプレビューまたは表示されなくなります"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"光を点滅しない"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"[通知を非表示] でサイレントに設定した通知を受信したときに光が点滅しなくなります"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
@@ -2696,7 +2653,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"画面固定の解除前にPINを要求"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"画面固定の解除前にパスワードを要求"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"画面固定を解除するときに端末をロックする"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"仕事用プロファイル"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"この仕事用プロファイルを管理するアプリ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>によって管理されています"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（試験運用）"</string>
@@ -2749,9 +2705,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"通知"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"標準"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"ブロック"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"プライベートな内容の非表示"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"優先"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"重要な通知をポップアップしない"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2773,15 +2726,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"仕事用"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ブロック中"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"優先"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"プライベートな内容の非表示"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"重要な通知をポップアップしない"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ドメインURLあり"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"管理者によって無効にされています"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
     <string name="configure_apps" msgid="6685680790825882528">"アプリの設定"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"プロファイルの選択"</string>
     <string name="app_permissions" msgid="4148222031991883874">"アプリの権限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリに追加アクセスを許可"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリを許可"</string>
@@ -2877,7 +2826,7 @@
     <string name="sort_max_use" msgid="4629247978290075124">"最大使用で並べ替え"</string>
     <string name="memory_performance" msgid="5661005192284103281">"パフォーマンス"</string>
     <string name="total_memory" msgid="2017287600738630165">"合計メモリ"</string>
-    <string name="average_used" msgid="5338339266517245782">"平均使用（%）"</string>
+    <string name="average_used" msgid="5338339266517245782">"平均使用量（%）"</string>
     <string name="free_memory" msgid="4003936141603549746">"空き"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"アプリのメモリ使用状況"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
@@ -2938,4 +2887,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"画像の色モード"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGBを使用"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"表示スケール"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"表示 間隔 ズーム スケール スケーリング"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"標準"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"特大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"カスタム（<xliff:g id="DENSITYDPI">%d</xliff:g>）"</string>
+    <string name="see_all" msgid="8883901630052886984">"すべて表示"</string>
+    <string name="see_less" msgid="1250265310929558370">"一部を表示"</string>
+    <string name="disconnected" msgid="5787956818111197212">"切断されています"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"データの <xliff:g id="AMOUNT">%1$s</xliff:g> を使用しています"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> 個のアプリがインストールされています"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> のうち <xliff:g id="SIZE1">%1$s</xliff:g> を使用しています"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"明るさの自動調節は ON です"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"明るさの自動調節は OFF です"</string>
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index 6d508c0..9f27f3a 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"დიდი"</item>
     <item msgid="7786168277516233536">"უზარმაზარი"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ძალიან ნელი"</item>
-    <item msgid="2361722960903353554">"ნელი"</item>
-    <item msgid="1145554631248513562">"ჩვეულებრივი"</item>
-    <item msgid="7553665153391107454">"სწრაფი"</item>
-    <item msgid="1370673569131070146">"უფრო სწრაფი"</item>
-    <item msgid="4648206845228970803">"ძალიან სწრაფი"</item>
-    <item msgid="4977949754169483251">"ჩქარი"</item>
-    <item msgid="6106302964845503577">"ძალიან ჩქარი"</item>
-    <item msgid="6800277205640837264">"უსწრაფესი"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ძალიან დაბალი"</item>
-    <item msgid="2692137425242433765">"დაბალი"</item>
-    <item msgid="3332408460740717754">"ჩვეულებრივი"</item>
-    <item msgid="4907380534957572531">"მაღალი"</item>
-    <item msgid="4699640516390840297">"ძალიან მაღალი"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"სკანირება…"</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index f13f569..e1390fe 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"პაროლები"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"გათიშულია ადმინისტრატორის მიერ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"თითის ანაბეჭდი"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ანაბეჭდების მართვა"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ანაბეჭდების გამოყენება"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ტაბლეტის სამაგრში დაყენებისას ან მისი სამაგრიდან ამოღებისას არ განხორციელდეს ხმის დაკვრა"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ტელეფონის დაყენებისას ან ამოღებისას არ განხორციელდეს ხმის დაკვრა"</string>
     <string name="account_settings" msgid="6403589284618783461">"ანგარიშები"</string>
-    <string name="category_personal" msgid="1299663247844969448">"პირადი"</string>
-    <string name="category_work" msgid="8699184680584175622">"სამსახური"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"სამუშაო პროფილის ანგარიშები - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"პირადი პროფილის ანგარიშები"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"სამუშაო ანგარიში - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"გამორთულია"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ყოველთვის ჩართული"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ავტომატური"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ფაილების დაშიფვრაზე გარდაქმნა"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"გარდაქმნა…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"უკვე დაშიფრულია ფაილების დონეზე"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ფაილების დონეზე დაშიფვრაზე გარდაქმნა…"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"მონაცემთა დანაყოფის გარდაქმნა ფაილების დონეზე დაშიფვრაზე.\n ყურადღება!!! ეს მოქმედება ყველა თქვენს მონაცემს ამოშლის.\n ეს ფუნქცია alpha სტადიაშია და შეიძლება არასწორად მუშაობდეს.\n გასაგრძელებლად დაჭერით აირჩიეთ „ამოშლა და გარდაქმნა…“."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ამოშლა და გარდაქმნა…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ძილი"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ეკრანი გამოირთვება"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> განმავლობაში უმოქმედობის შემდეგ"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"პარამეტრები"</string>
     <string name="print_settings" msgid="4742428530112487843">"ბეჭდვა"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ბეჭდვის სერვისები"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"სანამ პრინტერს მიაღწევდეს, შესაძლოა თქვენმა დოკუმენტმა სხვადასხვა სერვერს გაუაროს."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"სერვისები დაყენებული არ არის"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"პრინტერები ვერ მოიძებნა"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"პარამეტრები"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"სრული ჯადოსნური სიტყვა და ინტერაქცია"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"მარტივი მეტყველების ტექსტში გადაყვანა"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ხმოვანი შეყვანის სერვისი შეძლებს შეასრულოს ხმის მონიტორინგი, რომელიც მუდამ ჩართულია და აკონტროლოს ხმასთან თავსებადი აპლიკაციები თქვენი სახელით. ის მომდინარეობს <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> აპლიკაციიდან. გსურთ ამ სერვისის ჩათვლა?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ტექსტის გახმოვანების პარამეტრები"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"მეტყველების სინთეზი"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ყოველთვის გამოიყენე ჩემი პარამეტრები"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Default settings below override app settings"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ნაგულისხმევი პარამეტრები"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ნაგულისხმევი სისტემა"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"მეტყველების სინთეზის ძრავის დაყენება სალაპარაკო ტექსტზე გამოსაყენებლად"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"მეტყველების ტემპი"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ტექსტის თხრობის სიჩქარე"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"სიმაღლე"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ზემოქმედებას ახდენს სინთეზირებული ხმის სიმაღლეზე"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ენა"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"სისტემის ენის გამოყენება"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ენა არჩეული არ არის"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ენის შესაფერი ხმის დაყენება"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"მოუსმინეთ მაგალითს"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"სინთეზირებული მეტყველების მოკლე ნაწყვეტის აღწარმოება"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ხმის მონაცემების დაყენება"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Install the voice data required for speech synthesis"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"მეტყველების სინთეზისთვის საჭირო ხმების ინსტალაცია უკვე წარმატებით შესრულდა"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"თქვენი პარამეტრები შეიცვალა. ეს არის ნიმუში იმისა თუ როგორ ჟღერს ისინი."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"სისტემა, რომელსაც ირჩევთ, ვერ გაეშვება."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"კონფიგურირება"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ხმის სხვა სინთეზატორის არჩევა"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"მეტყველების სინთეზის მოცემულ სისტემას შეუძლია ჩაიწეროს წარმოთქმული სიტყვები, მათ შორის პირადი მონაცემები, როგორიცაა პაროლები და საკრედიტო ბარათების ნომრები. ამას ახორციელებს <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> სისტემა. გამოვიყენოთ მეტყველების სინთეზიზს მოცემული სისტემა?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ეს ენა ტექსტის ამოკითხვისთვის მოითხოვს აქტიურ ინტერნეტ კავშირს."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ეს არის მეტყველების სინთეზის მაგალითი."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ენის ნაგულისხმევი სტატუსი"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> სრულად მხარდაჭერილია"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ითხოვს ქსელის კავშირს"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> არ არის მხარდაჭერილი"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"შემოწმება..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"სისტემები"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> პარამეტრები"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ჩართულია"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> გამორთულია"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"სინთეზის პარამეტრები"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> პარამეტრები"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ენები და ხმები"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"დაყენებულია"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"არ არის დაყენებული"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"მდედრობითი"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"მამრობითი"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"მეტყველების სინთეზის სისტემა დაყენებულია"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ჩართეთ ახალი მოდული."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ძრავის პარამეტრების გაშვება"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"რჩეული ძრავი"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ზოგადი"</string>
     <string name="gadget_title" msgid="5519037532720577836">"კვების მართვა"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi პარამეტრების განახლება"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-ის პარამეტრების განახლება"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"შეტყობინების ჩვენება, როცა ფონური აპლიკაცია არ პასუხობს"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"აპების დაშვება გარე მეხსიერებაში"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"აპები ჩაიწერ. გარე მეხს.-ზე აღწ. ფაილის მნიშვნ. მიუხედ."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"ზომაცვლადი აქტივობების იძულება"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"მანიფესტის მნიშვნელობების მიუხედავად, ყველა აქტივობას მრავალი ფანჯრის რეჟიმისთვის ზომაცვლადად აქცევს."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"მონაცემთა გადაცემის მოხმარება"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"აპის მონაცემთა გამოყენება"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ოპერატორის მიერ მონაცემთა აღრიცხვა შესაძლოა თქვენი მოწყობილობის აღრიცხვისგან განსხვავდებოდეს."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"მხოლოდ მაღვიძარები"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"სრული სიჩუმე"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ვიზუალური შეფერხებები"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"შეტყობინებების ნაგულისხმევი ზარის მელოდია"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ზარებზე ასევე ვიბრირება"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"როგორ გსურთ შეტყობინებების ჩვენება, როდესაც მოწყობილობა ჩაკეტილია?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"შეტყობინებები"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"აპის შეტყობინებები"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"თემების შესახებ შეტყობინებები"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"სხვა ხმები"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ციფერბლატის ტონური რეჟიმი"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ეკრანის ჩაკეტვის ხმები"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ყველას დაბლოკვა"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ამ აპზე შეტყობინებები არასდროს აჩვენო"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"პრიორიტეტულად განხილვა"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"ამ აპის შეტყობინებების მოსმენის დაშვება, როცა „არ შემაწუხოთ“ დაყენებულია პარამეტრზე „მხოლოდ პრიორიტეტული“"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"თვალის შევლების დაშვება"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ამ აპისთვის ზოგიერთი შეტყობინების ხაზგასმის დაშვება, მიმდინარე ეკრანზე მათი ხანმოკლე დროით გამოსრიალებით"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"„არ შემაწუხოთ“-ის უგულებელყოფა"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ამ შეტყობინებების ჩვენება მაშინაც კი, როცა რეჟიმისთვის „არ შემაწუხოთ“ არჩეულია „მხოლოდ პრიორიტეტული“"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"სენსიტიური კონტენტის დამალვა"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"პირადი ინფორმაციის შემცველი აპის შეყობინებების კონტენტის დამალვა, როცა მოწყობილობა ჩაკეტილია"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"ამ შეტყობინებებიდან კონფიდენციალური კონტენტის დამალვა, როცა მოწყობილობა ჩაკეტილია"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"დაბლოკილი"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"პრიორიტეტი"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"სენსიტიური"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"მაღვიძარებზე მხოლოდ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-მდე გადაყვანა"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"„მუდმივად შეწყვეტის“ რეჟიმზე გადაყვანა"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ეკრანზე შეფერხებების გარეშე"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"„არ შემაწუხოთ“-ის მეშვეობით დადუმებული შეტყობინებებისთვის მიმდინარე ეკრანზე გამოჩენის აღკვეთა"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"სინათლის ინდიკატორის გარეშე"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"„არ შემაწუხოთ“-ის მეშვეობით დადუმებული შეტყობინებებისთვის სინათლის ინდიკატორის გამოყენების აღკვეთა"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"აპის შეტყობინებები"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ფიქსაციის მოხსნამდე PIN-ის მოთხოვნა"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ფიქსაციის მოხსნამდე პაროლის მოთხოვნა"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ჩამაგრების მოხსნიდან მოწყობილობის ჩაკეტვა"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"სამუშაო პროფილი"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ამ სამუშაო პროფილს მართავს:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"მმართველი: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ექსპერიმენტული)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"შეტყობინებები"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ჩვეულებრივი"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"დაბლოკვა"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"სენსიტიური კონტენტი დამალულია"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"პრიორიტეტი"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"თვალის შევლება გამორთულია"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"პირადი"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"სამუშაო"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"დაბლოკილი"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"პრიორიტული"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"სენსიტიური კონტენტი დამალულია"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"თვალის შევლება გამორთულია"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"დომენის URL-ებით"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"გათიშულია ადმინისტრატორის მიერ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
     <string name="configure_apps" msgid="6685680790825882528">"აპების კონფიგურაცია"</string>
     <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
     <string name="app_permissions" msgid="4148222031991883874">"აპის უფლებები"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> აპლიკაციის დამატებითი წვდომის უფლება"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> დაშვებული აპლიკაცია"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"გამოსახულების ფერების რეჟიმი"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB-ს გამოყენება"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"სკალის ჩვენება"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ჩვენება სიმკვრივე მასშტაბირება სკალა სკალირება"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"პატარა"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ჩვეულებრივი"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"დიდი"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"უფრო დიდი"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"უდიდესი"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"მორგებული (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"ყველას ნახვა"</string>
+    <string name="see_less" msgid="1250265310929558370">"ნაკლების ნახვა"</string>
+    <string name="disconnected" msgid="5787956818111197212">"გათიშულია"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"გამოყენებულია მონაცემთა <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"დაინსტალირებულია <xliff:g id="COUNT">%1$d</xliff:g> აპი"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"გამოყენებულია <xliff:g id="SIZE1">%1$s</xliff:g> / <xliff:g id="SIZE2">%2$s</xliff:g>დან"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"მორგებადი სიკაშკაშე ჩართულია"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"მორგებადი სიკაშკაშე გამორთულია"</string>
 </resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index 58867cd..bfe1d3e 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Үлкен"</item>
     <item msgid="7786168277516233536">"Өте үлкен"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Өте баяу"</item>
-    <item msgid="2361722960903353554">"Баяу"</item>
-    <item msgid="1145554631248513562">"Орташа"</item>
-    <item msgid="7553665153391107454">"Жылдам"</item>
-    <item msgid="1370673569131070146">"Жылдамырақ"</item>
-    <item msgid="4648206845228970803">"Өте жылдам"</item>
-    <item msgid="4977949754169483251">"Тез"</item>
-    <item msgid="6106302964845503577">"Өте тез"</item>
-    <item msgid="6800277205640837264">"Ең жылдам"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Өте төмен"</item>
-    <item msgid="2692137425242433765">"Төмен"</item>
-    <item msgid="3332408460740717754">"Орташа"</item>
-    <item msgid="4907380534957572531">"Жоғары"</item>
-    <item msgid="4699640516390840297">"Өте жоғары"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Тексеруде…"</item>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index a191014..db609e3 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Кілтсөздер"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Әкімші өшірген"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Саусақ ізі"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Саусақ таңбасын бас-у"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Саусақ таңбасын пайд-у"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Планшетті қондырғыға жалғағанда немесе алғанда дыбысын қосуға болмайды"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Телефонды қондырғыға енгізгенде немесе шығарғанда дыбысын ойнатпау"</string>
     <string name="account_settings" msgid="6403589284618783461">"Есептік жазбалар"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Жеке"</string>
-    <string name="category_work" msgid="8699184680584175622">"Жұмыс"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Жұмыс профилінің есептік жазбалары - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Жеке профиль есептік жазбалары"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Жұмыс есептік жазбасы - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Өшірілген"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Әрқашан қосулы"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Aвтоматты"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файлды шифрлауға түрлендіру"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Түрлендіру..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Файл шифрланып қойылған"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Файлға негізделген шифрлауға түрлендіру"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Деректер бөлімін файлға негізделген шифрлауға түрлендіру.\n !!Ескерту!! Бұл барлық деректерді өшіреді.\n Бұл мүмкіндік альфа кезеңінде және дұрыс жұмыс істемеуі мүмкін.\n Жалғастыру үшін \"Сүрту және түрлендіру...\" түймесін басыңыз."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Сүрту және түрлендіру..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ұйқы"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өшеді"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Әрекетсіз <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> тұрған соң"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Параметрлер"</string>
     <string name="print_settings" msgid="4742428530112487843">"Басу"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Басу қызметтері"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> қолданылсын ба?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Құжат принтерге жеткенше бір немесе бірнеше серверден өтуі мүмкін."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ешқандай қызметтер орнатылмаған"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Ешқандай принтерлер табылмады"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Параметрлер"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Толықтай дауыспен басқару"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Тілді мәтінге түрлендіру"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Бұл дауыспен енгізу қызметі дауысты бақылап, осындай қызметті қолдайтын қолданбаларды сіздің атыңыздан басқарады. Оның шыққан жері — <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Осы мүмкіндікті қосу керек пе?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Мәтіннен-сөйлеуге параметрлері"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Мәтінді тілге айналдыру"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Әрқашан менің параметрлерімді қолдану"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Бастапқы параметрлер қолданба параметрлерінің үстінен жазады"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Бастапқы параметрлер"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Бастапқы қозғалтқыш"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Сөйленетін мәтін үшін пайдаланылатын сөзді синтездеу механизмін орнату"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Сөйлеу жылдамдығы"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Мәтіннің оқылу жылдамдығы"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Дауыс жиілігі"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Сөйлеу мәтінінің әуеніне әсер етеді"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Тіл"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Жүйелік тілді пайдалану"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Тіл таңдалған жоқ"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Сөйлеу мәтіні үшін тілге тән дауыс орнатады"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Үлгіні тыңдау"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Сөйлеу синтезінің қысқа көрсетілімін ойнату"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Дауыс дерекқорын орнату"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Тілді синтездеуге қажетті дауыс дерегін орнату"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Сөйлеу синтезіне қажетті дауыстар дұрыс орнатылған"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Параметрлеріңіз өзгертілді. Бұл дауыс шығу үлгісі."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Сіз таңдаған қозғалтқыш қосылмайды."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигурациялау"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Басқа қозғалтқышты таңдау"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Бұл сөйлеуді синтездеу қозғалтқышы айтылған барлық мәтіндерді, кілтсөз және кредит карта нөмірлері сияқты жеке ақпаратты қоса, жинауы мүмкін. Ол <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> қозғалқышы арқылы жадбықталған. Осы сөйлеуді синтездеу қозғалтқышын пайдалану қосылсын ба?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Бұл тіл мәтіннен-сөйлеуге шығысы үшін қосылып тұрған желі байланысын қажет етеді."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Бұл сөйлеу синтезінің мысалы"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Бастапқы тіл күйі"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> тілінің қолдауы бар"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> желі байланысын қажет етеді"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> үшін қолдау ұсынылмаған"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Тексерілуде..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Қозғалтқыштар"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> параметрлер"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> қосылған"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> өшірілген"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Қозғалтқыш параметрлері"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> параметрлері"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Тілдер мен дауыстар"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Орнатылған"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Орнатылмаған"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Әйел"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Ер адам"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Сөйлеу синтезінің қозғалтқышы орнатылған"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Қолдануға дейін жаңа қозғалтқышты қосыңыз."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Қозғалтқыш параметрлерін қосу"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Қалаулы қозғалтқыш"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Жалпы"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Қуатты басқару"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi параметрін жаңартуда"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth параметрлерін жаңарту"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Фондық қолданбалардың жауап бермегенін көрсету"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Сыртқыда қолданбаларға мәжбүрлеп рұқсат ету"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Манифест мәндеріне қарамастан кез келген қолданбаны сыртқы жадқа жазуға жарамды етеді"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Әрекеттерді өлшемін өзгертуге болатын етуге мәжбүрлеу"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Манифест мәндеріне қарамастан барлық әрекеттерді бірнеше терезе үшін өлшемін өзгертуге болатын етеді."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Деректер тасымалы"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Қолданба деректерін пайдалану"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Оператордың деректер есебі құрылғыңыздан басқаша болуы мүмкін."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Тек дабылдар"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Толық тыныштық"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Көрнекі үзілістер"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Телефон әуені"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Әдепкі хабарландыру әуені"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Қоңырау кезіндегі діріл"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Құрылғы бекітілген болса, хабарландырулар қалай көрсетілуі керек?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Хабарландырулар"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Қолданба хабар-лары"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Тақырып хабарландырулары"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Басқа дыбыстар"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Нөмір тергіш дыбысы"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Экранды бекіту дыбыстары"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Барлығын тыю"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Осы қолданбадан келген хабарландыруларды ешқашан көрсетпеу"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Басымды ретінде белгілеу"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Осы қолданба хабарландыруларының Мазаламау параметрі Маңызды күйіне орнатылғанда ғана естілуіне рұқсат ету"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Қысқаша көрсетуге рұқсат ету"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Қолданбаның ағымдағы экрандағы көрініске сырғыту арқылы белгілі бір хабарландыруларды ерекшелеуіне рұқсат ету"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Мазаламау\" режимін қайта анықтау"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Мазаламау\" режимі \"Тек басым\" күйіне орнатылған кезде осы хабарландыруларға үзуді жалғастыруына рұқсат ету"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Маңызды мазмұнды жасыру"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Құрылғы бекітілген кезде, жеке ақпаратты ашуы мүмкін осы қолданба хабарландыруларының мазмұнын жасыру"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Құрылғы құлыпталған болса, осы хабарландырулардағы жеке ақпаратты ашуы мүмкін мазмұнды жасыру"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Бөгелген"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Маңызды"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Құпия"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін \"дабылдар ғана\" режиміне өзгерту"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Әрқашан тоқтатуға өзгерту"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Экран үзілістері жоқ"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"\"Мазаламау\" арқылы үнсіз етілген хабарландырулардың ағымдағы экранда қысқа уақытқа көрінуін немесе көрінуін болдырмау"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Хабарландыру жарығы жоқ"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"\"Мазаламау\" арқылы үнсіз етілген хабарландырулардың жарықты жыпылықтатуын болдырмау"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Қолданба хабар-лары"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Босату алдында PIN кодын сұрау"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Босату алдында құпия сөзді сұрау"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Босатқанда құрылғыны бекіту"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Жұмыс профилі"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бұл жұмыс профилін басқаратын:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> арқылы басқарылады"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Эксперименттік)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Хабарландырулар"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Қалыпты"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Бөгеу"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Құпия мазмұн жасырын тұр"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Маңызды"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Іріктеу жоқ"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Жұмыс"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Бөгелген"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Маңызды"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Құпия мазмұн жасырын тұр"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Іріктеу жоқ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL мекенжайларымен"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Әкімші өшірген"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Қолданбаларды конфигурациялау"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Қолданба рұқсаттары"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> қолданбаның <xliff:g id="COUNT_0">%d</xliff:g> қосымша рұқсатқа ие"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> қолданбадан <xliff:g id="COUNT_0">%d</xliff:g> рұқсатқа ие"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Сурет түс режимі"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB пайдалану"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Дисплей масштабы"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"дисплей тығыздық масштабтау масштаб масштабтау"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Кішкене"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Қалыпты"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Үлкен"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Үлкенірек"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Ең үлкен"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Арнаулы (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Барлығын көру"</string>
+    <string name="see_less" msgid="1250265310929558370">"Азырақ көру"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Ажыратылған"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Деректердің <xliff:g id="AMOUNT">%1$s</xliff:g> пайдаланылған"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> қолданба орнатылған"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> ішінен <xliff:g id="SIZE1">%1$s</xliff:g> пайдаланылған"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Бейімделгіш жарықтық ҚОСУЛЫ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Бейімделгіш жарықтық ӨШІРУЛІ"</string>
 </resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index afb3572..c4d637e 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ធំ"</item>
     <item msgid="7786168277516233536">"ធំ​សម្បើម"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"យឺត​បំផុត"</item>
-    <item msgid="2361722960903353554">"យឺត"</item>
-    <item msgid="1145554631248513562">"ធម្មតា"</item>
-    <item msgid="7553665153391107454">"លឿន"</item>
-    <item msgid="1370673569131070146">"លឿន​ជាង"</item>
-    <item msgid="4648206845228970803">"លឿន​ណាស់"</item>
-    <item msgid="4977949754169483251">"រហ័ស"</item>
-    <item msgid="6106302964845503577">"រហ័ស​ណាស់"</item>
-    <item msgid="6800277205640837264">"លឿន​បំផុត"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ទាប​បំផុត"</item>
-    <item msgid="2692137425242433765">"ទាប"</item>
-    <item msgid="3332408460740717754">"ធម្មតា"</item>
-    <item msgid="4907380534957572531">"ខ្ពស់"</item>
-    <item msgid="4699640516390840297">"ខ្ពស់​ណាស់"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"កំពុង​វិភាគ​រក…"</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d5972d6..acfc11e 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ពាក្យ​សម្ងាត់"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"គ្រប់គ្រងស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ប្រើស្នាមម្រាមដៃសម្រាប់"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"កុំ​បន្លឺ​សំឡេង​ពេល​បញ្ចូល ឬ​ដក​កុំព្យូទ័រ​បន្ទះ​​ពី​ការ​ភ្ជាប់"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"កុំ​បន្លឺ​សំឡេង​ពេល​បញ្ចូល ឬ​ដក​ទូរស័ព្ទ​ពី​ការ​ភ្ជាប់"</string>
     <string name="account_settings" msgid="6403589284618783461">"គណនី"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ផ្ទាល់ខ្លួន"</string>
-    <string name="category_work" msgid="8699184680584175622">"កន្លែង​ធ្វើការ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"គណនីប្រវត្តិរូបការងារ៖ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"គណនីប្រវត្តិរូបផ្ទាល់ខ្លួន"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"គណនីការងារ៖ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"បានបិទ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"បើកជានិច្ច"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ស្វ័យប្រវត្តិ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"បម្លែងទៅជាការអ៊ីនគ្រីបឯកសារ"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"បម្លែង…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"បានអ៊ីនគ្រីបឯកសាររួចហើយ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"កំពុងបម្លែងទៅការអ៊ីនគ្រីបដែលផ្អែកលើឯកសារ"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"បម្លែងការបែងចែកទិន្នន័យទៅជាការអ៊ីនគ្រីបដែលផ្អែកលើឯកសារ។\n !!ព្រមាន!! សកម្មភាពនេះនឹងលុបទិន្នន័យរបស់អ្នកទាំងអស់។\n លក្ខណៈពិសេសនេះជាការសាកល្បងដំបូង ហើយអាចនឹងដំណើរការមិនប្រក្រតី។\n សូមចុច \'សម្អាត និងបម្លែង...\' ដើម្បីបន្ត។"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"សម្អាត និងបម្លែង…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ដេក"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"អេក្រង់​បិទ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"បន្ទាប់​ពី​អសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ការ​កំណត់"</string>
     <string name="print_settings" msgid="4742428530112487843">"ការ​បោះពុម្ព"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"សេវាកម្ម​បោះពុម្ព"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ឯកសារ​របស់​អ្នក​អាច​ឆ្លង​កាត់​ម៉ាស៊ីន​មេ​មួយ ឬ​ច្រើន​ដើម្បី​ទៅ​ដល់​ម៉ាស៊ីន​បោះពុម្ព។"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"គ្មាន​សេវាកម្ម​បាន​ដំឡើង"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"រក​មិន​ឃើញ​ម៉ាស៊ីន​បោះពុម្ព"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ការ​កំណត់"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"hotword ពេញលេញ និង​អន្តរកម្ម"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ការ​និយាយ​ទៅ​ជា​អត្ថបទ​សាមញ្ញ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"សេវាកម្ម​បញ្ចូល​សំឡេង​នេះ​នឹង​អាច​អនុវត្ត​ការ​តាមដាន​សំឡេង​ជា​និច្ច និង​ពិនិត្យ​សំឡេង​ដែល​បាន​បើក​កម្មវិធី​ក្នុង​នាម​អ្នក។​ វា​បាន​មកពី​កម្មវិធី <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ។ បើក​ការ​ប្រើ​សេវាកម្ម​នេះ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ការ​កំណត់​អត្ថបទ​ទៅ​ជា​កា​និយាយ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"លទ្ធផល​អត្ថបទ​ទៅ​ការ​និយាយ"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ប្រើ​ការកំណត់​របស់​ខ្ញុំ​ជា​និច្ច"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ការ​កំណត់​លំនាំដើម​ខាង​ក្រោម​បដិសេធ​ការ​កំណត់​កម្មវិធី"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ការកំណត់​លំនាំដើម"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ម៉ាស៊ីន​លំនាំដើម"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"កំណត់​ម៉ាស៊ីន​សំយោគ​សំឡេង​ត្រូវ​ប្រើ​សម្រាប់​អត្ថបទ​បាន​អាន"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"អត្រា​និយាយ"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ល្បឿន​ពេល​អាន​​អត្ថបទ"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ឡើង​-ចុះ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ប៉ះពាល់​សំឡេង​នៃ​អត្ថបទ​បាន​និយាយ"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ភាសា"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"ប្រើ​ភាសា​ប្រព័ន្ធ"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"មិន​បាន​ជ្រើស​ភាសា"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"កំណត់​សំឡេង​ភាសា​ជាក់លាក់​សម្រាប់​អត្ថបទ​បាន​និយាយ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ស្ដាប់​​ឧទាហរណ៍"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"ចាក់​ការ​បង្ហាញ​ខ្លី​នៃ​ការ​សំយោគ​ការ​និយាយ"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ដំឡើង​ទិន្នន័យ​សំឡេង"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ដំឡើង​ទិន្នន័យ​សំឡេង​ដែល​ទាមទារ​សម្រាប់​ការ​សំយោគ​សំដី"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ទាមទារ​សំឡេង​សម្រាប់​សំយោគ​ការ​និយាយ​ដែល​បាន​ដំឡើង​យ៉ាង​ត្រឹមត្រូវ"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"បាន​ប្ដូរ​ការ​កំណត់​របស់​អ្នក។ នេះ​ជា​ឧទាហរណ៍​នៃ​វិធី​ដែល​ពួកវា​បន្លឺ​សំឡេង"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"ម៉ាស៊ីន​ដែល​អ្នក​បាន​ជ្រើស មិន​អាច​ដំណើរការ។"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"កំណត់​រចនាសម្ព័ន្ធ"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ជ្រើស​ម៉ាស៊ីន​ផ្សេង"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ម៉ាស៊ីន​សំយោគ​ការ​និយាយ​អាច​ប្រមូល​អត្ថបទ​ទាំងអស់​ដែល​នឹង​ត្រូវ​និយាយ​ រួមមាន​ទិន្នន័យ​ផ្ទាល់​ខ្លួន ដូច​ជា​ពាក្យ​សម្ងាត់ និង​លេខ​កាត​ឥណទាន។ វា​បាន​មក​ពី​ម៉ាស៊ីន <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ។បើក​​ការ​ប្រើ​ម៉ាស៊ីន​សំយោគ​ការ​និយាយ​នេះ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ភាសា​នេះ​ទាមទារ​ការ​តភ្ជាប់​បណ្ដាញ​​ដែល​ដំណើរការ​សម្រាប់​លទ្ធផល​អត្ថបទ​ត្រូវ​និយាយ។"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"នេះ​ជា​ឧទាហរណ៍​នៃ​ការ​សំយោគ​ការ​និយាយ។"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ស្ថានភាព​ភាសា​លំនាំដើម"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"បាន​គាំទ្រ​ពេញលេញ <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ទាមទារ​ការ​ភ្ជាប់​បណ្ដាញ"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"មិន​គាំទ្រ <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"កំពុង​ពិនិត្យ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"ម៉ាស៊ីន"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"ការ​កំណត់ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"បាន​បើក <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"បាន​បិទ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"ការកំណត់​ម៉ាស៊ីន"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"ការ​កំណត់​សម្រាប់ <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ភាសា​ និង​សំឡេង"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"បាន​ដំឡើង"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"មិន​បា​ន​ដំឡើង"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ស្រី"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ប្រុស"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"បាន​ដំឡើង​ម៉ាស៊ីន​សំយោគ​ការ​និយាយ"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"បើក​ម៉ាស៊ីន​ថ្មី​មុន​ពេល។"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ចាប់ផ្ដើម​ការកំណត់​ម៉ាស៊ីន​ផ្សេង"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ម៉ាស៊ីន​ដែល​ពេញ​ចិត្ត"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ទូទៅ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ពិនិត្យ​ថាមពល"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"ធ្វើ​បច្ចុប្បន្នភាព​ការ​កំណត់​វ៉ាយហ្វាយ"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ធ្វើ​បច្ចុប្បន្នភាព​ការ​កំណត់​ប៊្លូធូស"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"បង្ហាញ​ប្រអប់​កម្មវិធី​មិន​ឆ្លើយតប​សម្រាប់​កម្មវិធី​ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"បង្ខំឲ្យអនុញ្ញាតកម្មវិធីលើឧបករណ៍ផ្ទុកខាងក្រៅ"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ធ្វើឲ្យកម្មវិធីទាំងឡាយមានសិទ្ធិសរសេរទៅកាន់ឧបករណ៍ផ្ទុកខាងក្រៅ ដោយមិនគិតពីតម្លៃជាក់លាក់"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"បង្ខំឲ្យសកម្មភាពអាចប្តូរទំហំបាន"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"កំណត់ឲ្យសកម្មភាពទាំងអស់អាចប្តូរទំហំបានសម្រាប់ពហុផ្ទាំងវិនដូ ដោយមិនគិតពីតម្លៃមេនីហ្វេសឡើយ។"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ការប្រើទិន្នន័យកម្មវិធី"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"​គណនេយ្យ​ទិន្នន័យ​ក្រុមហ៊ុន​បញ្ជូន​អាច​ខុស​ពី​ឧបករណ៍​របស់​អ្នក។"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"សម្លេងរោទ៍ប៉ុណ្ណោះ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ស្ងៀមស្ងាត់ទាំងស្រុង"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>៖ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ការរំខានចំពោះការមើល"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"សំឡេង​រោទ៍​ការ​ជូនដំណឹង​លំនាំដើម"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ញ័រ​សម្រាប់​ការ​ហៅ​ដែរ"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"នៅ​ពេល​ឧបករណ៍​របស់​អ្នក​ជាប់​សោ តើ​អ្នក​ចង់​ឲ្យ​ការ​ជូន​ដំណឹង​បង្ហាញ​ដោយ​របៀប​ណា?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ការជូនដំណឹង"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"ការជូនដំណឹងប្រធានបទ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"សំឡេង​ផ្សេង​ទៀត"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"សំឡេង​បន្ទះ​លេខ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"សំឡេង​ចាក់សោ​អេក្រង់"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"រារាំងទាំងអស់"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"កុំ​បង្ហាញ​ការ​ជូន​ដំណឹង​សម្រាប់​កម្មវិធី​នេះ"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ដាក់ជាអាទិភាព"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"អនុញ្ញាតឲ្យការជូនដំណឹងនេះបន្លឺសម្លេង នៅពេលដែលរបៀប កុំរំខាន ត្រូវបានកំណត់ជាអាទិភាពប៉ុណ្ណោះ"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"អនុញ្ញាតការមើលមួយភ្លែត"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"អនុញ្ញាតឲ្យកម្មវិធីនេះផ្តោតលើការជូនដំណឹងជាក់លាក់ដោយការអូសពួកវាបន្តិចទៅក្នុងទិដ្ឋភាពនៅលើអេក្រង់បច្ចុប្បន្ន"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"បដិសេធរបៀបកុំរំខាន"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"អនុញ្ញាតឲ្យការជូនដំណឹងទាំងនេះបន្តរំខាន នៅពេលដែលរបៀបកុំរំខានត្រូវបានកំណត់ទៅ របៀបអាទិភាពប៉ុណ្ណោះ"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"លាក់មាតិការសើប"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"នៅពេលដែលឧបករណ៍នេះជាប់សោ វានឹងលាក់មាតិកានៅក្នុងការជូនដំណឹងរបស់កម្មវិធីនេះដែលអាចបង្ហាញព័ត៌មានឯកជន"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"នៅពេលដែលឧបករណ៍ត្រូវបានចាក់សោ សូមលាក់ការជូនដំណឹងទាំងនេះដែលពួកវាអាចនឹងបង្ហាញព័ត៌មានឯកជន"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"បាន​ទប់ស្កាត់"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"អាទិភាព"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ជាក់លាក់"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ប្តូរទៅម៉ោងរោទិ៍រហូតទាល់តែដល់ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ប៉ុណ្ណោះ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ប្តូរទៅរំខានជានិច្ច"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"គ្មានការរំខានអេក្រង់"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"ទប់ស្កាត់ការជូនដំណឹងដែលធ្វើឲ្យស្ងាត់ដោយ កុំរំខាន មិនឲ្យលោតឡើង ឬបង្ហាញលើអេក្រង់បច្ចុប្បន្ន"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"គ្មានភ្លើងការជូនដំណឹង"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ទប់ស្កាត់ការជូនដំណឹងដែលធ្វើឲ្យស្ងាត់ដោយ កុំរំខាន មិនឲ្យបញ្ចេញពន្លឺភ្លឹបភ្លេត"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់​មតិ​ស្ថាបនា​អំពី​ឧបករណ៍​នេះ"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"សួរ​រក​កូដ PIN មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"សួរ​រក​ពាក្យ​សម្ងាត់​មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ចាក់​សោ​ឧបករណ៍​ពេល​មិន​ភ្ជាប់"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ប្រវត្តិរូប​ការងារ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ប្រវត្តិរូបការងារនេះត្រូវបានគ្រប់គ្រងដោយ៖"</string>
     <string name="managing_admin" msgid="8843802210377459055">"គ្រប់គ្រងដោយ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ពិសោធន៍​)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"ការជូនដំណឹង"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ធម្មតា"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"ទប់ស្កាត់"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"បានលាក់មាតិកាសំខាន់"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"អាទិភាព"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"គ្មានការលួចមើល"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ផ្ទាល់ខ្លួន"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"កន្លែងធ្វើការ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"បានទប់ស្កាត់"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"អាទិភាព"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"បានលាក់មាតិកាសំខាន់"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"គ្មានការលួចមើល"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ដោយមានដែន URLs"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="configure_apps" msgid="6685680790825882528">"កំណត់រចនាសម្ព័ន្ធកម្មវិធី"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
     <string name="app_permissions" msgid="4148222031991883874">"សិទ្ធិ​កម្មវិធី"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"កម្មវិធី <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g> បានអនុញ្ញាតការចូលប្រើបន្ថែម"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"បានអនុញ្ញាតកម្មវិធី <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"របៀបនៃពណ៌រូបភាព"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"ប្រើ sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"មាត្រដ្ឋានអេក្រង់"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ការកំណត់មាត្រដ្ឋានពង្រីកដង់ស៊ីតេអេក្រង់"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"តូច"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ធម្មតា"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ធំ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ធំជាង"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ធំបំផុត"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ផ្ទាល់ខ្លួន (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"មើលទាំងអស់"</string>
+    <string name="see_less" msgid="1250265310929558370">"​មើល​តិច​ជាង"</string>
+    <string name="disconnected" msgid="5787956818111197212">"បាន​ផ្ដាច់"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"បានប្រើទិន្នន័យអស់ <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"បានដំឡើងកម្មវិធី <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"បានប្រើ <xliff:g id="SIZE1">%1$s</xliff:g> នៃ <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"ពន្លឺសម្របត្រូវបានបើក"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"ពន្លឺសម្របត្រូវបានបិទ"</string>
 </resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index 34d731e..efc59ac 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ದೊಡ್ಡದು"</item>
     <item msgid="7786168277516233536">"ಬಹಳ ದೊಡ್ಡದು"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ತುಂಬಾ ನಿಧಾನ"</item>
-    <item msgid="2361722960903353554">"ನಿಧಾನ"</item>
-    <item msgid="1145554631248513562">"ಸಾಮಾನ್ಯ"</item>
-    <item msgid="7553665153391107454">"ವೇಗ"</item>
-    <item msgid="1370673569131070146">"ಕ್ಷಿಪ್ರ"</item>
-    <item msgid="4648206845228970803">"ಅತ್ಯಂತ ವೇಗ"</item>
-    <item msgid="4977949754169483251">"ತ್ವರಿತ"</item>
-    <item msgid="6106302964845503577">"ಅತ್ಯಂತ ತ್ವರಿತ"</item>
-    <item msgid="6800277205640837264">"ಅತಿ ಕ್ಷಿಪ್ರ"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ಅತ್ಯಂತ ಕಡಿಮೆ"</item>
-    <item msgid="2692137425242433765">"ಕಡಿಮೆ"</item>
-    <item msgid="3332408460740717754">"ಸಾಮಾನ್ಯ"</item>
-    <item msgid="4907380534957572531">"ಅಧಿಕ"</item>
-    <item msgid="4699640516390840297">"ಅತಿ ಹೆಚ್ಚು"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</item>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 7d84cc9..4dbd763 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ನಿರ್ವ."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸೇರಿಸುವಾಗ ಅಥವಾ ಡಾಕ್‌ನಿಂದ ತೆಗೆದುಹಾಕುವಾಗ ಶಬ್ದವನ್ನು ಪ್ಲೇ ಮಾಡದಿರು"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ಫೋನ್‌ ಅನ್ನು ಡಾಕ್‌ಗೆ ಸೇರಿಸುವಾಗ ಅಥವಾ ತೆಗೆದುಹಾಕುವಾಗ ಧ್ವನಿಯನ್ನು ಪ್ಲೇ ಮಾಡಬೇಡಿ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ಖಾತೆಗಳು"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ವೈಯಕ್ತಿಕ"</string>
-    <string name="category_work" msgid="8699184680584175622">"ಕೆಲಸದ ಸ್ಥಳ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ಕೆಲಸ ಪ್ರೊಫೈಲ್ ಖಾತೆಗಳು - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಖಾತೆಗಳು"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ಕೆಲಸದ ಖಾತೆ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ಯಾವಾಗಲೂ ಆನ್"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ಸ್ವಯಂಚಾಲಿತ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ಫೈಲ್ ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ಗೆ ಪರಿವರ್ತಿಸು"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ಪರಿವರ್ತಿಸು…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ಫೈಲ್ ಈಗಾಗಲೇ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ಫೈಲ್ ಆಧಾರಿತ ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ಗೆ ಪರಿವರ್ತಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ಡೇಟಾ ವಿಭಜನೆಯನ್ನು ಫೈಲ್ ಆಧಾರಿತ ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಆಗಿ ಪರಿವರ್ತಿಸಿ.\n !!ಎಚ್ಚರಿಕೆ!! ಇದು ನಿಮ್ಮ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ.\n ಈ ವೈಶಿಷ್ಟ್ಯವು ಆಲ್ಫಾ ಆಗಿರುತ್ತದೆ ಮತ್ತು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು.\n ಮುಂದುವರಿಸಲು \'ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು…\' ಒತ್ತಿರಿ."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ಸ್ಲೀಪ್‌"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ಪರದೆ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ನಂತರ"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="print_settings" msgid="4742428530112487843">"ಮುದ್ರಣ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ಮುದ್ರಣ ಸೇವೆಗಳು"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ಬಳಸುವುದೇ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ನಿಮ್ಮ ಡಾಕ್ಯುಮೆಂಟ್‌ ಪ್ರಿಂಟರ್‌ಗೆ ಹೋಗುವ ಸಂದರ್ಭದಲ್ಲಿ ಒಂದು ಅಥವಾ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಸರ್ವರ್‌ಗಳ ಮೂಲಕ ಹಾದುಹೋಗಬಹುದು."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ಯಾವುದೇ ಸೇವೆಗಳನ್ನು ಸ್ಥಾಪಿಸಿಲ್ಲ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ಯಾವುದೇ ಮುದ್ರಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"ಪೂರ್ಣ ಹಾಟ್‌ವರ್ಡ್ ಮತ್ತು ಸಂವಹನ"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ಸರಳ ಧ್ವನಿಯಿಂದ ಪಠ್ಯಕ್ಕೆ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ಈ ಧ್ವನಿ ಇನ್‌ಪುಟ್ ಸೇವೆ ನಿಮ್ಮ ಪರವಾಗಿ ಯಾವಾಗಲೂ ಆನ್ ಇರುವ ಧ್ವನಿ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಲು ಮತ್ತು ಧ್ವನಿ ಸಕ್ರಿಯಗೊಳಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ನಿಯಂತ್ರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. ಅದು <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ನಿಂದ ಬರುತ್ತದೆ. ಈ ಸೇವೆಯ ಬಳಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ಪಠ್ಯದಿಂದ ಧ್ವನಿಗೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"ಧ್ವನಿಗೆ-ಪಠ್ಯದ ಔಟ್‌ಪುಟ್‌"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ಯಾವಾಗಲೂ ನನ್ನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಸು"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ಅತಿಕ್ರಮಿಸುವ ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಕೆಳಗೆ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ಡೀಫಾಲ್ಟ್ ಎಂಜಿನ್"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ಹೇಳಲಾಗುವ ಪಠ್ಯದ ಬಳಕೆಗೆ ಧ್ವನಿ ಸಿಂಥೆಸಿಸ್ ಎಂಜಿನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"ಧ್ವನಿಯ ದರ"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ಪಠ್ಯವನ್ನು ಹೇಳಿದ ವೇಗ"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ಪಿಚ್"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ಮಾತಿನ ಪಠ್ಯದ ಟೋನ್ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುತ್ತದೆ"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ಭಾಷೆ"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"ಸಿಸ್ಟಂ ಭಾಷೆಯನ್ನು ಬಳಸು"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಲಾಗಿಲ್ಲ"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ಮಾತಿನ ಪಠ್ಯಕ್ಕೆ ಭಾಷಾ-ನಿರ್ದಿಷ್ಟ ಧ್ವನಿಯನ್ನು ಹೊಂದಿಸುತ್ತದೆ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ಉದಾಹರಣೆಯೊಂದನ್ನು ಆಲಿಸಿ"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"ಧ್ವನಿ ಸಮನ್ವಯದ ಕಿರು ಪ್ರಾತ್ಯಕ್ಷಿಕೆಯನ್ನು ಪ್ಲೇ ಮಾಡು"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ಧ್ವನಿ ಡೇಟಾವನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ಧ್ವನಿ ಸಮನ್ವಯಕ್ಕಾಗಿ ಅಗತ್ಯವಿರುವ ಧ್ವನಿ ಡೇಟಾ ಸ್ಥಾಪಿಸಿ"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ಈಗಾಗಲೇ ಸರಿಯಾಗಿ ಸ್ಥಾಪಿತವಾದ ಧ್ವನಿ ಸಮನ್ವಯಕ್ಕಾಗಿ ಧ್ವನಿಗಳ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ನಿಮ್ಮ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಬದಲಾವಣೆಯಾಗಿವೆ. ಅವು ಹೇಗೆ ಉಚ್ಚರಿಸುತ್ತವೆ ಎಂಬುದರ ಬಗ್ಗೆ ಇದು ಒಂದು ಉದಾಹರಣೆಯಾಗಿದೆ."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಎಂಜಿನ್ ರನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ಮತ್ತೊಂದು ಎಂಜಿನ್ ಆರಿಸು"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಕ್ರೆಡಿಟ್‌ ಕಾರ್ಡ್‌ ಸಂಖ್ಯೆಗಳಂತಹ ವೈಯಕ್ತಿಕ ಡೇಟಾ ಒಳಗೊಂಡಂತೆ ಮಾತನಾಡುವ ಎಲ್ಲ ಪಠ್ಯವನ್ನು ಸಂಗ್ರಹಿಸಲು ಈ ಧ್ವನಿ ಸಮನ್ವಯ ಎಂಜಿನ್‌ಗೆ ಸಾಧ್ಯವಾಗಬಹುದು. ಇದು <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ಎಂಜಿನ್‌ನಿಂದ ಬರುತ್ತದೆ. ಈ ಧ್ವನಿ ಸಮನ್ವಯ ಎಂಜಿನ್ ಬಳಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ಪಠ್ಯದಿಂದ ಧ್ವನಿ ಔಟ್‌ಪುಟ್‌‌ಗಾಗಿ ಈ ಭಾಷೆಗೆ ಕಾರ್ಯನಿರತವಾದ ನೆಟ್‌ವರ್ಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ಇದು ಧ್ವನಿ ಸಮನ್ವಯದ ಒಂದು ಉದಾಹರಣೆಯಾಗಿದೆ"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ಡೀಫಾಲ್ಟ್ ಭಾಷೆಯ ಸ್ಥಿತಿ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> ಸಂಪೂರ್ಣವಾಗಿ ಬೆಂಬಲಿತವಾಗಿದೆ"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"ಎಂಜಿನ್‌ಗಳು"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"ಎಂಜಿನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> ಗಾಗಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ಭಾಷೆಗಳು ಮತ್ತು ಧ್ವನಿಗಳು"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ಮಹಿಳೆ"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ಪುರುಷ"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"ಧ್ವನಿ ಸಮನ್ವಯ ಎಂಜಿನ್ ಅನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ಬಳಸುವ ಮೊದಲು ಹೊಸ ಎಂಜಿನ್ ಸಕ್ರಿಯಗೊಳಿಸಿ."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ಎಂಜಿನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸು"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ಪ್ರಾಶಸ್ತ್ಯದ ಎಂಜಿನ್"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ಸಾಮಾನ್ಯ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ವಿದ್ಯುತ್ ನಿಯಂತ್ರಣ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ಬ್ಲೂಟೂತ್‌‌ ಸೆಟ್ಟಿಂಗ್‌ ಅನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ಹಿನ್ನೆಲೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರತಿಕ್ರಿಯಿಸುತ್ತಿಲ್ಲ ಎಂಬ ಸಂಭಾಷಣೆ ತೋರಿಸು"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"ಬಾಹ್ಯವಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಒತ್ತಾಯವಾಗಿ ಅನುಮತಿಸಿ"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ಮ್ಯಾನಿಫೆಸ್ಟ್ ಮೌಲ್ಯಗಳನ್ನು ಪರಿಗಣಿಸದೇ, ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಗೆ ಬರೆಯಲು ಅರ್ಹಗೊಳಿಸುತ್ತದೆ"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"ಚಟುವಟಿಕೆಗಳನ್ನು ಮರುಗಾತ್ರಗೊಳಿಸುವಂತೆ ಒತ್ತಾಯ ಮಾಡಿ"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"ಮ್ಯಾನಿಫೆಸ್ಟ್ ಮೌಲ್ಯಗಳನ್ನು ಪರಿಗಣಿಸದೇ, ಬಹು-ವಿಂಡೊಗೆ ಎಲ್ಲಾ ಚಟುವಟಿಕೆಗಳನ್ನು ಮರುಗಾತ್ರಗೊಳಿಸುವಂತೆ ಮಾಡುತ್ತದೆ."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ಆಪ್‌‌ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ನಿಮ್ಮ ಸಾಧನಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ಅಲಾರಮ್‌ಗಳು ಮಾತ್ರ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ಸಂಪೂರ್ಣ ನಿಶ್ಯಬ್ಧ"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ದೃಶ್ಯ ಅಡಚಣೆಗಳು"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ರಿಂಗ್‌ಟೋನ್‌"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ನಿಮ್ಮ ಸಾಧನ ಲಾಕ್‌ ಆದಾಗ, ಪ್ರಕಟಣೆಗಳನ್ನು ಹೇಗೆ ತೋರಿಸಲು ಬಯಸುತ್ತೀರಿ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"ವಿಷಯ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ಇತರ ಧ್ವನಿಗಳು"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ಡಯಲ್‌ ಪ್ಯಾಡ್‌ ಟೋನ್‌ಗಳು"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ಸ್ಕ್ರೀನ್ ಲಾಕಿಂಗ್ ಧ್ವನಿಗಳು"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ಎಲ್ಲವನ್ನೂ ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಎಂದಿಗೂ ತೋರಿಸಬೇಡ"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ಆದ್ಯತೆ"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಆದ್ಯತೆಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಕೇಳಲು ಅನುಮತಿಸಿ"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ಇಣುಕು ನೋಟವನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಸಂಕ್ಷಿಪ್ತ ವೀಕ್ಷಣೆಗೆ ಸ್ಲೈಡ್ ಮಾಡುವ ಮೂಲಕ ಕೆಲವು ಅಧಿಸೂಚನೆಗಳಿಗೆ ಮಹತ್ವವನ್ನು ನೀಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅತಿಕ್ರಮಿಸು"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅನ್ನು ಆದ್ಯತೆಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಅಡ್ಡಿಪಡಿಸಲು ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮುಂದುವರಿಸಲು ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ಸೂಕ್ಷ್ಮ ವಿಷಯವನ್ನು ಮರೆಮಾಡಿ"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"ಸಾಧನವನ್ನು ಲಾಕ್‌ ಮಾಡಿದಾಗ, ಖಾಸಗಿ ಮಾಹಿತಿಯನ್ನು ಬಹಿರಂಗಪಡಿಸಬಹುದಾದ ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಅಧಿಸೂಚನೆಗಳಲ್ಲಿನ ವಿಷಯವನ್ನು ಮರೆಮಾಡಿ"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"ಸಾಧನವನ್ನು ಲಾಕ್‌ ಮಾಡಿದಾಗ, ಖಾಸಗಿ ಮಾಹಿತಿಯನ್ನು ಬಹಿರಂಗ ಮಾಡುವಂತಹ ವಿಷಯವನ್ನು ಈ ಅಧಿಸೂಚನೆಯಲ್ಲಿ ಮರೆಮಾಡಿ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ಆದ್ಯತೆ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ಸೂಕ್ಷ್ಮ"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ವರೆಗೆ ಮಾತ್ರ ಅಲಾರಮ್‌ಗಳಲ್ಲಿ ಬದಲಾವಣೆ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ಯಾವುದೇ ಪರದೆ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಇಣುಕು ನೋಟ ಅಥವಾ ಗೋಚರಿಸುವುದರಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"ಅಧಿಸೂಚನೆ ಲೈಟ್ ಇಲ್ಲ"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ಪಲ್ಸ್‌ಗೆ ಕಾರಣವಾಗುವ ಲೈಟ್‌ನಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ಅನ್‌ಪಿನ್‌ ಮಾಡಲು ಪಿನ್‌ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ಅನ್‌ಪಿನ್ ಮಾಡಲು ಪಾಸ್‌ವರ್ಡ್ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ಅನ್‌ಪಿನ್ ಮಾಡುವಾಗ ಸಾಧನ ಲಾಕ್ ಮಾಡು"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ಈ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಇವರು ನಿರ್ವಹಿಸುತ್ತಿದ್ದಾರೆ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ಪ್ರಾಯೋಗಿಕ)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ಸಾಮಾನ್ಯ"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"ಸೂಕ್ಷ್ಮ ವಿಷಯ ಮರೆಮಾಡಲಾಗಿದೆ"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ಆದ್ಯತೆ"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"ಯಾವುದೇ ಇಣುಕು ನೋಟವಿಲ್ಲ"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ಆದ್ಯತೆ"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"ಸೂಕ್ಷ್ಮ ವಿಷಯ ಮರೆಮಾಡಲಾಗಿದೆ"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"ಯಾವುದೇ ಇಣುಕು ನೋಟವಿಲ್ಲ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ಡೊಮೇನ್‌ URL ಗಳ ಜೊತೆಗೆ"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ಅಪ್ಲಿಕೇಶನ್‌ ಕಾನ್ಫಿಗರ್‌"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ಅಜ್ಞಾತ ಅಪ್ಲಿಕೇಶನ್"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿ. ಹೆಚ್ಚುವರಿ ಪ್ರವೇಶ ಅನುಮತಿಸಲಾಗಿದೆ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ಚಿತ್ರ ಬಣ್ಣದ ಮೋಡ್"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ಬಳಸಿ"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ಪ್ರಮಾಣ ತೋರಿಸಿ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ಸಾಂದ್ರತೆ ಝೂಮ್ ಅಳತೆಯ ಪ್ರಮಾಣವನ್ನು ತೋರಿಸಿ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ಸಣ್ಣ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ಸಾಮಾನ್ಯ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ದೊಡ್ಡ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ಸ್ವಲ್ಪ ದೊಡ್ಡ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ದೊಡ್ಡ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ಕಸ್ಟಮ್ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
+    <string name="see_less" msgid="1250265310929558370">"ಕಡಿಮೆ ನೋಡಿ"</string>
+    <string name="disconnected" msgid="5787956818111197212">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ಡೇಟಾ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="SIZE1">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"ಅಡಾಪ್ಟಿವ್ ಪ್ರಖರತೆ ಆನ್‌ ಆಗಿದೆ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"ಅಡಾಪ್ಟಿವ್ ಪ್ರಖರತೆ ಆಫ್‌ ಆಗಿದೆ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index a55c8e3..22b72d9 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"크게"</item>
     <item msgid="7786168277516233536">"아주 크게"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"매우 느림"</item>
-    <item msgid="2361722960903353554">"느림"</item>
-    <item msgid="1145554631248513562">"보통"</item>
-    <item msgid="7553665153391107454">"빠름"</item>
-    <item msgid="1370673569131070146">"조금 빠름"</item>
-    <item msgid="4648206845228970803">"비교적 빠름"</item>
-    <item msgid="4977949754169483251">"상당히 빠름"</item>
-    <item msgid="6106302964845503577">"매우 빠름"</item>
-    <item msgid="6800277205640837264">"가장 빠름"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"매우 낮음"</item>
-    <item msgid="2692137425242433765">"낮음"</item>
-    <item msgid="3332408460740717754">"보통"</item>
-    <item msgid="4907380534957572531">"높음"</item>
-    <item msgid="4699640516390840297">"매우 높음"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"검색 중..."</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5a63bf6..94e1435 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"관리자가 사용 중지함"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"지문"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"지문 관리"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"지문을 사용할 항목"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"도크에 태블릿을 끼우거나 제거할 때 소리 재생 안함"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"도크에 휴대전화를 끼우거나 제거할 때 소리 재생 안함"</string>
     <string name="account_settings" msgid="6403589284618783461">"계정"</string>
-    <string name="category_personal" msgid="1299663247844969448">"개인"</string>
-    <string name="category_work" msgid="8699184680584175622">"직장"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"직장 프로필 계정 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"개인 프로필 계정"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"직장 계정 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"사용 안함"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"항상 사용"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"자동"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"파일 암호화로 변환"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"변환..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"파일이 이미 암호화됨"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"파일 기반 암호화로 변환"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"데이터 파티션을 파일 기반 암호화로 변환하세요.\n !!경고!! 이 기능을 사용하면 모든 데이터가 삭제됩니다.\n 이 기능은 알파 버전이며 제대로 작동하지 않을 수 있습니다.\n 계속하려면 \'삭제 및 변환...\'을 누르세요."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"삭제 및 변환..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"절전 모드"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"화면이 꺼짐"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"설정"</string>
     <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"프린트 서비스"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"문서가 프린터로 전송되는 중에 하나 이상의 서버를 통과할 수 있습니다."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"프린터 없음"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"전체 핫워드 및 상호작용"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"간단한 STT(음성 텍스트 변환)"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"이 음성 입력 서비스는 항상 음성을 모니터링하고 사용자를 대신하여 음성 지원 애플리케이션을 제어할 수 있습니다. 이 서비스는 <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> 애플리케이션에서 제공합니다. 서비스를 사용하도록 설정하시겠습니까?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"TTS 설정"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"TTS 출력"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"항상 내 설정 사용"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"아래 기본 설정으로 앱 설정 덮어쓰기"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"기본 설정"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"기본 엔진"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"음성 텍스트에 사용될 음성 합성 엔진을 설정하세요."</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"말하는 속도"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"텍스트를 읽어주는 속도"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"발음된 텍스트의 톤에 적용"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"언어"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"시스템 언어 사용"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"언어가 선택되지 않음"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"발음된 텍스트에 대해 언어별로 음성 설정"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"예제 듣기"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"짧은 음성 합성 데모 재생"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"음성 데이터 설치"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"음성 합성을 사용하려면 음성 데이터를 설치해야 함"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"음성 합성에 필요한 음성이 이미 설치되어 있습니다."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"설정이 변경되었습니다. 다음은 소리나는 방식에 대한 예입니다."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"선택한 엔진을 실행할 수 없습니다."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"구성"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"다른 엔진 선택"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"이 음성 합성 엔진은 비밀번호와 신용카드 번호 등의 개인 데이터를 비롯한 모든 음성 데이터를 수집할 수 있습니다. 이것은 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 엔진의 기능입니다. 음성 합성 엔진을 사용하도록 설정하시겠습니까?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"이 언어로 TTS(Text-to-speech)를 출력하려면 네트워크 연결이 작동해야 합니다."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"음성 합성의 예입니다."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"기본 언어 상태"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>은(는) 완전하게 지원됩니다."</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>은(는) 네트워크 연결이 필요합니다."</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>은(는) 지원되지 않습니다."</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"확인 중..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"엔진"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 설정"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 사용"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 사용 안함"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"엔진 설정"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>에 대한 설정"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"언어 및 음성"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"설치됨"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"설치되지 않음"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"여성"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"남성"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"음성 합성 엔진이 설치됨"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"사용 전에 새 엔진을 사용 설정하세요."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"엔진 설정 실행"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"기본 엔진"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"기본설정"</string>
     <string name="gadget_title" msgid="5519037532720577836">"전원 컨트롤"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi 설정 업데이트"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"백그라운드 앱에 대해 앱 응답 없음 대화상자 표시"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"외부에서 앱 강제 허용"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"매니페스트 값에 관계없이 앱을 외부 저장소에 작성"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"활동의 크기가 조정 가능하도록 설정"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"모든 활동을 매니페스트 값에 관계없이 멀티 윈도우용으로 크기 조정 가능하도록 설정"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"앱 데이터 사용"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"이동통신사 데이터 사용량 계산은 기기와 다를 수 있습니다."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"알람만"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"모두 차단"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"시각적 방해"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"기본 알림 벨소리"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"전화 올 때 벨소리와 함께 진동"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"기기가 잠겨 있을 때 알림 표시 방법을 선택하세요."</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"알림"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"주제 알림"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"기타 소리"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"다이얼패드 신호음"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"화면 잠금 소리"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"이 앱의 알림 표시 안함"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"최우선으로 취급"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"알림 일시중지가 최우선만 수신으로 설정되어 있을 때 이 앱의 알림이 표시되도록 허용합니다."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"엿보기 허용"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"특정 알림을 짧게 슬라이드하여 현재 화면에 표시했을 때 앱에서 알림을 강조하도록 허용합니다."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"알림 일시중지 재정의"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"알림 일시중지가 중요 알림만으로 설정된 경우 이러한 알림을 계속 받도록 허용합니다."</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"민감한 내용 숨기기"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"기기가 잠겨 있는 경우 이 앱의 알림에서 개인 정보를 노출할 수 있는 내용을 숨깁니다."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"기기가 잠긴 경우, 이러한 알림에서 개인 정보를 노출할 수 있는 콘텐츠를 숨깁니다."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"차단됨"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"최우선만 수신"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"중요"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>까지 알람만 수신 모드로 변경"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"항상 알림 모드로 변경"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"화면 방해 금지"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"알림 일시중지로 인해 무음 처리된 알림이 현재 화면에 표시되지 않도록 함"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"알림등 없음"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"알림 일시중지로 인해 무음 처리된 알림이 빛을 내는 대신 진동으로 변환되지 않도록 함"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
     <string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"고정 해제 이전에 PIN 요청"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"고정 해제 이전에 비밀번호 요청"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"화면 고정 해제 시 기기 잠금"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"직장 프로필"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"다음에서 이 직장 프로필을 관리합니다."</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>에서 관리"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(베타)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"알림"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"보통"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"차단"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"민감한 콘텐츠 숨김"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"중요 알림"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"엿보기 없음"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"차단됨"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"중요 알림"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"민감한 콘텐츠 숨김"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"엿보기 없음"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"도메인 URL이 있는 앱"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"관리자가 사용 중지함"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
     <string name="configure_apps" msgid="6685680790825882528">"앱 설정"</string>
     <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
     <string name="app_permissions" msgid="4148222031991883874">"앱 권한"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 추가 액세스 허용됨"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 허용됨"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"사진 색상 모드"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB 사용"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"디스플레이 배율"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"디스플레이 밀도 확대/축소 배율 배율 조정"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"작게"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"보통"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"크게"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"더 크게"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"가장 크게"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"맞춤(<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"모두 보기"</string>
+    <string name="see_less" msgid="1250265310929558370">"간략히 보기"</string>
+    <string name="disconnected" msgid="5787956818111197212">"연결 해제됨"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"데이터 <xliff:g id="AMOUNT">%1$s</xliff:g> 사용됨"</string>
+    <string name="apps_summary" msgid="193158055537070092">"앱 <xliff:g id="COUNT">%1$d</xliff:g>개 설치됨"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> 중 <xliff:g id="SIZE1">%1$s</xliff:g> 사용됨"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"밝기 자동 조절이 사용 설정되었습니다."</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"밝기 자동 조절이 사용 중지되었습니다."</string>
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index a8fc6d5..63c02b0 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Чоң"</item>
     <item msgid="7786168277516233536">"Өтө чоң"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Өтө жай"</item>
-    <item msgid="2361722960903353554">"Жай"</item>
-    <item msgid="1145554631248513562">"Орточо"</item>
-    <item msgid="7553665153391107454">"Ылдам"</item>
-    <item msgid="1370673569131070146">"Ылдамыраак"</item>
-    <item msgid="4648206845228970803">"Абдан ылдам"</item>
-    <item msgid="4977949754169483251">"Тез"</item>
-    <item msgid="6106302964845503577">"Өтө тез"</item>
-    <item msgid="6800277205640837264">"Эң ылдам"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Өтө төмөн"</item>
-    <item msgid="2692137425242433765">"Төмөн"</item>
-    <item msgid="3332408460740717754">"Орточо"</item>
-    <item msgid="4907380534957572531">"Жогору"</item>
-    <item msgid="4699640516390840297">"Өтө бийик"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Скандалууда…"</item>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 0dddf54..e5d0ddd 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Жайгашкан жеримди, экран кулпусун ачууну, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Сырсөздөр"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Администратор тарабынан өчүрүлгөн"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Манжа изи"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Манжа издерин башкаруу"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Манжа издерин колдонуу"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Планшетти орнотуп же ажыратып жатканда үн чыкпасын"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Телефонду орнотуп же ажыратып жатканда үн чыкпасын"</string>
     <string name="account_settings" msgid="6403589284618783461">"Эсептер"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Жеке"</string>
-    <string name="category_work" msgid="8699184680584175622">"Жумуш"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Жумуш профилинин каттоо эсептери - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Жеке профилдин каттоо эсептери"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Жумуштагы каттоо эсеби - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Өчүрүлгөн"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Ар дайым күйгүзүлгөн"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматтык"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файл шифрлөөсүнө айландыруу"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Айландыруу…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Файл мурунтан эле шифрленген"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Файл негизиндеги шифрлөөгө айландырылууда"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Дайындардын бөлүнүшүн файл негизиндеги шифрлөөгө айландыруу.\n !!Эскертүү!! Бул бардык дайындарыңызды тазалайт.\n Бул функция - альфа жана туура иштебеши мүмкүн.\n Улантуу үчүн \'Сүрүп салуу жана айландыруу…\' дегенди басыңыз."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Сүрүп салуу жана айландыруу…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Уктоо"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өчөт"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> колдонулбагандан кийин"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Жөндөөлөр"</string>
     <string name="print_settings" msgid="4742428530112487843">"Басылууда"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Принтер-кызматтары"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> колдонулсунбу?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Принтерге жеткиче документиңиз бир же андан көп серверлерден өтүшү мүмкүн."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Орнотулган бир дагы кызмат жок"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Эч бир принтер табылган жок"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Тууралоолор"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Толук ачкыч сөз жана өз ара мамиле"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Жөнөкөй сөздөн текстке"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Бул үн киргизүү кызматы сиздин атыңыздан ар дайым күйүк үн көзөмөлүн аткарып жана үн менен иштетилген колдонмолорду иштете алат. Ал <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> колдонмосунан келет. Бул кызматты иштетүүбү?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Кеп синтезаторунун жөндөөлөрү"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Текстти-оозекилөө"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Жөндөөлөрүм ар дайым колдонулсун"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Колдонмонун тууралоолору, абалкы орнотмолорду алмаштырат"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Демейки жөндөөлөр"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Абалкы жарак"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Айтылган текстке колдонула турган кеп синтезин коюу"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Кеп ылдамдыгы"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Текст айтылчу ылдамдык"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Негизги тон"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Айтылган тексттин тонуна таасирин тийгизет"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Тил"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Тутум тилин колдонуу"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Тил тандалган жок"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Айтылган текст боюнча тилге тиешелүү үндү коёт"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Үлгүнү угуу"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Кепти синтездөөнүн кыскача көргөзмөсүн ойнотуу"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Үн дайындарын орнотуу"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Кеп синтезине керектүү үн дайындарын орнотуңуз"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Кеп синтезине керектүү үндөр мурунтан эле орнотулган"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Жөндөөлөрүңүз өзгөрдү. Бул алардын добушунун үлгүсү."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Сиз тандаган шайман иштебейт."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигурациялоо"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Башка жарак тандоо"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Бул кепти синтездөө каражаты бардык айтыла турган текстти, анын ичинде сырсөздөр жана насыя карточкасынын номери сыяктуу жеке маалыматты, топтошу мүмкүн. Ал <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> каражатынан алынат. Бул кепти синтездөө каражаты колдонулсунбу?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Бул тилде текстти-оозекилөө үчүн иштеп турган интернет-байланыш керек."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Бул айтылганды синтездөөнүн мисалы"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Абалкы тилдин абалы"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> толук колдоого алынган"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> желеге туташууну талап кылат"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> колдоого алынган эмес"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Текшерүүдө..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Каражаттар"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> жөндөөлөрү"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> иштетилген"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> өчүрүлгөн"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Каражаттын жөндөөлөрү"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> жөндөөлөрдү"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Тилдер жана үндөр"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Орнотулду"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Орнотулган эмес"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Аял"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Эркек"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Кепти синтездөө каражаты орноду"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Колдоноордон мурун жаңы шайманды иштетиңиз."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Жарак тууралоолорун ачуу"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Тандалган жарак"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Жалпы"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Кубатты башкаруу"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi тууралоолорун жаңыртуу"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth жөндөөсү жаңыртылууда"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Фондогу колдонмолорго Колдонмо Жооп Бербейт деп көрсөтүү"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Тышкы сактагычка сактоого уруксат берүү"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Манифест маанилерине карабастан бардык колдонмолорду тышкы сактагычка сактоого уруксат берет"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Аракеттердин өлчөмүн өзгөртүүнү мажбурлоо"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Манифест маанилерине карабастан бардык аракеттерди мульти-терезеге өлчөмү өзгөртүлгүдөй кылат."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Дайындарды колдонуу"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Колдонмонун дайындарынын пайдаланылышы"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкучтар гана"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Тымтырс"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Визуалдык үзгүлтүктөр"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Телефондун рингтону"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Эскертменин демейки шыңгыры"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Чалуулар үчүн дагы дирилдесин"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Түзмөгүңүз кулпуланып турганда, эскертмелер кандай болуп көрүнсүн?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Эскертмелер"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Колдонмо эскертмелери"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Тема боюнча эскертмелер"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Башка үндөр"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тергич үндөрү"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Экранды кулпулоо үндөрү"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Бул колдонмодо эскертмелер эч качан көрсөтүлбөсүн"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Артыкчылыктуу катары мамиле кылуу"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Тынчымды алба режими Артыкчылыктууларга гана коюлганда бул колдонмонун эскертмелери угулушуна уруксат берүү"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Көз жүгүртүүгө уруксат берүү"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Бул колдонмо белгилүү бир эскертмелерди учурдагы экранга көз ирмемге чыгаруу менен, аларды баса белгилөөсүнө уруксат бериңиз"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Тынчымды албаны өзгөртүп коюу"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Бул эскертмелер Тынчымды алба режими Приоритет гана деген абалда турганда деле пайда болсун"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Сыпайы мазмунду жашыруу"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Түзмөк кулпуланган учурда, бул колдонмонун эскертмелериндеги купуя маалыматты ачыкка чыгара турган мазмунду жашыруу"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Түзмөк кулпуланып турганда жеке маалыматты камтыган эскертмелердин мазмунун жашыруу"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Бөгөттөлгөн"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Маанилүүлүгү"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Сезимтал"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> чейин \"Ойготкучтар гана\" режимин иштетүү"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Үзгүлтүксүз экран"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"\"Тынчымды албагыла\" режиминде эскертмелер тууралуу маалымат экранда көрүнбөйт"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Эскертме жарыгы жок"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"\"Тынчымды албагыла\" режиминде бөгөттөлгөн эскертмелер алынганда жарык индикатору өчүп-күйбөйт."</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Колдонмо эскертмелери"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Бошотуудан мурун PIN суралсын"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Бошотуудан мурун сырсөз суралсын"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Бошотулганда түзмөк кулпулансын"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Жумуш профили"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бул жумуш профилин төмөнкү башкарат:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Төмөнкү башкарат <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Сынамык)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Эскертмелер"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Орточо"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Бөгөттөө"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Астейдил дайындар жашырылган"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Артыкчылыктуу"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Кыска эскертмелерсиз"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Жумуш"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Бөгөттөлдү"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Артыкчылыктуу"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Астейдил дайындар жашырылган"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Кыска эскертмелерсиз"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домен URL\'дери менен"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Администратор тарабынан өчүрүлгөн"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Колдонмолорду конфигурациялоо"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Колдонмо уруксаттары"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> колдонмого кошумча уруксат бар"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> колдонмого уруксат бар"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Сүрөт түсү режими"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB колдонуңуз"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Дисплей шкаласы"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"дисплей тыгыздыгын чоңойтуп көрсөтүү шкаласынын бөлүштүрүү"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Кичине"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Орточо"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Чоң"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Чоңураак"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Эң чоң"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Ыңгайлаштырылган (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Бардыгын көрүү"</string>
+    <string name="see_less" msgid="1250265310929558370">"Азыраак көрүү"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Ажыратылды"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> дайындар колдонулду"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмо орнотулду"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> ичинен <xliff:g id="SIZE1">%1$s</xliff:g> колдонулду"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Ыңгайлуу жарыктык КҮЙГҮЗҮЛГӨН"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Ыңгайлуу жарыктык ӨЧҮРҮЛГӨН"</string>
 </resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index 732726c..a546505 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ຂະໜາດໃຫຍ່"</item>
     <item msgid="7786168277516233536">"ຂະໜາດໃຫຍ່ໂຕ"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ຊ້າຫຼາຍ"</item>
-    <item msgid="2361722960903353554">"ຊ້າ"</item>
-    <item msgid="1145554631248513562">"ປົກກະຕິ"</item>
-    <item msgid="7553665153391107454">"ໄວ"</item>
-    <item msgid="1370673569131070146">"ໄວຂຶ້ນ"</item>
-    <item msgid="4648206845228970803">"ໄວຫຼາຍ"</item>
-    <item msgid="4977949754169483251">"ໄວຫຼາຍຂຶ້ນອີກ"</item>
-    <item msgid="6106302964845503577">"ໄວສຸດໆ"</item>
-    <item msgid="6800277205640837264">"ໄວທີ່ສຸດ"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ຕ່ຳຫຼາຍ"</item>
-    <item msgid="2692137425242433765">"ຕ່ຳ"</item>
-    <item msgid="3332408460740717754">"ປົກກະຕິ"</item>
-    <item msgid="4907380534957572531">"ສູງ"</item>
-    <item msgid="4699640516390840297">"ສູງຫຼາຍ"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"ກຳລັງສະແກນ..."</item>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 1c6d1d6..5479cc9 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ລະ​ຫັດ​ຜ່ານ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ລາຍນີ້ວ​ມື"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ຈັດ​ການ​ລາຍ​ນີ້ວ​ມື"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ໃຊ້​ລາຍ​ນີ້ວ​ມື​ສຳ​ລັບ"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ບໍ່ຫຼິ້ນສຽງເມື່ອສຽບ ຫຼືຖອດແທັບເລັດອອກຈາກບ່ອນຕັ້ງສາກ"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ບໍ່ຫຼິ້ນສຽງເມື່ອສຽບ ຫຼືຖອດໂທລະສັບອອກຈາກບ່ອນຕັ້ງສາກ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ບັນຊີ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"​ສ່ວນ​ໂຕ"</string>
-    <string name="category_work" msgid="8699184680584175622">"​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ບັນ​ຊີ​ໂປ​ຣ​ໄຟ​ລ໌​ວຽກ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ບັນ​ຊີ​ໂປ​ຣ​ໄຟ​ລ໌​ສ່ວນ​ຕົວ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ບັນ​ຊີ​ບ່ອນເຮັດວຽກ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ປິດໃຊ້ງານແລ້ວ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ເປີດຕະຫຼອດ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ອັດຕະໂນມັດ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ປ່ຽນ​ເປັນ​ການ​ເຂົ້າ​ລະ​ຫັດ​ໄຟ​ລ໌"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ປ່ຽນ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ໄຟ​ລ໌​ເຂົ້າ​ລະ​ຫັດ​ຮຽບ​ຮ້ອຍ​ແລ້ວ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ກຳລັງປ່ຽນເປັນການເຂົ້າລະຫັດແບບອີງໃສ່ໄຟລ໌"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ປ່ຽນການແບ່ງສ່ວນຂໍ້ມູນເປັນການເຂົ້າລະຫັດແບບອີງໃສ່ໄຟລ໌.\n !!ຄຳເຕືອນ!! ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຂອງທ່ານ.\n ຄຸນສົມບັດນີ້ແມ່ນຢູ່ໃນຂັ້ນທົດລອງ alpha ແລະອາດຈະເຮັດວຽກໄດ້ບໍ່ຖືກຕ້ອງດີເທື່ອ.\n ກົດ \'ລຶບ ແລະ ປ່ຽນ...\' ເພື່ອດຳເນີນການຕໍ່."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ລຶບ ແລະປ່ຽນ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ເວລາປິດໜ້າຈໍ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"​ປິດ​ໜ້າ​ຈໍ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ການຕັ້ງຄ່າ"</string>
     <string name="print_settings" msgid="4742428530112487843">"ການ​ພິມ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ບໍລິການພິມ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ເອກະສານຂອງທ່ານອາດຜ່ານນຶ່ງ ຫຼືຫຼາຍກວ່ານຶ່ງເຊີບເວີເພື່ອໄປໃຫ້ຮອດເຄື່ອງພິມ."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ບໍ່ມີບໍລິການຖືກຕິດຕັ້ງເທື່ອ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ບໍ່ພົບເຄື່ອງພິມ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ການຕັ້ງຄ່າ"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"ຄຳ​ສັ່ງ​ສຽງ​ເຕັມ​ຮູບ​​ແບບ ແລະ​ການ​​ໂຕ້​ຕອບ"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"​ການ​ແປງ​ສຽງ​ເປັນ​ຂໍ້​ຄວາມ​ແບບ​ງ່າຍໆ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ບໍ​ລິ​ການ​ປ້ອນ​ຂໍ້​ມູນ​ດ້ວຍ​ສຽງ​ນີ້​ຈະ​​ສາ​ມາດກວດ​ສອບ​ສຽງ​ຕະຫຼອດ​ເວ​ລາ ແລະ​ຄວບ​ຄຸມ​ແອັບ​ພລິ​ເຄ​ຊັນ​ທີ່​ເປີດ​ນຳ​ໃຊ້​ສຽງ​ແທນ​ທ່ານ​ໄດ້. ມັນ​ມາ​ຈາກ​ແອັບ​ພລິ​ເຄ​ຊັນ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. ທ່ານ​ຕ້ອງ​ການ​ເປີດ​ໃຊ້​ບໍ​ລິ​ການ​ນີ້ບໍ່"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ການຕັ້ງຄ່າການປ່ຽນຂໍ້ຄວາມເປັນສຽງເວົ້າ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"ການປ່ຽນຂໍ້ຄວາມເປັນສຽງ"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ໃຊ້ການຕັ້ງຄ່າຂອງຂ້ອຍສະເໝີ"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ການຕັ້ງຄ່າເລີ່ມຕົ້ນດ້ານລຸ່ມ ຈະຖືກໃຊ້ແທນທີ່ການຕັ້ງຄ່າຂອງແອັບຯ"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ລະບົບເລີ່ມຕົ້ນ"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ເລືອກລະບົບການສັງເຄາະສຽງເວົ້າເພື່ອໃຊ້ໃນການອ່ານຂໍ້ຄວາມ"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"ອັດຕາການເວົ້າ"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ຄວາມໄວໃນການເວົ້າຂໍ້ຄວາມ"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ໂທນສຽງ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ມີຜົນກັບໂທນຂອງສຽງທີ່ເວົ້າອອກໄປ"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ພາສາ"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"​ໃຊ້​ພາ​ສາ​ຂອງ​ລະ​ບົບ"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ບໍ່ໄດ້ເລືອກພາສາ"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ຕັ້ງຄ່າສຽງໃນພາສາທີ່ລະບຸສຳລັບຂໍ້ຄວາມທີ່ເວົ້າ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ຟັງຕົວຢ່າງ"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"ສະແດງການສາທິດສັ້ນໆກ່ຽວກັບການສັງເຄາະສຽງ"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ຕິດຕັ້ງຂໍ້ມູນສຽງ"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ຕິດຕັ້ງຂໍ້ມູນສຽງທີ່ຕ້ອງໃຊ້ສຳລັບການວິເຄາະສຽງ"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ສຽງທີ່ຈຳເປັນຕ້ອງໃຊ້ສຳລັບການສັງເຄາະສຽງເວົ້າ ຖືກຕິດຕັ້ງຮຽບຮ້ອຍຢູ່ກ່ອນແລ້ວ"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ການຕັ້ງຄ່າຂອງທ່ານຖືກປ່ຽນແລ້ວ. ນີ້ຄືຕົວຢ່າງສຽງ."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"ລະບົບທີ່ທ່ານເລືອກບໍ່ສາມາດເຮັດວຽກໄດ້."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ປັບແຕ່ງຄ່າ"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ເລືອກລະບົບອື່ນ"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ລະບົບການສັງເຄາະສຽງນີ້ ອາດເກັບກຳຂໍ້ຄວາມທຸກຢ່າງທີ່ຖືກປ່ຽນເປັນສຽງເວົ້າ ຮວມທັງຂໍ້ມູນສ່ວນໂຕເຊັ່ນ: ລະຫັດຜ່ານ ແລະໝາຍເລກບັດເຄຣດິດນຳ. ມັນມາຈາກລະບົບ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ເປີດການນຳໃຊ້ລະບົບສັງເຄາະສຽງໂຕນີ້ບໍ່?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ພາສານີ້ຕ້ອງໃຊ້ການເຊື່ອມຕໍ່ອິນເຕີເນັດ ເພື່ອການປ່ຽນຂໍ້ຄວາມເປັນສຽງເວົ້າ."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ນີ້ແມ່ນຕົວຢ່າງການສັງເຄາະສຽງ"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ສະຖານະພາສາເລີ່ມຕົ້ນ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"ຮອງຮັບ <xliff:g id="LOCALE">%1$s</xliff:g> ເຕັມຮູບແບບ"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ຕ້ອງການການເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"ບໍ່ຮອງຮັບ <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"ກຳລັງກວດສອບ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"ລະບົບ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"ການຕັ້ງຄ່າ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ຖືກເປີດໃຊ້ແລ້ວ"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ຖືກປິດໄວ້"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"ການຄັ້ງຄ່າລະບົບ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"ການຕັ້ງຄ່າສຳລັບ <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ພາສາ ແລະສຽງ"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ຕິດຕັ້ງແລ້ວ"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ບໍ່​ໄດ້​ຕິດ​ຕັ້ງເທື່ອ"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ຜູ່ຍິງ"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ຜູ່ຊາຍ"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"ຕິດຕັ້ງລະບົບສັງເຄາະສຽງເວົ້າແລ້ວ"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ເປີດໃຊ້ລະບົບໃໝ່ກ່ອນການນຳໃຊ້."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ເປີດການຕັ້ງຄ່າລະບົບສະເຄາະສຽງ"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ລະບົບທີ່ຕ້ອງການ"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ທົ່ວໄປ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ການຄວບຄຸມພະລັງງານ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"ກຳລັງອັບເດດການຕັ້ງຄ່າ Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ກຳລັງອັບເດດການຕັ້ງຄ່າ Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ສະແດງໜ້າຈໍແອັບຯທີ່ບໍ່ຕອບສະໜອງສຳລັບແອັບຯພື້ນຫຼັງ"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"ບັງຄັບອະນຸຍາດແອັບ​ຢູ່​ພາຍນອກ"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ເຮັດ​ໃຫ້ທຸກແອັບ​ມີ​ສິດ​ໄດ້ຮັບການຂຽນ​ໃສ່​ບ່ອນ​ຈັດ​ເກັບ​ພາຍນອກ, ໂດຍ​ບໍ່​ຄຳ​ນຶງ​ເຖິງ​ຄ່າ​ທີ່​ຈະ​ແຈ້ງ"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"ບັງ​ຄັງ​ໃຫ້​ກິດ​ຈະ​ກຳ​ປ່ຽນ​ຂະ​ໜາດ​ໄດ້"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"ເຮັດ​ໃຫ້​ທຸກ​ກິດ​ຈະ​ກຳ​ປ່ຽນ​ຂະ​ໜາດ​ໄດ້​ສຳ​ລັບ​ຫຼາຍ​ໜ້າ​ຕ່າງ, ໂດຍ​ບໍ່​ຄຳ​ນຶງ​ເຖິງ​ຄ່າ​ທີ່​ຈະ​ແຈ້ງ."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ການ​ນຳ​ໃຊ້​ຂໍ້​ມູນ​ແອັບຯ"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"​ການ​ນັບ​ຈ​ຳ​ນວນ​ຂໍ້​ມູນ​ທີ່​ໃຊ້​ຂອງ​ຜູ່​ໃຫ້​ບໍ​ລິ​ການ​ອາດ​ແຕກ​ຕ່າງ​ຈາກ​​ທີ່ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານນັບ"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ຄວາມງຽບ​ທັງ​ໝົດ"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ການຂັດຈັງຫວະດ້ານຮູບພາບ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"​ຣິງ​ໂທນ​ແຈ້ງ​ເຕືອນ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ສັ່ນ​ເຕືອນ​ເມື່ອ​ມີ​ການ​ໂທ​ເຂົ້າ"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"​ທ່ານ​ຕ້ອງ​ການ​ໃຫ້​ສະ​ແດງ​​ການ​ແຈ້ງ​ເຕືອນ​ແນວ​ໃດ​ໃນ​ເວ​ລາ​ທີ່​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ການແຈ້ງເຕືອນ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"​ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"ການ​ແຈ້ງ​ເຕືອນ​ຫົວ​ຂໍ້"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ສຽງ​ອື່ນໆ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ສຽງ​ປຸ່ມ​ກົດ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"​ສຽງ​ລັອກ​ໜ້າ​ຈໍ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ບ​ລັອກ​ທັງ​ໝົດ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ບໍ່​ຕ້ອງ​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ​ຈາກ​ແອັບຯ​ນີ້"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ປະ​ຕິ​ບັດ​ເປັນ​ບຸ​ລິ​ມະ​ສິດ"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"ປ່ອຍ​ໃຫ້​ການ​ແຈ້ງ​ເຕືອນ​ຂອງ​ແອັບ​ນີ້​ໃຫ້​ໄດ້​ຍິນ ເມື່ອ​ຫ້າມ​ລົບ​ກວນ​ຖືກ​ຕັ້ງ​ເປັນ​ບຸ​ລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ອະ​ນຸ​ຍາດ​ການ​ລັກ​ເບິ່ງ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ປ່ອຍ​ໃຫ້​ແອັບ​ນີ້​ເນັ້ນ​ໜັກ​ການ​ແຈ້ງ​ເຕືອນ​ສະ​ເພາະ​ໂດຍ​ການ​ເລື່ອນ​ພວກ​ມັນ​ໄວໆ​ໄປ​ໃສ່​ມຸມມອງ​ຢູ່​ໜ້າ​ຈໍ​ປະ​ຈຸ​ບັນ"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ຍົກເລີກຫ້າມລົບກວນ"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ອະນຸຍາດ​ໃຫ້ການ​ແຈ້ງ​ເຕືອນ​​ເຫຼົ່າ​ນີ້​ສືບ​ຕໍ່​ຂັດ​ຈັງຫວະ ​ເມື່ອຄຸນສົມບັດ ຫ້າມ​ລົບ​ກວນ ຖືກ​ຕັ້ງ​ເປັນແບບບຸລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ເຊື່ອງ​ເນື້ອ​ໃນ​ລະ​ອຽດ​ອ່ອນ"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"ເມື່ອ​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ, ເຊື່ອງ​ເນື້ອ​ໃນ​ຢູ່​ໃນການ​ແຈ້ງ​ເຕືອນ​ຂອງ​ແອັບ​ນີ້ ທີ່​ອາດ​ຈະ​ເປີດ​ເຜີຍ​ຂໍ້​ມູນ​ສ່ວນ​ຕົວ"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"​ເມື່ອ​ອຸປະກອນ​ຖືກ​ລັອກ​​ໄວ້, ​ໃຫ້ເຊື່ອງ​ເນື້ອ​ຫາ​ໃນ​ການ​ແຈ້ງ​ເຕືອນ​ເຫຼົ່າ​ນີ້​ທີ່​ອາດ​​ເປີດ​ເຜີຍ​ຂໍ້​ມູນ​ສ່ວນ​ຕົວ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ບລັອກ​ແລ້ວ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ລະດັບຄວາມສຳຄັນ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"​ລະ​ອຽດ​​ອ່ອນ"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ປ່ຽນ​ເປັນ​ໂມງ​ປຸກ​ເທົ່າ​ນັ້ນຈົນ​ຮອດ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ປ່ຽນ​ເປັນ​ຂັດ​ຈັງ​ຫວະ​ທຸກ​ຄັ້ງ"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ບໍ່ມີການຂັດຈັງຫວະໜ້າຈໍ"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ເຮັດໃຫ້ມິດງຽບໂດຍ ຢ່າລົບກວນ ບໍ່ໃຫ້ສະແດງ ຫຼືປາກົດຂຶ້ນເທິງໜ້າຈໍປະຈຸບັນ"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"ບໍ່ມີໄຟແຈ້ງເຕືອນ"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ເຮັດໃຫ້ມິດງຽບໂດຍ ຢ່າລົບກວນ ບໍ່ໃຫ້ມີໄຟສັນຍານກະພິບ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ສົ່ງ​ຄຳ​ຕິ​ຊົມ​ກ່ຽວ​ກັບ​ອຸ​ປະ​ກອນ​ນີ້"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"​ຖາມ​ຫາ PIN ກ່ອນ​ຍົກ​ເລີກ​ການປັກ​ໝຸດ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"​ຖາມ​ຫາ​ລະ​ຫັດ​ຜ່ານ​ກ່ອນ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ລັອກ​ອຸ​ປະ​ກອນ​ເມື່ອ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ໂປຣໄຟລບ່ອນເຮັດວຽກນີ້ຖືກຈັດການໂດຍ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"ຈັດ​ການ​ໂດຍ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ທົດ​ລອງ)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"ການແຈ້ງເຕືອນ"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ປົກ​ກ​ະ​ຕິ"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"ບລັອກ"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"ເຊື່ອງ​ເນື້ອ​ໃນ​ລະ​ອຽດ​ອ່ອນໄວ​ແລ້ວ"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ບູ​ລິ​ມະ​ສິດ"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"ຫ້າມ​ລັກ​ເບິ່ງ"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"​ສ່ວນ​ໂຕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ວຽກ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ບລັອກ​ແລ້ວ"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ບູ​ລິ​ມະ​ສິດ"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"ເຊື່ອງ​ເນື້ອ​ໃນ​ລະ​ອຽດ​ອ່ອນໄວ​ແລ້ວ"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"ຫ້າມ​ລັກ​ເບິ່ງ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ກັບ URL ໂດ​ເມນ"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ຖືກ​ປິດ​ການ​ນຳ​ໃຊ້​ໂດຍ​ຄວບ​ຄຸມ​ລະ​ບົບ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ກຳນົດຄ່າແອັບ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ເລືອກ​ໂປ​ຣ​ໄຟ​ລ໌"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ການ​ເຂົ້າ​ຫາ​ເພີ່ມ​ເຕີມ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ແລ້ວ"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ໂໝດ​ສີ​ຮູບ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"ໃຊ້ sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ສະ​ແດງ​ຂະ​ໜາດ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ສະ​ແດງ​ການ​ຂະ​ຫຍາຍ​ຂະ​ໜາດ​ການ​ຊູມ​ຄວາມ​ໜາ​ແໜ້ນ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ນ້ອຍ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ປົກ​ກ​ະ​ຕິ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ໃຫຍ່"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ໃຫຍ່ກວ່າ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ໃຫຍ່​ທີ່​ສຸດ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ປັບ​ແ​ຕ່ງ​ເອງ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"ເບິ່ງ​ທັງ​ໝົດ"</string>
+    <string name="see_less" msgid="1250265310929558370">"​​ເບິ່ງ​ໜ້ອຍ​ລົງ"</string>
+    <string name="disconnected" msgid="5787956818111197212">"​ຕັດ​ການ​ເຊື່ອມ​ຕໍ່​ແລ້ວ"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"ໃຊ້ຂໍ້ມູນໄປແລ້ວ <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"ຕິດຕັ້ງ <xliff:g id="COUNT">%1$d</xliff:g> ແອັບຯແລ້ວ"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"ໃຊ້ໄປແລ້ວ <xliff:g id="SIZE1">%1$s</xliff:g> ຈາກທັງໝົດ <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"ການປັບຄວາມແຈ້ງອັດຕະໂນມັດ ເປີດ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"ການປັບຄວາມແຈ້ງອັດຕະໂນມັດ ປິດ"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d623b4b..6f20509 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Didelis"</item>
     <item msgid="7786168277516233536">"Didžiausias"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Labai lėtas"</item>
-    <item msgid="2361722960903353554">"Lėtas"</item>
-    <item msgid="1145554631248513562">"Įprastas"</item>
-    <item msgid="7553665153391107454">"Greitas"</item>
-    <item msgid="1370673569131070146">"Greitesnis"</item>
-    <item msgid="4648206845228970803">"Labai greitas"</item>
-    <item msgid="4977949754169483251">"Spartus"</item>
-    <item msgid="6106302964845503577">"Labai spartus"</item>
-    <item msgid="6800277205640837264">"Greičiausias"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Visiškai senka"</item>
-    <item msgid="2692137425242433765">"Žemas"</item>
-    <item msgid="3332408460740717754">"Įprastas"</item>
-    <item msgid="4907380534957572531">"Aukšta"</item>
-    <item msgid="4699640516390840297">"Labai aukštas"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Nuskaitoma..."</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index acb1dd2..f5e8606 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Išjungė administratorius"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kontr. kodo jutiklis"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kontrolin. kodų tvark."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Kontrolinių kodų naud."</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Nepaleisti garso įdedant planšetinį kompiuterį į doką ar jį pašalinant"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nepaleisti garso įterpiant ar pašalinant telefoną iš dėklo"</string>
     <string name="account_settings" msgid="6403589284618783461">"Paskyros"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Asmeninės"</string>
-    <string name="category_work" msgid="8699184680584175622">"Darbo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Darbo profilio paskyros – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Asmeninio profilio paskyros"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Darbo paskyra – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Išjungta"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Visada įjungta"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatinė"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertuoti į failų šifruotę"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertuoti…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Jau konvertuota į failų šifruotę"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Konvertuojama į failais pagrįstą šifruotę"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Duomenų skaidinys bus konvertuotas į failais pagrįstą šifruotę.\n Įspėjimas! Visi duomenys bus ištrinti.\n Ši funkcija yra alfa versijos ir gali netinkamai veikti.\n Paspauskite „Išvalyti ir konvertuoti...“, kad galėtumėte tęsti."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Išvalyti ir konvertuoti…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</string>
     <string name="print_settings" msgid="4742428530112487843">"Spausdinimas"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Spausdinimo paslaugos"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Siunčiant į spausdintuvą dokumentas gali būti perduodamas per kelis serverius."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nėra įdiegta jokių paslaugų"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nerasta jokių spausdintuvų"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nustatymai"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Visas aktyvinamasis žodis ir sąveika"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Paprasta kalbos keitimo į tekstą funkcija"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ši įvesties balsu paslauga galės visada stebėti balsu vykdomus veiksmus ir valdyti balsu įgalintas programas jūsų vardu. Ji teikiama iš programos <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Įgalinti šios paslaugos naudojimą?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"„Teksto į kalbą“ nustatymai"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"„Teksto į kalbą“ išvestis"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Visada naudoti mano nustatymus"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Toliau pateikti numatytieji nustatymai atšaukia programos nustatymus"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Numatytieji nustatymai"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Numatytasis variklis"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nustatykite kalbos sintezės variklį, kuris bus naudojant sakant tekstą"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Kalbėjimo greitis"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Greitis, kuriuo sakomas tekstas"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Garso aukštis"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Daro poveikį sakomo teksto tonui"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Kalba"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Naudoti sistemos kalbą"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kalba nepasirinkta"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nustato konkrečiai kalbai būdingą sakomo teksto balsą"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Klausytis pavyzdžio"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Paleisti trumpą kalbos sintezės demonstraciją"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Įdiegti balso duomenis"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Įdiegti balso duomenis, reikalingus kalbos sintezei"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Balsai, reikalingi kalbos sintezei, jau tinkamai įdiegti"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Jūsų nustatymai pasikeitė. Tai pavyzdys, kaip jie turėtų skambėti."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Nepavyksta paleisti pasirinkto variklio."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigūruoti"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pasirinkite kitą variklį"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Šis kalbos sintezės variklis gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., kredito kortelės numerius, išskyrus slaptažodžius. Tai vyksta dėl variklio <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Įgalinti šio kalbos sintezės variklio naudojimą?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Pasirinkus šią kalbą, teksto vertimo kalba išvesčiai būtinas veikiantis tinklo ryšys."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Tai yra kalbos sintezės pavyzdys"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Numatytoji kalbos būsena"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> visiškai palaikoma"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> būtinas tinklo ryšys"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nepalaikoma"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Tikrinama..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Varikliai"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> nustatymai"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> įgalinta"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> išjungta"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Variklio nustatymai"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"„<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>“ nustatymai"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Kalbos ir balsai"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Įdiegta"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Neįdiegta"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Moteris"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Vyras"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Kalbos sintezės variklis įdiegtas"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Prieš naud. įgal. nauj. varik."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Paleisti variklio nustatymus"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Pageidaujamas variklis"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Bendra"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Maitinimo valdymas"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atnaujinamas „Wi-Fi“ nustatymas"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atnaujinamas „Bluetooth“ nustatymas"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Fon. programose rodyti dialogo langą „Neatsako“"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Priverstinai leisti programas išorinėje atmintin."</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Vis. pr. gal. įr. į vid. saug. nepais. apr. vert."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Priv. nust., kad veiksm. b. g. atl. kelių d. lang."</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Nustatoma, kad visus veiksmus būtų galima atlikti kelių dydžių languose, nepaisant aprašo verčių."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programos duomenų naud."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatoriaus duomenų apskaita gali skirtis nuo jūsų įrenginio apskaitos."</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tik įspėjimai"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Visiška tyla"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vaizdinė pertrauktis"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Numatytasis pranešimo skambėjimo tonas"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Taip pat vibruoti, kai skamb."</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kaip norite matyti pranešimus, kai įrenginys bus užrakintas?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Pranešimai"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Temų pranešimai"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Kiti garsai"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Skambinimo skydelio tonai"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekrano užrakinimo garsai"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Niekada nerodyti iš šios programos gautų pranešimų"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Laikyti prioritetiniais"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Leisti pateikti programos pranešimus, kai funkcija „Netrukdyti“ nustatyta į „Tik prioritetiniai įvykiai“"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Leisti sparčiai peržiūrėti"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Leisti programai akcentuoti konkrečius pranešimus, trumpai nuslenkant juos į rodinį dabartiniame ekrane"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nepaisyti netrukdymo režimo"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Leisti ir toliau teikti šiuos pranešimus, kai netrukdymo režimas nustatytas į „Tik prioritetiniai“"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Slėpti neskelbtiną turinį"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Kai įrenginys užrakintas, slėpti turinį šios programos pranešimuose, kuriuose gali būti atskleidžiama privati informacija"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kai įrenginys užrakintas, slėpti šių pranešimų turinį, kuris galėtų atskleisti privačią informaciją"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Užblokuotas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritetas"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikatus"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Pakeisti tik į signalus iki <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pakeisti į pertraukimo nustatymą visam laikui"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Nėra jokių ekr. pertr."</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Neleisti, kad gavus praneš., nutildytų naud. rež. „Netrukdyti“, jie būtų rodomi dabart. ekrane"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Nėra praneš. lemp."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Neleisti, kad lemputė pulsuotų gavus praneš., nutildytų naud. rež. „Netrukdyti“"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Prašyti PIN kodo prieš atsegant"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Prašyti slaptažodžio prieš atsegant"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Užrakinti įrenginį atsegant"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Darbo profilis"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Šį darbo profilį tvarko:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Tvarkoma naudojant „<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>“"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentinis)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Informaciniai pranešimai"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Įprastas"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Užblokuota"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Neskelbtinas turinys paslėptas"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritetiniai"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Nežiūrėti"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Asmeninės"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Darbas"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Užblokuoti"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetiniai"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Neskelbtinas turinys paslėptas"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Nežiūrėti"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Su domeno URL"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Išjungė administratorius"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Programų konfigūravimas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profilio pasirinkimas"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Programos leidimai"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Leidžiama papildoma programų prieiga: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Leidžiama programų: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2980,4 +2929,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Nuotraukos spalvos režimas"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Naudoti sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Ekrano mastelis"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekrano tankis mastelio keitimas mastelis mastelio nustatymas"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mažas"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Įprastas"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Didelis"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Didesnis"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Didžiausias"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Tinkintas (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Žr. viską"</string>
+    <string name="see_less" msgid="1250265310929558370">"Žr. mažiau"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Atsijungta"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Panaudota duomenų: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Įdiegtų programų: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Panaudota: <xliff:g id="SIZE1">%1$s</xliff:g> iš <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Prisitaikantis šviesumas yra ĮJUNGTAS"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Prisitaikantis šviesumas yra IŠJUNGTAS"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 3537484..f82ee01 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Liels"</item>
     <item msgid="7786168277516233536">"Milzīgs"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Ļoti lēni"</item>
-    <item msgid="2361722960903353554">"Lēni"</item>
-    <item msgid="1145554631248513562">"Normāli"</item>
-    <item msgid="7553665153391107454">"Ātri"</item>
-    <item msgid="1370673569131070146">"Ātrāk"</item>
-    <item msgid="4648206845228970803">"Ļoti ātri"</item>
-    <item msgid="4977949754169483251">"Raiti"</item>
-    <item msgid="6106302964845503577">"Ļoti raiti"</item>
-    <item msgid="6800277205640837264">"Visātrāk"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Ļoti zems"</item>
-    <item msgid="2692137425242433765">"Zema"</item>
-    <item msgid="3332408460740717754">"Normāls"</item>
-    <item msgid="4907380534957572531">"Augsta"</item>
-    <item msgid="4699640516390840297">"Ļoti augsts"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Notiek skenēšana..."</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9ae4165a..112b4a1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -314,6 +314,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Atspējojis administrators"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Pirkstu nospiedumi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Nospiedumu pārvaldība"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nospieduma lietošana"</string>
@@ -819,8 +820,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Neatskaņot skaņu, ievietojot planšetdatoru dokā vai noņemot to no doka"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Neatskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Privāts"</string>
-    <string name="category_work" msgid="8699184680584175622">"Darba"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Darba profila konti — <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personīgā profila konti"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Darba konts — <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +842,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Atspējots"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vienmēr ieslēgts"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automātiski"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pārvērst par failu šifrējumu"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pārvērst…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Jau šifrēts failu līmenī"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Pārvēršana par failu līmeņa šifrējumu"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Pārvērtiet datu sadalījumu par failu līmeņa šifrējumu.\n Brīdinājums! Tiks dzēsti visi jūsu dati.\n Šī funkcija ir alfa izstrādes stadijā un var nedarboties, kā paredzēts.\n Lai turpinātu, nospiediet pogu “Dzēst un pārvērst…”"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Dzēst un pārvērst…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -1711,8 +1716,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drukāšana"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Drukāšanas pakalpojumi"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokuments, iespējams, tiek pārsūtīts caur vienu vai vairākiem serveriem, līdz tas nonāk līdz printerim."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nav instalēts neviens pakalpojums"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nav atrasts neviens printeris."</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Iestatījumi"</string>
@@ -1893,54 +1896,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Pilna īsinājumvārdu un mijiedarbības funkcionalitāte"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Vienkārša runas pārvēršana tekstā"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Šis balss ievades pakalpojums varēs jūsu vietā nepārtraukti veikt balss pārraudzību un pārvaldīt lietojumprogrammas, kurās iespējota balss ievade. Tas ir saistīts ar lietojumprogrammu <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vai iespējot šo pakalpojumu?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Teksta-runas iestatījumi"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Teksta-runas izvade"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vienmēr lietot manus iestatījumus"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Noklusējuma iestatījumiem tālāk ir augstāka prioritāte nekā lietotnes iestatījumiem"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Noklusējuma iestatījumi"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Noklusējuma programma"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Iestatiet runas sintēzes programmu, kas jāizmanto runātajam tekstam."</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Runas ātrums"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Teksta ierunāšanas ātrums"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonis"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ietekmē ierunātā teksta toni"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Valoda"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Izmantot sistēmas valodu"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nav atlasīta valoda."</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Runātajam tekstam iestata valodai raksturīgu balsi"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Noklausīties piemēru"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Atskaņot īsu runas sintēzes demonstrāciju"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalēt balss datus"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalēt runas sintēzei nepieciešamos balss datus"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Runas sintēzei nepieciešamās balsis jau ir pareizi instalētas."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Iestatījumi ir mainīti. Lūk, kā tie izklausās."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Izvēlēto programmu nevar palaist."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurēt"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izvēlēties citu programmu"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lietojot šo runas sintēzes programmu, var tikt apkopots viss ierunātais teksts, tostarp tāda personīgā informācija kā paroles un kredītkaršu numuri. Tā ir no <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> programmas. Vai iespējot šīs runas sintēzes programmas lietošanu?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Lai izmantotu teksta pārveidošanu runā šajā valodā, ir nepieciešams aktīvs tīkla savienojums."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Šis ir runas sintēzes piemērs."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Noklusējuma valodas statuss"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Lokalizācija <xliff:g id="LOCALE">%1$s</xliff:g> tiek pilnībā atbalstīta"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Lokalizācijai <xliff:g id="LOCALE">%1$s</xliff:g> nepieciešams tīkla savienojums."</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Lokalizācija <xliff:g id="LOCALE">%1$s</xliff:g> netiek atbalstīta"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Notiek pārbaude..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Programmas"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> iestatījumi"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ir iespējots"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ir atspējots"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Programmas iestatījumi"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Programmas <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> iestatījumi"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Valodas un balsis"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalēts"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nav instalēts"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Sieviete"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Vīrietis"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Runas sintēzes pr. ir instalēta"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Iespējojiet jauno programmu."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Programmas iestatījumu palaišana"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Vēlamā programma"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Vispārīgi"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Barošanas vadība"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi iestatījumu atjaunināšana"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth iestatījumu atjaunināšana"</string>
@@ -2181,10 +2136,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Rādīt fona lietotņu dialoglodz. Lietotne nereaģē"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Lietotņu piespiedu atļaušana ārējā krātuvē"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Ļauj jebkuru lietotni ierakstīt ārējā krātuvē neatkarīgi no manifesta vērtības."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Pielāgot darbības"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Pielāgo visas darbības vairāku logu režīmam neatkarīgi no vērtībām manifestā."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Lietotnes datu lietojums"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
@@ -2576,6 +2529,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tikai signāli"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Pilnīgs klusums"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizuāli pārtraukumi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Paziņojumu noklusējuma zvana signāls"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrācija zvaniem"</string>
@@ -2589,6 +2543,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kā rādīt ierīcē paziņojumus, kad tā ir bloķēta?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Paziņojumi"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Paziņojumi pēc tēmas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Citas skaņas"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Numura sastādīšanas tastatūras skaņas"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekrāna bloķēšanas skaņas"</string>
@@ -2617,12 +2572,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nekad nerādīt paziņojumus no šīs lietotnes"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Uzskatīt par prioritāti"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Atļaut skaņas paziņojumus no šīs lietotnes, ja statusam “Netraucēt” ir izvēlēts iestatījums “Tikai prioritārie”"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Atļaut ieskatus"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Atļaut šai lietotnei izcelt noteiktus paziņojumus, īslaicīgi parādot tos pašreizējā ekrāna skatā"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorēt režīmu “Netraucēt”"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ļaut šiem paziņojumiem pārtraukt arī turpmāk, ja režīms “Netraucēt” ir iestatīts uz “Tikai prioritārie”"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Paslēpt sensitīvu saturu"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Ja ierīce ir bloķēta, paslēpt šīs lietotnes paziņojumos ietverto saturu, kurā varētu būt atklāta privāta informācija"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Ja ierīce ir bloķēta, paslēpt šo paziņojumu saturu, kas varētu atklāt privātu informāciju"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloķēti"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritāte"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitīvi"</string>
@@ -2695,6 +2648,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Pāriet uz režīmu “Tikai signāli” līdz plkst. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Pāriet uz “Vienmēr pārtraukt”"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Bez pārtrauk. ekrānā"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Novērst tādu paziņojumu rādīšanu pašreizējā ekrānā, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Bez paz. indikatora"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Novērst gaismas mirgošanu paziņojumiem, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
@@ -2707,7 +2664,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Prasīt PIN kodu pirms atspraušanas"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pirms atspraušanas pieprasīt paroli"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloķēt ierīci, kad tiek veikta atspraušana"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Darba profils"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Šis darba profils tiek pārvaldīts, izmantojot:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pārvalda <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentāla)"</string>
@@ -2760,9 +2716,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Paziņojumi"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Parasti"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloķēti"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Sensitīvs saturs paslēpts"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritārie"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Bez ieskatiem"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2787,15 +2740,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Privātās"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Darba"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Ar bloķētiem paziņojumiem"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Ar prioritāriem paziņojumiem"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Sensitīvs saturs paslēpts"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Bez ieskatiem"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Ar domēnu URL"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Atspējojis administrators"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Lietotņu konfigurēšana"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profila izvēlēšanās"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Lietotnes atļaujas"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> lietotnēm no <xliff:g id="COUNT_1">%d</xliff:g> ir atļauta papildu piekļuve"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Atļautas <xliff:g id="COUNT_0">%d</xliff:g> lietotnes no <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2955,4 +2904,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Attēla krāsu režīms"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Izmantot sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Attēlojuma mērogs"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"attēlojums blīvums tālummaiņa mērogs mērogošana"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mazs"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Parasts"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Liels"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lielāks"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Vislielākais"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Pielāgots (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Skatīt visus"</string>
+    <string name="see_less" msgid="1250265310929558370">"Skatīt mazāk"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Atvienots"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Izmantoti <xliff:g id="AMOUNT">%1$s</xliff:g> datu"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Instalētas <xliff:g id="COUNT">%1$d</xliff:g> lietotnes"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Izmantots: <xliff:g id="SIZE1">%1$s</xliff:g> no <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Adaptīvais spilgtums ir IESLĒGTS"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Adaptīvais spilgtums ir IZSLĒGTS"</string>
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index b271718..2e293df 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Големи"</item>
     <item msgid="7786168277516233536">"Огромни"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Многу бавно"</item>
-    <item msgid="2361722960903353554">"Бавно"</item>
-    <item msgid="1145554631248513562">"Нормални"</item>
-    <item msgid="7553665153391107454">"Брзо"</item>
-    <item msgid="1370673569131070146">"Побрзо"</item>
-    <item msgid="4648206845228970803">"Многу брзо"</item>
-    <item msgid="4977949754169483251">"Брзо"</item>
-    <item msgid="6106302964845503577">"Многу брзо"</item>
-    <item msgid="6800277205640837264">"Најбрзо"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Многу ниска"</item>
-    <item msgid="2692137425242433765">"Ниска"</item>
-    <item msgid="3332408460740717754">"Нормални"</item>
-    <item msgid="4907380534957572531">"Висока"</item>
-    <item msgid="4699640516390840297">"Многу висока"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Скенирање..."</item>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 8cc559e..9dfad3f 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подеси „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подеси „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинки"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Оневозможено од администраторот"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечаток"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Управување отпечатоци"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Користи отпечатоци за"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не пуштај звук кога се вметнува или отстранува таблетот од полначот"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не пуштај звук кога се вметнува или отстранува телефонот од полначот"</string>
     <string name="account_settings" msgid="6403589284618783461">"Кориснички сметки"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Лични"</string>
-    <string name="category_work" msgid="8699184680584175622">"Работа"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Сметки со работен профил - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Сметки со личен профил"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Работна сметка - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Оневозможено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Секогаш вклучено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматски"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертирајте до шифрирање датотеки"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Конвертирај..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Датотеката е веќе шифрирана"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Конвертирајте до шифрирање на база на датотеки"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Конвертирајте ја партицијата со податоци до шифрирање на база на датотеки.\n !!Предупредување!! Тоа ќе ги избрише сите податоци.\n Функцијава е алфа и може да не работи правилно.\n Притиснете „Избриши и конвертирај... за да продолжите."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Избриши и конвертирај..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим на штедење"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранот се исклучува"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> на неактивност"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Подесувања"</string>
     <string name="print_settings" msgid="4742428530112487843">"Печатење"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуги за печатење"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Употреби <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Вашиот документ може да помине преку еден или повеќе сервери на својот пат до печатачот."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Нема инсталирано услуги"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Не се пронајдени печатачи"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Подесувања"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Целосна услуга – клучен збор и интеракција"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Едноставна услуга – говор во текст"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Услугата за гласовен запис ќе може да извршува постојан гласовен надзор и да ги контролира гласовно овозможените апликации во ваше име. Ова доаѓа од апликацијата <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Овозможете користење на услугата?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Подесувања на текст-во-говор"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Излез текст-во-говор"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Секогаш користи ги моите подесувања"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Стандардните подесувања подолу ги заменуваат подесувањата за апликации"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Стандардни подесувања"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Стандарден софтвер"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Поставете алатката за синтеза на говор да се користи за говорен текст"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Брзина на говор"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Брзина со која се кажува текстот"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Интензитет"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влијае на тонот на говорниот текст"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Јазик"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Користете системски јазик"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Јазикот не е избран"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Поставува глас специфичен за јазикот за говорниот текст"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Слушни пример"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Пушти краток приказ на синтеза на говор"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Инсталирај гласовни податоци"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Инсталирај ги гласовните податоци потребни за синтеза на говор"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Гласовите потребни за синтеза на говор се веќе правилно инсталирани"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Вашите подесувања се променија. Ова е пример за тоа како звучат."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Софтверот што го избравте не може да проработи."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигурирај"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Избери друг софтвер"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Овој софтвер за синтеза на говор може да го собере сиот текст што ќе се говори, вклучувајќи и лични податоци како што се лозинки и броеви на кредитни картички. Тоа го прави апликацијата <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Употреби го овој софтвер за синтеза на говор?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овој јазик е потребно поврување со мрежа што функционира на излез за текст-во-говор."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ова е пример на синтеза на говор"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Статус на стандарден јазик"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> е целосно поддржан"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> бара мрежно поврзување"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не е поддржано"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Се проверува..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Софтвери"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Подесувања на <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е овозможен"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е оневозможен"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Подесувања на софтвер"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Подесувања на <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Јазици и гласови"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Инсталиран"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Не е инсталиран"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Женски"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Машки"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Софтвер за синт. говор е инстал."</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Овозм. нов пребар. пред употр."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Стартувај подесувања на софтвер"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Претпочитан софтвер"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Општо"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контрола на напојување"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Се ажурира Wi-Fi подесување"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање подесување за Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Прикажи „Апл. не реагира“ за. апл. во заднина"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Принуд. дозволете апликации на надворешна меморија"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Запишува апл. во надв.меморија, незав. од манифест"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Принуди ги активностите да ја менуваат големината"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Ги прави сите активности да бидат со променлива големина за мултипрозорец, без разлика на вредностите на манифестот."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Користење податоци"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Корист. подат. на аплик."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Пресметувањето податоци на операторот може да се разликува од вашиот уред."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Целосна тишина"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Визуелни прекини"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодија на телефон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Станд. мелодија за известување"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрации и за повици"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Кога уредот е заклучен, како сакате да се прикажуваат известувањата?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Известувања"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Известувања за апликација"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Известувања по тема"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Други звуци"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонови на тастатура за бирање"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звуци на заклучување екран"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај ги сите"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никогаш не прикажувај известувања од оваа апликација"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Сметај како приоритет"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Дозволете да се слушнат известувањата на апликацијата кога како Приоритет е вклучено само „Не вознемирувај“"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволете ѕиркање"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволете апликацијата да истакне одредени известувања со тоа што со лизгање кратко ќе ги прикаже на тековниот екран"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отфрли го Не вознемирувај"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Оставете ги известувањава да продолжат да прекинуваат кога опцијата Не вознемирувај е поставена на Само приоритетни"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Сокриј чувствителна содржина"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Кога уредот е заклучен, сокриј ја содржината во известувањата на апликацијата кои може да откријат приватни информации"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Кога уредот е заклучен, сокријте ја содржината на известувањава којашто може да открие приватни информации"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Блокирана"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Приоритет"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Чувствителна"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Промена на аларми само до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Промени секогаш да се прекине"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Без прекини на екран"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Спречи ги известувањата стишени од „Не вознемирувај“ од ѕиркање или појавување на тековниот екран"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Без светло за извес."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Спречи ги известувањата стишени од „Не вознемирувај“ да предизвикуваат треперење на светлото"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известувања за апли."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Прашај за ПИН пред откачување"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Прашај за лозинка пред откачување"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заклучи го уредот при откачување"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Работен профил"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Овој работен профил е управуван од:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управувано од <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Известувања"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Нормално"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Блокирај"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Се крие чувствителна содржина"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Приоритет"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Без ѕиркање"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Службени"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирани"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Приоритетни"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Се крие чувствителна содржина"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Без ѕиркање"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Со УРЛ-домени"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Оневозможено од администраторот"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигурирање апликации"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Дозволи за апликацијата"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Дозволен е дополнителен пристап на <xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g> апликации"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволени се <xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g> апликации"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Режим на боја на слика"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Приказ на скала"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"прикажи го степенувањето на скалата за зумирање на густината"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Мала"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Нормална"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Голема"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Поголема"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Најголема"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Приспособено (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Види ги сите"</string>
+    <string name="see_less" msgid="1250265310929558370">"Види помалку"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Исклучено"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> од податоците се искористени"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> апликации се инсталирани"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Искористени се <xliff:g id="SIZE1">%1$s</xliff:g> од <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Приспособливата осветленост е вклучена"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Приспособливата осветленост е исклучена"</string>
 </resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index 37bd293..f691c3b 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"വലുത്"</item>
     <item msgid="7786168277516233536">"വളരെ വലുത്"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"വളരെ കുറഞ്ഞ വേഗത്തിൽ"</item>
-    <item msgid="2361722960903353554">"കുറഞ്ഞ വേഗത്തിൽ"</item>
-    <item msgid="1145554631248513562">"സാധാരണം"</item>
-    <item msgid="7553665153391107454">"വേഗത്തിൽ"</item>
-    <item msgid="1370673569131070146">"അതിവേഗം"</item>
-    <item msgid="4648206845228970803">"വേഗതയേറിയത്"</item>
-    <item msgid="4977949754169483251">"വേഗം"</item>
-    <item msgid="6106302964845503577">"വളരെ വേഗം"</item>
-    <item msgid="6800277205640837264">"ഏറ്റവും വേഗതയുള്ളത്"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"വളരെ കുറഞ്ഞത്"</item>
-    <item msgid="2692137425242433765">"കുറഞ്ഞത്"</item>
-    <item msgid="3332408460740717754">"സാധാരണം"</item>
-    <item msgid="4907380534957572531">"ഉയർന്നത്"</item>
-    <item msgid="4699640516390840297">"വളരെ ഉയർന്നത്"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"സ്‌കാൻചെയ്യുന്നു..."</item>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 1783c8d..2dc8245 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"പാ‌സ്‌വേഡുകൾ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"അഡ്‌മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"വിരലടയാളം"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"വിരലടയാളങ്ങൾ നിയന്ത്രിക്കുക"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ഇതിനായി വിരലടയാളം ഉപയോഗിക്കുക"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ഡോക്കിൽ ടാബ്‌ലെറ്റ് ചേർക്കുമ്പോഴോ അതിൽ നിന്ന് നീക്കംചെയ്യുമ്പോഴോ ശബ്‌ദം പ്ലേ ചെയ്യരുത്"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ഡോക്കിൽ ഫോൺ ചേർക്കുമ്പോഴോ അതിൽ നിന്ന് നീക്കംചെയ്യുമ്പോഴോ ശബ്‌ദം പ്ലേ ചെയ്യരുത്"</string>
     <string name="account_settings" msgid="6403589284618783461">"അക്കൗണ്ടുകൾ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"വ്യക്തിഗതം"</string>
-    <string name="category_work" msgid="8699184680584175622">"ഔദ്യോഗികം"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ഔദ്യോഗിക പ്രൊഫൈൽ അക്കൗണ്ടുകൾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"വ്യക്തിഗത പ്രൊഫൈൽ അക്കൗണ്ടുകൾ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ഔദ്യോഗിക അക്കൗണ്ട് - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ഓട്ടോമാറ്റിക്"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ഫയൽ എൻക്രിപ്ഷനിലേക്ക് പരിവർത്തിപ്പിക്കുക"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"പരിവർത്തിപ്പിക്കുക…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ഇതിനകം തന്നെ ഫയൽ എൻക്രിപ്റ്റ് ചെയ്തു"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ഫയൽ അധിഷ്ഠിത എൻക്രിപ്ഷനിലേക്ക് പരിവർത്തിപ്പിക്കുന്നു"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ഡാറ്റാ വിഭജനം, ഫയൽ അധിഷ്ഠിത എൻക്രിപ്ഷനിലേക്ക് പരിവർത്തിപ്പിക്കുക.\n !!മുന്നറിയിപ്പ്!! ഇങ്ങനെ ചെയ്താൽ നിങ്ങളുടെ എല്ലാ ഡാറ്റയും മായ്ക്കപ്പെടും.\n ഈ ഫീച്ചറിപ്പോൾ ആൽഫാ ഘട്ടത്തിലാണ്, ശരിയായി പ്രവർത്തിച്ചേക്കില്ല.\n തുടരുന്നതിന് \'വൈപ്പുചെയ്ത് പരിവർത്തിപ്പിക്കുക...\' അമർത്തുക."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"വൈപ്പുചെയ്ത് പരിവർത്തിപ്പിക്കുക…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"സുഷുപ്തിയിലാക്കുക"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"സ്ക്രീൻ ഓഫാക്കുന്നു"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"നിഷ്ക്രിയത്വത്തിന് <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> കഴിഞ്ഞ്"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ക്രമീകരണങ്ങൾ"</string>
     <string name="print_settings" msgid="4742428530112487843">"പ്രിന്റിംഗ്"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"പ്രിന്റ് സേവനങ്ങൾ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"നിങ്ങളുടെ പ്രമാണം പ്രിന്ററിലേക്ക് പോകുന്നതിനിടെ അത് ഒന്നോ അതിലധികമോ സെർവറുകളിലൂടെ കടന്നുപോകാനിടയുണ്ട്."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"സേവനങ്ങളൊന്നും ഇൻസ്റ്റാളുചെയ്‌തിട്ടില്ല"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"പ്രിന്ററുകളൊന്നും കണ്ടെത്തിയില്ല"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ക്രമീകരണങ്ങൾ"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"മുഴുവൻ ഹോട്ട്‌വേഡും ആശയവിനിമയവും"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ലളിതമായ സ്‌പീച്ച് ടു ടെക്‌സ്റ്റ്"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ഈ വോയ്‌സ് ഇൻപുട്ട് സേവനത്തിന് നിങ്ങൾക്കായി എപ്പോഴും വോയ്‌സ് നിരീക്ഷിക്കാനും വോയ്‌സ് പ്രവർത്തനക്ഷമമാക്കിയ അപ്ലിക്കേഷനുകളെ നിയന്ത്രിക്കാനുമാകും. ഇത് <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> അപ്‌ലിക്കേഷനിൽ നിന്നുള്ളതാണ്. ഈ സേവനത്തിന്റ ഉപയോഗം പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ടെക്‌സ്റ്റ്-ടു-സ്‌പീച്ച് ക്രമീകരണങ്ങൾ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"ടെക്‌സ്റ്റ്-ടു-സ്‌പീച്ച് ഔട്ട്‌പുട്ട്"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"എല്ലായ്പ്പോഴും എന്റെ ക്രമീകരണങ്ങൾ ഉപയോഗിക്കുക"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ചുവടെയുള്ള സ്ഥിര ക്രമീകരണങ്ങൾ അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളെ അസാധുവാക്കുന്നു"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"സ്ഥിര ക്രമീകരണങ്ങൾ"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"സ്ഥിര എഞ്ചിൻ"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"സംഭാഷണ ടെക്‌സ്‌റ്റിന് ഉപയോഗിക്കാൻ സംഭാഷണ സിന്തസിസ് എഞ്ചിൻ സജ്ജീകരിക്കുക"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"വായന നിരക്ക്"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"വാചകം പറയുന്ന വേഗത"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"പിച്ച്"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"സംസാര വാചകത്തിന്റെ ശൈലിയെ ബാധിക്കുന്നു"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ഭാഷ"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"സി‌സ്റ്റം ഭാഷ ഉപയോഗിക്കുക"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ഭാഷ തിരഞ്ഞെടുത്തിട്ടില്ല"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"സംഭാഷണ വാചകത്തിന് ഭാഷാ-നിർദ്ദിഷ്‌ട ശബ്ദം സജ്ജമാക്കുന്നു"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ഒരു ഉദാഹരണം കേൾക്കുക"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"സംഭാഷണത്തിന്റെ ഒരു ഹ്രസ്വ പ്രകടനം പ്ലേ ചെയ്യുക"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"വോയ്‌സ് ഡാറ്റ ഇൻസ്റ്റാളുചെയ്യുക"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"സംഭാഷണ സിന്തസിസ്സിന് ആവശ്യമായ വോയ്‌സ് ഡാറ്റ ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ഇതിനകം ശരിയായി ഇൻസ്റ്റാളുചെയ്‌ത സംഭാഷണ സിന്തസിസിന് വോയ്‌സുകൾ ആവശ്യമാണ്"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"നിങ്ങളുടെ ക്രമീകരണങ്ങൾ മാറ്റി. ഇത് അവ എങ്ങനെ കേൾക്കുമെന്നതിന് ഉദാഹരണമാണ്."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"നിങ്ങൾ തിരഞ്ഞെടുത്ത എഞ്ചിന് പ്രവർത്തിക്കാനാകില്ല"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ക്രമീകരിക്കുക"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"മറ്റൊരു എഞ്ചിൻ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"പാസ്‌വേഡുകൾ, ക്രെഡിറ്റ് കാർഡ് നമ്പറുകൾ എന്നിവ പോലുള്ള വ്യക്തിഗതമായ ഡാറ്റയുൾപ്പെടെ നിങ്ങൾ സംസാരിക്കുന്ന എല്ലാ വാചകവും ഈ സംഭാഷണ സിന്തസിസ് എഞ്ചിന് ശേഖരിക്കാനായേക്കും. ഇത് <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> എഞ്ചിനിൽ നിന്നും വരുന്നു. ഈ സംഭാഷണ സിന്തസിസ് എഞ്ചിൻ ഉപയോഗിക്കുന്നത് പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ടെക്‌സ്‌റ്റ്-ടു-സ്‌പീച്ച് ഔട്ട്‌പുട്ടിനായി ഈ ഭാഷയ്‌ക്ക് പ്രവർത്തിക്കുന്ന ഒരു നെറ്റ്‌വർക്ക് കണക്ഷൻ ആവശ്യമാണ്."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"സംഭാഷണം ഒരുമിച്ചുചേർക്കുന്നതിനുള്ള ഒരുദാഹരണമാണിത്"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"സ്ഥിര ഭാഷാ സ്ഥിതിവിവരക്കണക്കുകൾ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> ഭാഷയെ പൂർണ്ണമായും പിന്തുണയ്‌ക്കുന്നു"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ഭാഷയ്‌ക്ക് നെറ്റ്‌വർക്ക് കണക്ഷൻ ആവശ്യമാണ്"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> ഭാഷയെ പിന്തുണയ്‌ക്കുന്നില്ല"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"പരിശോധിക്കുന്നു..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"എഞ്ചിനുകൾ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ക്രമീകരണങ്ങൾ"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> പ്രവർത്തക്ഷമമാക്കി"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> പ്രവർത്തരഹിതമാക്കി"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"എഞ്ചിൻ ക്രമീകരണങ്ങൾ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> എന്നതിനായുള്ള ക്രമീകരണങ്ങൾ"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ഭാഷകളും വോയ്‌സുകളും"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ഇന്‍‌സ്റ്റാളുചെയ്‌തു"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ഇൻസ്‌റ്റാളുചെയ്തില്ല"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"സ്‌ത്രീ"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"പുരുഷന്‍"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"സംഭാഷണ സിന്തസിസ് എഞ്ചിൻ ഇൻസ്‌റ്റാളുചെയ്തു"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ഉപയോഗിക്കുന്നതിന് മുമ്പ് പുതിയ എഞ്ചിൻ പ്രവർത്തനക്ഷമമാക്കുക."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"എഞ്ചിൻ ക്രമീകരണങ്ങൾ സമാരംഭിക്കുക"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"തിരഞ്ഞെടുത്ത എഞ്ചിൻ"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"പൊതുവായ കാര്യങ്ങൾ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"പവർ നിയന്ത്രണം"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"വൈഫൈ ക്രമീകരണം അപ്‌ഡേറ്റുചെയ്യുന്നു"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ബ്ലൂടൂത്ത് ക്രമീകരണം അപ്‌ഡേറ്റുചെയ്യുന്നു"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"പ‌ശ്ചാത്തല അപ്ലിക്കേഷനുകൾക്ക് അപ്ലിക്കേഷൻ പ്രതികരിക്കുന്നില്ല എന്ന ഡയലോഗ് കാണിക്കുക"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"ബാഹ്യമായതിൽ നിർബന്ധിച്ച് അനുവദിക്കുക"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"മാനിഫെസ്റ്റ് മൂല്യങ്ങൾ പരിഗണിക്കാതെ, ബാഹ്യ സ്റ്റോറേജിലേക്ക് എഴുതപ്പെടുന്നതിന് ഏതൊരു ആപ്പിനെയും യോഗ്യമാക്കുന്നു"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"വലിപ്പം മാറ്റാൻ പ്രവർത്തനങ്ങളെ നിർബന്ധിക്കുക"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"മാനിഫെസ്റ്റ് മൂല്യങ്ങൾ പരിഗണിക്കാതെ, എല്ലാ പ്രവർത്തനങ്ങളെയും മൾട്ടി-വിൻഡോയ്ക്കായി വലിപ്പം മാറ്റുന്നു."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ഡാറ്റ ഉപയോഗം"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ആപ്പ് ഡാറ്റ ഉപയോഗം"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"കാരിയർ ഡാറ്റ കണക്കാക്കുന്നത് ഉപകരണത്തിൽ നിന്നും വ്യത്യാസപ്പെട്ടിരിക്കാം."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"അലാറങ്ങൾ മാത്രം"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"പൂർണ്ണ നിശബ്‌ദത"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ദൃശ്യപരമായ തടസ്സങ്ങൾ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ഫോൺ റിംഗ്ടോൺ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"അറിയിപ്പുകൾക്കുള്ള സ്ഥിരം റിംഗ്‌ടോൺ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"കോളുകൾക്കും വൈബ്രേറ്റ്"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"നിങ്ങളുടെ ഉപകരണം ലോക്ക് ചെയ്തിരിക്കുമ്പോൾ, അറിയിപ്പുകൾ എങ്ങനെയാണ് കാണിക്കേണ്ടത്?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"അറിയിപ്പുകൾ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ആപ്പ് അറിയിപ്പുകൾ"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"വിഷയ അറിയിപ്പുകൾ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"മറ്റു ശബ്‌ദങ്ങൾ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ഡയൽ പാഡ്  ടോണുകൾ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"സ്‌ക്രീൻലോക്കിംഗ് ശബ്‌ദങ്ങൾ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ഈ അപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"മുൻഗണയായി കണക്കാക്കുക"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"\'മുൻഗണന മാത്രം\' എന്നതിൽ \'ശല്യപ്പെടുത്തരുത്\' എന്നത് സജ്ജമാക്കുമ്പോൾ, ഈ അപ്ലിക്കേഷന്റെ അറിയിപ്പുകൾ കേൾക്കുന്നതാക്കുക"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"പീക്കിംഗ് അനുവദിക്കുക"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"നിലവിലെ സ്‌ക്രീനിൽ ചില അറിയിപ്പുകളെ കാഴ്‌ച എന്നതിലേക്ക് നീക്കിക്കൊണ്ട് അവയ്‌ക്ക് പ്രാധാന്യം നൽകാൻ ഈ അപ്ലിക്കേഷനെ അനുവദിക്കുക"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ശല്യപ്പെടുത്തരുത്\' അസാധുവാക്കുക"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\'മുൻഗണനയുള്ളവ മാത്രം\' എന്നതിലേക്ക് \'ശല്യപ്പെടുത്തരുത്\' സജ്ജമാക്കിയിട്ടുള്ളപ്പോൾ തടസ്സപ്പെടുത്തുന്നത് തുടരാൻ ഈ അറിയിപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"തന്ത്രപ്രധാനപരമായ ഉള്ളടക്കം മറയ്‌ക്കുക"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"ഉപകരണം ലോക്കുചെയ്‌തിരിക്കുമ്പോൾ, സ്വകാര്യ വിവരം വെളിപ്പെടുത്തിയേക്കാവുന്ന ഈ അപ്ലിക്കേഷന്റെ അറിയിപ്പുകളിലെ ഉള്ളടക്കം മറയ്‌ക്കുക"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"ഉപകരണം ലോക്കുചെയ്തിരിക്കുമ്പോൾ, ഈ അറിയിപ്പുകളിൽ സ്വകാര്യ വിവരങ്ങൾ വെളിപ്പെടുത്തിയേക്കാവുന്ന ഉള്ളടക്കം മറയ്ക്കുക"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"തടഞ്ഞു"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"പ്രധാനപ്പെട്ടവ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"സെൻസി‌റ്റീവ്"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> വരെ മാത്രം അലാറങ്ങളിലേക്ക് മാറ്റുക"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"\'എല്ലായ്‌പ്പോഴും തടസ്സപ്പെടുത്തുക\' എന്നതിലേക്ക് മാറ്റുക"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"സ്ക്രീൻ തടസ്സങ്ങളൊന്നും ഇല്ല"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"നിലവിലെ സ്ക്രീനിൽ എത്തിനോക്കുന്നതിൽ നിന്നോ പ്രത്യക്ഷപ്പെടുന്നതിൽ നിന്നോ, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"അറിയിപ്പ് വെളിച്ചമില്ല"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"തുടിപ്പായി വെളിച്ചം മാറുന്നതിൽ നിന്ന്, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ആപ്പ് അറിയിപ്പുകൾ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ഇതേക്കുറിച്ചുള്ള ഫീഡ്‌ബാക്ക് അയയ്‌ക്കൂ"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ചെയ്യുംമുമ്പ് പിൻ ചോദിക്കൂ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് പാസ്‌വേഡ് ആവശ്യപ്പെടുക"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"അൺപിൻ ചെയ്യുമ്പോൾ ഉപകരണം ലോക്കുചെയ്യുക"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ഈ വർക്ക് പ്രൊഫൈൽ നിയന്ത്രിക്കുന്നത്:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> നിയന്ത്രിക്കുന്നു"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(പരീക്ഷണാത്മകം)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"അറിയിപ്പുകൾ"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"സാധാരണം"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"തടയുക"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"രഹസ്യസ്വഭാവമുള്ളവ മറച്ചിരിക്കുന്നു"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"മു‌ൻഗണന"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"പീക്കിംഗ് ഇല്ല"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"വ്യക്തിഗതം"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ഔദ്യോഗികം"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"തടഞ്ഞു"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"മു‌ൻഗണന"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"രഹസ്യസ്വഭാവമുള്ളവ മറച്ചിരിക്കുന്നു"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"പീക്കിംഗ് ഇല്ല"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ഡൊമെയ്‌ൻ URL-കൾ ഉള്ളത്"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"അഡ്‌മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ആപ് കോണ്‍ഫിഗര്‍ചെയ്യൂ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ആപ്പ് അനുമതികൾ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾക്ക് കൂടുതൽ ആക്‌സസ്സ് അനുവദിച്ചിരിക്കുന്നു"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾ അനുവദനീയം"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ചിത്ര വർണ്ണ മോഡ്"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ഉപയോഗിക്കുക"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ഡിസ്പ്ലേ സ്കെയിൽ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ഡിസ്‌പ്ലേ ഡെൻസിറ്റി സൂം സ്കെയിൽ സ്കെയിലിംഗ്"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ചെറുത്"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"സാധാരണം"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"വലുത്"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"വലുത്"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ഏറ്റവും വലുത്"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ഇഷ്ടാനുസൃതം ( <xliff:g id="DENSITYDPI">%d</xliff:g> )"</string>
+    <string name="see_all" msgid="8883901630052886984">"എല്ലാം കാണുക"</string>
+    <string name="see_less" msgid="1250265310929558370">"കുറച്ച് കാണുക"</string>
+    <string name="disconnected" msgid="5787956818111197212">"വിച്ഛേദിച്ചു"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ഡാറ്റ ഉപയോഗിച്ചു"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ആപ്സ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> / <xliff:g id="SIZE2">%2$s</xliff:g> ഉപയോഗിച്ചു"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"അനുരൂപമാക്കാവുന്ന തെളിച്ചനില ഓണാണ്"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"അനുരൂപമാക്കാവുന്ന തെളിച്ചനില ഓഫാണ്"</string>
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index 5986012..ae1e83c 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Том"</item>
     <item msgid="7786168277516233536">"Том"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Маш удаан"</item>
-    <item msgid="2361722960903353554">"Удаан"</item>
-    <item msgid="1145554631248513562">"Энгийн"</item>
-    <item msgid="7553665153391107454">"Хурдан"</item>
-    <item msgid="1370673569131070146">"Илүү хурдан"</item>
-    <item msgid="4648206845228970803">"Маш хурдан"</item>
-    <item msgid="4977949754169483251">"Түргэн"</item>
-    <item msgid="6106302964845503577">"Маш түргэн"</item>
-    <item msgid="6800277205640837264">"Хамгийн хурдан"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Маш нам"</item>
-    <item msgid="2692137425242433765">"Бага"</item>
-    <item msgid="3332408460740717754">"Энгийн"</item>
-    <item msgid="4907380534957572531">"Их"</item>
-    <item msgid="4699640516390840297">"Маш өндөр"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Скан хийж байна…"</item>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index cdb3c67..270104b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Нууц үг"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Админ идэвхгүй болгосон"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Хурууны хээ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Хурууны хээ удирдах"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Хурууны хээг дараах зорилгоор ашиглах"</string>
@@ -801,8 +802,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Таблетыг док-д суурилуулах буюу салгах үед дуу тоглуулахгүй"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Утсыг док-д суурилуулах буюу салгах үед дуу тоглуулахгүй"</string>
     <string name="account_settings" msgid="6403589284618783461">"Акаунт"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Хувийн"</string>
-    <string name="category_work" msgid="8699184680584175622">"Ажил"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Ажлын профайлын бүртгэл - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Хувийн профайлын бүртгэл"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Ажлын бүртгэл - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -825,6 +824,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Идэвхгүй"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Байнга асаалттай"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматаар"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файлын шифрлэлт болгон хөрвүүлэх"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Хөрвүүлэх..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Аль хэдийнэ файл шифрлэгдсэн"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Шифрлэлтэд суурилсан файлыг хөрвүүлж байна"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Өгөгдлийн хуваалтыг файлд суурилсан шифрлэлтэд хөрвүүлэх.\n !!Анхааруулга!! Энэ нь таны бүх өгөгдлийг устгах болно.\n Энэ онцлог нь альфа бөгөөд зөв ажиллахгүй байж болзошгүй.\n Үргэлжлүүлэхийн тулд \"Арчаад, хөрвүүлэх...\"-г дарна уу."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Арчаад, хөрвүүлэх..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Идэвхгүй"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
@@ -1687,8 +1692,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Тохиргоо"</string>
     <string name="print_settings" msgid="4742428530112487843">"Хэвлэлт"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Хэвлэх үйлчилгээнүүд"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Таны документ принтерт очтолоо нэг буюу хэд хэдэн серверээр дамжиж болно."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Үйлчилгээ суулгагдаагүй байна"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Принтер олдсонгүй"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Тохиргоо"</string>
@@ -1869,54 +1872,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Бүрэн хотворд болон харилцан үйлчлэл"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Энгийн яриаг текст болголт"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Энэ дуун оруулгын үйлчилгээ нь дуун хяналтыг байнга ажиллуулах болон дуугаар ажиллах апп-уудыг таны өмнөөс хянах боломжтой болно.Үүнийг <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> аппликешн нийлүүлдэг. Энэ үйлчилгээг идэвхжүүлэх үү?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Текст-ярианы тохиргоо"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Текст-яриа гаргах"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Миний тохиргоог байнга ашиглах"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Доорх үндсэн тохиргоогоор апп тохиргоог дарах"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Үндсэн тохиргоо"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Үндсэн үүсгүүр"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Яриа үүсгэх системийг текст уншихад ашиглахаар тохируулах"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Ярианы түвшин"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Текстийг унших хурд"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Авиа тон"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Текст уншлагын өнгөнд нөлөөлнө"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Хэл"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Системийн хэлийг ашиглах"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Хэл сонгогдоогүй байна"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ярианы текстүүдэд тухайн хэлэнд зориулсан хоолойг тохируулна"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Жишээ сонсох"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Яриа үүсгэх талаар богинохон жишээг тоглуулах"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Хоолойн өгөгдлийг суулгах"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Яриа үүсгэхэд шаардлагатай дууны өгөгдлийг суулгах"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Яриа үүсгэхэд шаардлагатай хоолойнуудыг аль хэдийн бүрэн суулгасан байна"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Таны тохиргоо өөрчлөгдлөө. Ямархуу сонсогдох жишээ нь энэ байна."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Таны сонгосон үүсгүүр ажиллах боломжгүй."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Тохируулах"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Өөр үүсгүүр сонгоно уу"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Энэ яриа үүсгүүр нь нууц үг, зээлийн картын дугаар гэх мэт таны хувийн мэдээллийг оруулан унших бүх текстийг цуглуулах боломжтой. Үүнийг <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> үүсгүүрээс нийлүүлдэг. Энэ яриа үүсгүүрийн ашиглалтыг идэвхжүүлэх үү?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Энэ хэл нь текстээс дуунд хөрвүүлэхэд ажлын сүлжээний холболтыг шаарддаг."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Энэ бол яриа үүсгэх жишээ юм."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Үндсэн хэлний статус"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> бүрэн дэмжигдсэн"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> сүлжээнд хrequires network connection"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> дэмжигдээгүй байна"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Шалгаж байна..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Үүсгүүр"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> тохиргоо"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> идэвхжсэн"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> идэвхгүйжсэн"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Үүсгүүрийн тохиргоо"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>-н тохиргоо"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Хэл болон дуу"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Суулгасан"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Суулгаагүй"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Эмэгтэй"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Эрэгтэй"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Яриа гаргах үүсгүүр суулгагдсан"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Ашиглахын өмнө шинэ үүсгүүрийг идэвхжүүлнэ үү."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Үүсгүүрийн тохиргоог ажиллуулах"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Давуу үүсгүүр"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Ерөнхий"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Тэжээлийн Удирдлага"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi тохиргоог шинэчилж байна"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Блютүүт тохиргоог шинэчилж байна"</string>
@@ -2157,10 +2112,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Далд апп-уудад Апп Хариу Өгөхгүй байна гэснийг харуулах"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Апп-ыг гадаад санах ойд хадгалахыг зөвшөөрөх"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Манифест утгыг нь үл хамааран дурын апп-ыг гадаад санах ойд бичих боломжтой болгодог"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Үйл ажиллагааны хэмжээг өөрчилж болохуйц болгох"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Тодорхойлогч файлын утгыг үл хамааран, бүх үйл ажиллагааг олон цонхонд хэмжээг нь өөрчилж болохуйц болгох."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Дата ашиглалт"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Апп дата ашиглалт"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Операторын дата хэмжилт таны төхөөрөмжийнхөөс өөр байж болно."</string>
@@ -2552,6 +2505,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Зөвхөн сэрүүлэг"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Дуугүй болгох"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Визуал саад"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Мэдэгдлийн үндсэн хонхны ая"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Дуудлагад бас чичрэх"</string>
@@ -2565,6 +2519,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Таны төхөөрөмж түгжээтэй үед мэдэгдлийг хэрхэн харуулах вэ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Мэдэгдэл"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Сэдвийн мэдэгдэл"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Бусад ая"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Диалпадын ая"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Дэлгэц түгжих ая"</string>
@@ -2590,12 +2545,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Бүгдийг блокло"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Энэ апп-н мэдэгдлийг хэзээ ч харуулахгүй"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Нэн тэргүүнд тавих"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Do not disturb горимыг зөвхөн Эхэнд тавихад тохируулсан үед ч энэхүү апп-нй мэдэгдлийг сонсго"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Гүйлгэн харахыг зөвшөөрөх"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Энэ апп-д зарим мэдэгдлийг мэдэгдэхийг зөвшөөрөхийн тулд одоогийн дэлгэцэнд оруул"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Бүү саад бол\"-г дарах"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Бүү саад бол\" горимыг \"Зөвхөн Тэргүүлэх ач холбогдолтой\" болгон тохируулсан үед эдгээр мэдэгдэл үргэлжлэн саад болохыг зөвшөөрнө үү."</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Эмзэг мэдээллийг нуух"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Төхөөрөмж цоожтой үед энэ апп-ны мэдэгдэл дэх нууц мэдээлэл ил гаргаж магадгүй агуулгыг нуух"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Төхөөрөмж түгжээтэй үед хувийн мэдээлэл гаргаж болзошгүй эдгээр мэдэгдэлийн агуулгыг нуух"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Хориглогдсон"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Чухал"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Эмзэг"</string>
@@ -2666,6 +2619,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> хүртэл анхааруулах горимд шилжих"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Үргэлж саад бол горимд шилжих"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Дэлгэцийн саад байхгүй"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"\"Бүү саад бол\"-оос хаасан мэдэгдлийг гэнэт гарч ирэх, дэлгэцэнд харагдахаас сэргийлэх"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Мэдэгдлийн гэрэл байхгүй"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"\"Бүү саад бол\"-оос хаасан мэдэгдлийг гэрэл тасалдуулахаас хамгаалах"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
@@ -2678,7 +2635,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Тогтоосныг суллахаас өмнө PIN асуух"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Тогтоосныг суллахаас өмнө нууц үг асуух"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Unpinning хийх үед төхөөрөмжийг түгжинэ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Ажлын профайл"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Энэ ажлын профайлыг удирдагч нь:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>-аар удирдана"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Туршилтын)"</string>
@@ -2731,9 +2687,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Мэдэгдэл"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Энгийн"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Хориглох"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Нууц мэдээллийг нуусан"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Чухал"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Харах боломжгүй"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2755,15 +2708,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Хувийн"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Ажил"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блоклосон байна"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Чухал"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Нууц мэдээллийг нуусан"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Харах боломжгүй"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Домэйн хаягуудын хамт"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Админ идэвхгүй болгосон"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Апп тохируулах"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Профайлаа сонгоно уу"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Апп зөвшөөрөл"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>-аас<xliff:g id="COUNT_1">%d</xliff:g> апп-уудад нэмэлтээр нэвтрэхийг зөвшөөрсөн"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>-аас <xliff:g id="COUNT_1">%d</xliff:g> апп зөвшөөрөгдсөн"</string>
@@ -2920,4 +2869,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"\"Зургийн өнгө\" горим"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB-г ашиглах"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Дэлгэцийн хэмжээ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"томруулалтын хэмжээг тооцоолох дэлгэцийн нягтрал"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Жижиг"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Хэвийн"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Том"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Илүү том"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Хамгийн том"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Тохируулсан (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Бүгдийг харах"</string>
+    <string name="see_less" msgid="1250265310929558370">"Цөөнийг харах"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Салгасан"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> датаг ашигласан"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> апп суулгасан"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g>-н <xliff:g id="SIZE1">%1$s</xliff:g>-г ашигласан"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Тохируулагчтай гэрэлтүүлэг АСААЛТТАЙ байна"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Тохируулагчтай гэрэлтүүлэг УНТРААЛТТАЙ байна"</string>
 </resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index e64e557..6f904d5 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"मोठा"</item>
     <item msgid="7786168277516233536">"विशाल"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"खूप धीमे"</item>
-    <item msgid="2361722960903353554">"धीमे"</item>
-    <item msgid="1145554631248513562">"सामान्य"</item>
-    <item msgid="7553665153391107454">"जलद"</item>
-    <item msgid="1370673569131070146">"जलद"</item>
-    <item msgid="4648206845228970803">"खूप जलद"</item>
-    <item msgid="4977949754169483251">"शीघ्र"</item>
-    <item msgid="6106302964845503577">"अतिशीघ्र"</item>
-    <item msgid="6800277205640837264">"जलद"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"खूप निम्न"</item>
-    <item msgid="2692137425242433765">"निम्न"</item>
-    <item msgid="3332408460740717754">"सामान्य"</item>
-    <item msgid="4907380534957572531">"उच्च"</item>
-    <item msgid="4699640516390840297">"खूप उच्च"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"स्कॅन करत आहे…"</item>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index ba6a0d7..088abbc 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"संकेतशब्द"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"प्रशासकाने अक्षम केलेले"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"फिंगरप्रिंट"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"फिंगरप्रिंट व्यवस्‍थापित करा"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"फिंगरप्रिंट यासाठी वापरा"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉकवरून टॅबलेट घालताना किंवा त्यातून काढताना ध्वनी प्ले करू नका"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डॉकवरून फोन घालताना किंवा काढताना ध्वनी प्ले करू नका"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाती"</string>
-    <string name="category_personal" msgid="1299663247844969448">"वैयक्तिक"</string>
-    <string name="category_work" msgid="8699184680584175622">"कार्य"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफाईल खाती - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"वैयक्तिक प्रोफाईल खाती"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्य खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"अक्षम केले"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"नेहमी चालू"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"स्वयंचलित"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"फाईल कूटबद्धीकरणावर रूपांतरित करा"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"रूपांतरित करा..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"फाईल आधीपासून कूटबद्ध केली"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"फाईल आधारित कूटबद्धीकरणावर रूपांतरित करणे"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"फाईल आधारित कूटबद्धीकरणावर डेटा विभाजक रूपांतरित करा.\n !!चेतावणी!! हे आपल्‍या सर्व डेटास मिटवेल.\n हे वैशिष्ट्य अल्‍फा आहे आणि कदाचित योग्यरित्या कार्य करू शकत नाही.\n सुरु ठेवण्‍यासाठी \'पुसा आणि रूपांतरित करा...\' दाबा."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"पुसा आणि रुपांतरित करा..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद होते"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"निष्क्रियतेच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग्ज"</string>
     <string name="print_settings" msgid="4742428530112487843">"मुद्रण करीत आहे"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"मुद्रण सेवा"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायची?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"प्रिंटरकडे जाताना आपला दस्तऐवज एक किंवा अधिक सर्व्हरवरून जाऊ शकतो."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोणत्याही सेवा स्थापित केल्या नाहीत"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कोणतेही प्रिंटर आढळले नाहीत"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग्ज"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"पूर्ण हॉटवर्ड आणि परस्परसंवाद"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"मजकूर पाठविण्यासाठी सोपे उच्चारण"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"आपल्या वतीने व्हॉइस परीक्षण नेहमी-चालू कार्यप्रदर्शन करण्यासाठी आणि व्हॉइस सक्षम अनुप्रयोग नियंत्रित करण्यासाठी व्हॉइस इनपुट सेवा सक्षम असेल. हे <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> अनुप्रयोगावरून येते. या सेवेचा वापर सक्षम करायचा?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"टेक्स्ट-टू-स्पीच सेटिंग्ज"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"टेक्स्ट-टू-स्पीच आउटपुट"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"नेहमी माझ्या सेटिंग्ज वापरा"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"खालील डीफॉल्ट सेटिंग्ज अॅप सेटिंग्जना आच्छादित करतात"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"डीफॉल्ट सेटिंग्‍ज"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"डीफॉल्ट इंजिन"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"बोललेल्या मजकूराकरिता वापरण्यासाठी उच्चार सश्लेषण इंजिन सेट करा"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"बोलण्याचा रेट"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ज्या गतीने मजकूर बोलला जातो ती"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोललेल्या मजकुराचा नाद प्रभावित करते"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"भाषा"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"सिस्टम भाषा वापरा"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा निवडलेली नाही"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"बोललेल्या मजकुरासाठी भाषा-विशिष्ट आवाज सेट करते"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"उदाहरण ऐका"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"उच्चार संश्लेषणाचे एक छोटेसे प्रात्यक्षिक प्ले करा"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"व्हॉइस डेटा स्थापित करा"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"उच्चार संश्लेषणासाठी आवश्यक आवाज डेटा स्थापित करा"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"उच्चार संश्लेषणासाठी आवश्यक व्हॉइस आधीपासूनच योग्यरितीने स्थापित केला आहे"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"आपल्या सेटिंग्ज बदलल्या आहेत. त्यांचा ध्वनी कसा आहे याचे हे उदाहरण आहे."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"आपण निवडलेले इंजिन चालू शकत नाही."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"कॉन्फिगर करा"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"दुसरे इंजिन निवडा"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"हे उच्चार संश्लेषण इंजिन संकेतशब्द आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक मजकुरासह, बोलला जाणारा सर्व मजकूर संकलित करण्यात सक्षम होऊ शकते. हे <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजिनवरून येते. या उच्चार संश्लेषण इंजिनचा वापर सक्षम करायचा?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"या भाषेस टेक्‍स्‍ट टू स्‍पीचसाठी एका नेटवर्क कनेक्शनची आवश्यकता आहे."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"हे उच्चार संश्लेषणाचे एक उदाहरण आहे"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"डीफॉल्ट भाषा स्थिती"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> पूर्णपणे समर्थित आहे"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ला नेटवर्क कनेक्शनची आवश्यकता आहे"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> समर्थित नाही"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"तपासत आहे..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"इंजिन"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सेटिंग्ज"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सक्षम केले आहे"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> अक्षम आहे"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"इंजिन सेटिंग्ज"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> साठी सेटिंग्ज"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"भाषा आणि आवाज"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"स्थापित केले"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"स्थापित केले नाही"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"स्त्री"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"पुरूष"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"उच्चार संश्लेषण इंजिन स्थापित केले"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"वापरण्यापूर्वी नवीन इंजिन सक्षम करा."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"इंजिन सेटिंग्ज लाँच करा"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"प्राधान्यकृत इंजिन"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"सामान्य"</string>
     <string name="gadget_title" msgid="5519037532720577836">"उर्जा नियंत्रण"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाय-फाय सेटिंग अद्ययावत करीत आहे"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटुथ सेटिंग्ज अद्यतनित करत आहे"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"पार्श्वभूमी अॅप्ससाठी अॅप प्रतिसाद देत नाही संवाद दर्शवा"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"बाह्यवर अॅप्सना अनुमती देण्याची सक्ती करा"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"मॅनिफेस्ट मूल्यांकडे दुर्लक्ष करून, कोणत्याही अॅपला बाह्य संचयनावर लेखन केले जाण्‍यासाठी पात्र बनविते"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"क्र‍ियाकलापाचा आकार बदलण्यायोग्य होण्याची सक्ती करा"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"मॅनिफेस्ट मूल्यांकडे दुर्लक्ष करून, एकाधिक-विंडोसाठी सर्व क्रियाकलापांचा आकार बदलण्यायोग्य करा"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा वापर"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"अॅप डेटा वापर"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"वाहक डेटा गणना आपल्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवळ अलार्म"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"संपूर्ण शांतता"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"व्हिज्युअल व्यत्यय"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफॉल्ट सूचना रिंगटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल साठी कंपन देखील"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"आपले डिव्हाइस लॉक केलेले असताना आपण सूचना कशा दर्शविल्या जाऊ इच्छिता?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"सूचना"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"अॅप सूचना"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"विषय सूचना"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"इतर ध्वनी"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पॅड टोन"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्‍क्रीन लॉक करणारे ध्वनी"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करीत आहे..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सर्व अवरोधित करा"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"या अॅपकडील सूचना कधीही दर्शवू नका"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राधान्य म्हणून हाताळा"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"व्यत्यय आणू नका प्राधान्यावर सेट केले असते केवळ तेव्हा या अ‍ॅपच्या सूचना ऐकल्या जाऊ द्या"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"डोकावून पाहण्यास अनुमती द्या"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"या अ‍ॅपला विशिष्‍ट सूचनांना थोडक्यात वर्तमान स्क्रीनवरील दृश्यामध्‍ये स्लाइड करून महत्त्व देऊ द्या"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"व्यत्यय आणू नका अधिशून्य करा"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्‍हा या सूचनांना व्यत्यय आणणे सुरु ठेवू द्या"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री लपवा"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"डिव्‍हाइस लॉक केले असते तेव्हा, खाजगी माहिती कदाचित उघड करू शकणारी या अ‍ॅपच्या सूचनांमधील सामग्री लपवा"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"डिव्‍हाइस लॉक केले असते तेव्‍हा, खाजगी  माहिती कदाचित उघड करू शकणारी या सूचनेमधील सामग्री लपवा"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राधान्य"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"केवळ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> पर्यंत अलार्मवर बदला"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"नेहमी व्‍यत्यय आणा वर बदला"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"स्क्रीन व्यत्यय नाही"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"व्यत्यय आणू नका द्वारे न दिसणार्‍या सूचनांना विद्यमान स्क्रीनवर दिसण्यापासून प्रतिबंधित करा"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"सूचना प्रकाश नाही"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"व्यत्यय आणू नका द्वारे न दिसणार्‍या ज्या सूचनांमुळे प्रकाशाची उघडझाप होते त्यांना प्रतिबंधित करा"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"अॅप सूचना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करण्‍यापूर्वी पिन साठी विचारा"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करण्‍यापूर्वी संकेतशब्दासाठी विचारा"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करताना डिव्हाइस लॉक करा"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाईल"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"हे कार्य प्रोफाईल याद्वारे व्यवस्थापित केले आहे:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारे व्यवस्थापित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"सूचना"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"सामान्य"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"अवरोधित करा"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"संवेदनशील सामग्री लपविली"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"प्राधान्य"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"डोकावून पाहणे नाही"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"अवरोधित केले"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राधान्य"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"संवेदनशील सामग्री लपविली"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"डोकावून पाहणे नाही"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URL सह"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"प्रशासकाद्वारे अक्षम केलेले"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
     <string name="configure_apps" msgid="6685680790825882528">"अ‍ॅप्स कॉन्‍फिगर करा"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाईल निवडा"</string>
     <string name="app_permissions" msgid="4148222031991883874">"अॅप परवानग्या"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अतिरिक्त प्रवेशाची अनुमती आहे"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अनुमती आहे"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रंग मोड"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB वापरा"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"मापन प्रदर्शित करा"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"प्रदर्शन घनता झूम मापन करीत आहे"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"लहान"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"सामान्य"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"मोठा"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"मोठा"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"सर्वात मोठे"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"सानुकूल करा (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"सर्व पहा"</string>
+    <string name="see_less" msgid="1250265310929558370">"कमी पहा"</string>
+    <string name="disconnected" msgid="5787956818111197212">"डिस्कनेक्ट केले"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> डेटा वापरला"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> अॅप्स स्थापित केले"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> पैकी <xliff:g id="SIZE1">%1$s</xliff:g> वापरले"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"अनुकूल चकाकी चालू आहे"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"अनुकूल चकाकी बंद आहे"</string>
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index 2d9fd00..702e30b 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Besar"</item>
     <item msgid="7786168277516233536">"Sangat besar"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Sangat perlahan"</item>
-    <item msgid="2361722960903353554">"Perlahan"</item>
-    <item msgid="1145554631248513562">"Biasa"</item>
-    <item msgid="7553665153391107454">"Laju"</item>
-    <item msgid="1370673569131070146">"Lebih cepat"</item>
-    <item msgid="4648206845228970803">"Sangat cepat"</item>
-    <item msgid="4977949754169483251">"Cepat"</item>
-    <item msgid="6106302964845503577">"Sangat cepat"</item>
-    <item msgid="6800277205640837264">"Terpantas"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Sangat rendah"</item>
-    <item msgid="2692137425242433765">"Rendah"</item>
-    <item msgid="3332408460740717754">"Biasa"</item>
-    <item msgid="4907380534957572531">"Tinggi"</item>
-    <item msgid="4699640516390840297">"Sangat tinggi"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Mengimbas..."</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index bb67489..30e2220 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Dilumpuhkan oleh pentadbir"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Cap jari"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Urus cap jari"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gunakan cap jari untuk"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan tablet dari dok"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan telefon dari dok"</string>
     <string name="account_settings" msgid="6403589284618783461">"Akaun"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Peribadi"</string>
-    <string name="category_work" msgid="8699184680584175622">"Tempat Kerja"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Akaun profil kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Akaun profil peribadi"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akaun kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Dilumpuhkan"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sentiasa hidup"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Tukar kepada penyulitan fail"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Tukar..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sudah disulitkan fail"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Menukar kepada penyulitan berasaskan fail"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Tukar pembahagian data kepada penyulitan berasaskan fail.\n !!Amaran!! Tindakan ini akan menghapuskan data anda.\n Ini ialah ciri alfa dan mungkin tidak berfungsi dengan betul.\n Tekan \'Hapuskan dan tukar…\' untuk meneruskan."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Hapuskan dan tukar..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Tetapan"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Perkhidmatan cetak"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumen anda mungkin melalui satu atau beberapa pelayan dalam perjalanan ke pencetak."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tiada perkhidmatan dipasangkan"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tiada pencetak ditemui"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Tetapan"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Sebutan laluan penuh dan interaksi"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Pertuturan kepada teks mudah"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Perkhidmatan input suara ini akan dapat melaksanakan pemantauan suara sentiasa hidup dan mengawal aplikasi didayakan suara bagi pihak anda. Ini datang dari aplikasi <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Dayakan penggunaan perkhidmatan ini?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Tetapan teks kepada pertuturan"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Output teks ke pertuturan"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Sentiasa gunakan tetapan saya"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Tetapan lalai di bawah ini mengatasi tetapan aplikasi"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Tetapan lalai"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Enjin lalai"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Tetapkan enjin sintesis pertuturan untuk digunakan bagi teks tuturan"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Kadar pertuturan"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kelajuan pertuturan teks"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks pertuturan"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gunakan bahasa sistem"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menetapkan suara khusus bahasa untuk teks pertuturan"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Dengar contoh"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Mainkan tunjuk cara singkat sintesis pertuturan"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang diperlukan untuk sintesis pertuturan"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesis pertuturan sudah pun dipasangkan dengan betul"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tetapan anda telah bertukar. Ini adalah contoh bunyinya."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Enjin yang anda pilih tidak boleh berfungsi."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasi"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih enjin lain"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Enjin sintesis pertuturan ini mungkin boleh mengumpul semua teks yang akan dituturkan, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang daripada enjin <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Dayakan penggunaan enjin sintesis pertuturan ini?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bahasa ini memerlukan sambungan rangkaian yang berfungsi untuk output teks ke pertuturan."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ini ialah contoh sintesis pertuturan."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status bahasa tetapan asal"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> disokong sepenuhnya"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> memerlukan sambungan rangkaian"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> tidak disokong"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Menyemak..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Enjin"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Tetapan <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> didayakan"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> dilumpuhkan"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Tetapan enjin"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Tetapan untuk <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Bahasa dan suara"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Dipasang"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Tidak dipasangkan"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Perempuan"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Lelaki"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Enjin sintesis prtuturan dipasang"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Dayakn enjin baharu sblm guna."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lancarkan tetapan enjin"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Enjin pilihan"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kawalan kuasa"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mengemas kini tetapan Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mengemas kini tetapan Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tunjukkan dialog Aplikasi Tidak Memberi Maklum Balas untuk aplikasi latar belakang"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Benarkan apl secara paksa pada storan luaran"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Menjadikan sebarang apl layak ditulis ke storan luaran, walau apa juga nilai manifesnya"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Paksa aktiviti supaya boleh diubah saiz"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Menjadikan semua aktiviti boleh diubah saiz untuk berbilang tetingkap, tanpa mengambil kira nilai manifes."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data apl"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Penggera sahaja"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Senyap sepenuhnya"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Gangguan visual"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan lalai"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga bergetar untuk panggilan"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Apabila peranti anda dikunci, bagaimanakah pemberitahuan harus dipaparkan?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Pemberitahuan"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Pemberitahuan topik"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Bunyi lain"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada pad dail"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Bunyi mengunci skrin"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Jangan sekali-kali paparkan pemberitahuan dari apl ini"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Anggap sebagai penting"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Benarkan pemberitahuan apl ini kedengaran apabila Jangan ganggu ditetapkan kepada Perkara penting sahaja"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Benarkan mengintai"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Benarkan apl ini menekankan pemberitahuan tertentu dengan meluncurkan pemberitahuan agar kelihatan seketika pada skrin semasa"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Atasi Jangan Ganggu"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Benarkan pemberitahuan ini terus mengganggu apabila tetapan Jangan Ganggu ditetapkan kepada Keutamaan Sahaja"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Sembunyikan kandungan sensitif"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Apabila peranti dikunci, sembunyikan kandungan dalam pemberitahuan apl ini yang mungkin mendedahkan maklumat peribadi"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Apabila peranti dikunci, sembunyikan kandungan dalam pemberitahuan ini yang mungkin mendedahkan maklumat peribadi"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Disekat"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Keutamaan"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Tukar kepada penggera sahaja hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Tukar kepada sentiasa ganggu"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Tiada gangguan skrin"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Halang pemberitahuan yang disenyapkan oleh Jangan Ganggu daripada muncul atau dipaparkan pada skrin semasa"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Tiada lampu pemberitahuan"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Halang pemberitahuan yang disenyapkan oleh Jangan Ganggu daripada menyebabkan lampu berdenyut"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum nyahsemat"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta kata laluan sebelum menyahsemat"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kunci peranti semasa menyahsemat"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Profil kerja ini diurus oleh:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Diurus oleh <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Percubaan)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Pemberitahuan"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Biasa"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Sekat"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Kandungan sensitif tersembunyi"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Keutamaan"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Tidak boleh mengintai"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Peribadi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kerja"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Disekat"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Keutamaan"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Kandungan sensitif tersembunyi"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Tidak boleh mengintai"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Dengan URL domain"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Dilumpuhkan oleh pentadbir"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurasikan apl"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Kebenaran apl"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> apl yang diberikan akses tambahan"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> apl yang dibenarkan"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mod warna gambar"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gunakan sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala paparan"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"penskalaan skala zum ketumpatan paparan"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kecil"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Biasa"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Besar"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lebih besar"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Terbesar"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Tersuai (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Lihat semua"</string>
+    <string name="see_less" msgid="1250265310929558370">"Lihat kurang"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Diputuskan sambungan"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> data digunakan"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apl dipasang"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> daripada <xliff:g id="SIZE2">%2$s</xliff:g> digunakan"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Kecerahan mudah suai DIHIDUPKAN"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Kecerahan mudah suai DIMATIKAN"</string>
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index 23ded7f..6bd47d8 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"အကြီးစား"</item>
     <item msgid="7786168277516233536">"ဧရာမ"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"အလွန်နှေးသည်"</item>
-    <item msgid="2361722960903353554">"နှေးသည်"</item>
-    <item msgid="1145554631248513562">"ပုံမှန်"</item>
-    <item msgid="7553665153391107454">"မြန်သည်"</item>
-    <item msgid="1370673569131070146">"ပိုမြန်စွာ"</item>
-    <item msgid="4648206845228970803">"အလွန်မြန်စွာ"</item>
-    <item msgid="4977949754169483251">"သွက်သွက်"</item>
-    <item msgid="6106302964845503577">"အရမ်းသွက်စွာ"</item>
-    <item msgid="6800277205640837264">"အမြန်ဆုံး"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"အလွန်နည်းသော"</item>
-    <item msgid="2692137425242433765">"နည်းသော"</item>
-    <item msgid="3332408460740717754">"ပုံမှန်"</item>
-    <item msgid="4907380534957572531">"မြင့်မားခြင်း"</item>
-    <item msgid="4699640516390840297">"အလွန်မြင့်မားခြင်း"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"စကင်ပြုလုပ်နေပြီ"</item>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 646a999..b4f3bf0 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"စကားဝှက်များ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"စီမံခန့်ခွဲသူမှ ပိတ်ထားသည်"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"လက်ဗွေရာ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"လက်ဗွေရာများ စီမံရန်"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"လက်ဗွေရာအား သုံးရန်"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"တက်ဘလက်အားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမမြည်စေရန်"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ဖုန်းအားအထိုင်ထဲသို့ထည့်စဉ် သို့မဟုတ်ဖြုတ်စဉ် အသံမမြည်စေရန်"</string>
     <string name="account_settings" msgid="6403589284618783461">"အကောင့်များ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ကိုယ်ရေး"</string>
-    <string name="category_work" msgid="8699184680584175622">"အလုပ်အကိုင်"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"အလုပ်အချက်အလက် အကောင့်များကို - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ကိုယ်ရေးကိုယ်တာ အချက်အလက် အကောင့်များ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"အလုပ်အကောင့်ကို - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ပိတ်ထား"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"အလိုအလျောက်"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ဖိုင်လုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းပါ"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ပြောင်းရန်…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ဖိုင်ကို လုံခြုံအောင်ပြုလုပ်ပြီးပါပြီ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ဖိုင်အခြေပြုလုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းလဲရန်"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"အချက်အလက်အပိုင်းကို ဖိုင်အခြေပြုလုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းပါ။\n !!သတိ!! ၎င်းသည်သင့် အချက်အလက်များအားလုံးကို ဖျက်ပါမည်။ \n ဤလုပ်ဆောင်ချက်သည် ပထမအဆင့်တွင်သာ ရှိသေးပြီး မှန်ကန်စွာ လုပ်ဆောင်လိမ့်မည် မဟုတ်ပါ။\n ရှေ့ဆက်ရန် \'ရှင်းလင်းပြီး ပြောင်းလဲရန်…\' ကိုနှိပ်ပါ။"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ရှင်းလင်းပြီး ပြောင်းလဲရန်…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"နားခြင်း"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"မျက်နှာပြင်များကို ပိတ်ထား"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>နောက်ပိုင်း လှုပ်ရှားမှုမရှိခြင်း"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ဆက်တင်များ"</string>
     <string name="print_settings" msgid="4742428530112487843">"ပရင့်ထုတ်‌ခြင်း"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ပရင့်ထုတ် ဆားဗစ်များ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုအသုံးပြုမည်လား ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"သင့် စာရွက်စာတမ်းများသည် စာထုတ်စက်သို့ သွားရာတွင် တစ်ခုသို့ ထို့ထက်ပိုသော ဆာဗာများကို ဖြတ်သန်းရမည်။"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"စာထုတ်စက် တစ်ခုမှ မတွေ့ရှိပါ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ဆက်တင်များ"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"စကားလုံးတို နှင့် ပြန်လှန်တုံ့ပြန်မှု အပြည့်"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ရိုးရိုး စကားမှ စာသားသို့"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ဒီအသံဖြင့် ရိုက်သွင်းရေး ဝန်ဆောင်မှုက သင့်ကိုယ်စား အမြဲတမ်း အသံကို စောင့်ကြပ်ပေးလျက် အသံကို ဖွင့်ပေးထားသည့် အပလီကေးရှင်းများကို ထိန်းချုပ်ပေးသည်။ ၎င်းကို <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> အပလီကေးရှင်းက ဆောင်ရွက်ပေးသည်။ ဒီဝန်ဆောင်မှု သုံးရန်ကို ဖွင့်ပေးရမလား?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"စာသားမှစကားပြောပြောင်း ဆက်တင်များ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"စာသားမှ အသံထွက်စေခြင်း"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ကျွန်ုပ်၏အပြင်အဆင်များကို အမြဲသုံးရန်"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"အောက်ပါမူရင်းဆက်တင်များမှာ အပလီကေးရှင်းဆက်တင်များကို ပယ်ဖျက်မည်"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"မူရင်းအပြင်အဆင်များ"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"မူရင်းအင်ဂျင်"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"စာသားများကို အသံထွက်ဖတ်ရန်အတွက် အသံထွက် စာဖတ်စက်အား ပြင်ဆင်ရန်"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"စကားပြောနှုန်း"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"စာတမ်းအားပြောဆိုသော အမြန်နှုန်း"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"အသံအနိမ့်အမြင့်"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ပြောဆိုမည့်စာသား အသံနေအသံထားအား အကျိုးသက်ရောက်မည်။"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ဘာသာစကား"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"စနစ်၏ ဘာသာစကားကို အသုံးပြုရန်"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ဘာသာစကား မရွေးချယ်ထားပါ။"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ဘာသာစကားကိုသတ်မှတ်မည်။ ပြောဆိုမည့်စာသားအတွက် သီးခြားအသံ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"နမူနာကို နားထောင်မည်"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"အသံပေါင်းစပ်ခြင်းအတွက် တိုတောင်းသောသရုပ်ပြမှုကို ပြခြင်း"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"အသံဒေတာများကို ထည့်သွင်းခြင်း"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"စကားသံပေါင်းစပ်မှုအတွက်လိုအပ်သောအသံဒေတာအား ထည့်သွင်းမည်"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"အသံပေါင်းစပ်ခြင်းအတွက်လိုအပ်သော အသံများကို သေချာစွာထည့်သွင်းပြီးပါပြီ"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"သင့်ဆက်တင်မှာ ပြောင်းသွားပါပြီ။ ဤသည်မှာ မည်ကဲ့သို့အသံထွက်သော နမူနာဖြစ်သည်။"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"သင်ရွေးချယ်ထားသော အင်ဂျင်သည် အလုပ်မလုပ်နိုင်ပါ"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ပုံပေါ်စေသည်"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"နောက်ထပ်အင်ဂျင်တခုအား ရွေးချယ်ပါ"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ဤစကားသံပေါင်းစပ်အင်ဂျင်အားအသုံးပြုရာရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ပြောဆိုသောစာသားများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>အင်ဂျင်မှ လာပါသည်။ ဤစကားသံပေါင်းစပ်အင်ဂျင်ကို အသုံးပြုမည်လား?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ဤဘာသာစကားသည် စာသားမှ အသံထွက်ရန် အလုပ်လုပ်သော ကွန်ရက်ချိတ်ဆက်မှု လိုအပ်သည်။"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ဤသည်မှာ အသံတုလုပ်ခြင်း ၏ နမူနာတစ်ခုဖြစ်သည်။"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"လက်ရှိဘာသာစကားအခြေအနေ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> သည်အပြည့်အ၀ အထောက်အကူပြုသည်။"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>သည် ကွန်ရက်ဆက်သွယ်မှုလိုအပ်သည်"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> အတွက် မရသေးပါ"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"စစ်ဆေးနေသည် ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"အင်ဂျင်များ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ဆက်တင်များ"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ကို ရနိုင်သည်"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ကို မရနိုင်ပါ"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"အင်ဂျင်ဆက်တင်များ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>အတွက် ဆက်တင်များ"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ဘာသာစကားနှင့် အသံများ"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ထည့်သွင်းပြီး"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"မထည့်သွင်းထားပါ"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"အမျိုးသမီး"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"အမျိုးသား"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"စကားပြော နားလည်ရေးအင်ဂျင် ထည့်သွင်းပြီး"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"အသုံးမပြုမီ အင်ဂျင်အသစ်ကို ဖွင့်ပါ"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"အင်ဂျင်ဆက်တင်များကိုဖွင့်ခြင်း"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ဦးစားပေးအင်ဂျင်"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ယေဘုယျ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ဖွင့်ပိတ်ထိန်းချုပ်မှု"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"ဝိုင်ဖိုင်ဆက်တင်းများကို နောက်ဆုံးအခြေရောက်အောင်လုပ်သည်"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ဘလူးတုသ်ဆက်တင်ကို တိုးမြင့်မှု"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"နောက်ခံအပ်ပလီကေးရှင်းအတွက်တုံ့ပြန်မှုမရှိပြရန်"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"အပြင်မှာ အတင်း ခွင့်ပြုရန်"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ပြနေတဲ့ တန်ဖိုး ဘယ်လိုပဲရှိနေနေ၊ ဘယ် appကို မဆို အပြင် သိုလှောင်ခန်းသို့ ရေးသားခွင့် ပေးတယ်"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"လုပ်ဆောင်ချက်များ ဆိုက်ညှိရနိုင်ရန် လုပ်ခိုင်းပါ"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"မန်နီးဖက်စ် တန်ဖိုးမရွေး၊ လုပ်ဆောင်ချက် အားလုံး ဆိုက်ညှိရနိုင်အောင် လုပ်ပေးပါ။"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ဒေတာအသုံးပြုမှု"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App ဒေတာ သုံးစွဲမှု"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"နှိုးစက်များသာ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"လုံးဝ တိတ်ဆိတ်ခြင်း"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"အမြင်အာရုံ ကြားဖြတ်ဝင်ရောက်မှု"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်းဝင်တီးလုံး"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"အကြောင်းကြားချက် တီးလုံး"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"သင်၏ ကိရိယာကို သော့ပိတ်ထားလျှင်၊ အကြောင်းကြားချက်များကို သင် ဘယ်လို ပြစေလိုပါသလဲ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"အကြောင်းကြားချက်များ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ် အသိပေးချက်များ"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"ခေါင်းစဉ် သတိပေးချက်များ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"အခြားအသံများ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ဖုန်းဒိုင်ခွက် အသံ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"စခရင်ပိတ်သံ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"appများကို တင်နေ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"အားလုံးကို ပိတ်ဆို့ရန်။"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ဒီappမှ အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြနှင့်"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ဦးစားပေးအဖြစ် ယူဆရန်။"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"မနှောင့်ယှက်ပါနဲ့ကို ဦးစားပေး၌သတ်မှတ်ထားသောအခါ ဤအသုံးပြုပရိုဂြမ်၏သတိပေးချက်များကို ကြားနိုင်ခွင့်ပြုထားရန်။"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ချောင်းကြည့်ခွင့်ပြုပါ။"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ဤအသုံးပြုပရိုဂြမ်ကို လက်ရှိဖန်သားပေါ်မှမြင်ကွင်းပေါ်မှာ ခဏတာဘေးတိုက်ပွတ်ဆွဲခြင်းအားဖြင့်  အချို့သောသတိပေးချက်များကို အလေးအနက်ထားခွင့်ပြုရန်။"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"မနှောင်ယှက်ပါနှင့် ကို အပေါ်မှဖျက်ရေးပါ"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"မနှောင်ယှက်ပါနှင့် ကို ဦးစားပေးမှု အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ဤသတိပေးချက်များအား ဆက်လက်ပြီး စွက်ဖက်ခွင့် ပြုပါ"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"အထိမခံသော အချက်အလက်ကို ဝှက်ထားရန်။"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"စက်ကို သော့ခတ်ထားသောအခါ သီးသန့်သတင်းအချက်အလက်ကိုဖော်ပြနိုင်သော ဤအသုံးပြုပရိုဂြမ်၏သတိပေးချက်များမှာ အချက်အလက်ကို ဝှက်ထားရန်။"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"ကိရိယာကို သော့ခတ်ထားလျှင်၊ ဤသတိပေးချက်များထဲက ကိုယ်ရေး အချက်အလက်များကို ပြသပေးနိုင်ကြသည့် အကြောင်းအရာများကို ဝှက်ထားပါ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ပိတ်ဆို့ထား"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ဦးစားပေးမှု"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"သိမ်မွေ့သော"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> အထိနိုးစက်သာလျှင် သို့ပြောင်းမည်"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"အမြဲတမ်း ကြားဖြတ်ရန်သို့ ပြောင်းမည်"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"မျက်နှာပြင် ကြားဖြတ်ဝင်ရောက်မှုများ မရှိပါ"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"လက်ရှိမျက်နှာပြင်တွင် အသိပေးချက် မိတ်တုတ်မိတ်တုတ်ဖြစ်ခြင်း သို့မဟုတ် ပေါ်လာခြင်းကို Do Not Disturb မှတိတ်ဆိတ်ခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"အသိပေးချက်အလင်း မရှိပါ"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"အသိပေးချက် အလင်း မိတ်တုတ်မိတ်တုတ်ဖြစ်ခြင်းကို Do Not Disturb မှတိတ်ဆိတ်ခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App အကြောင်းကြားချက်များ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ပင်မဖြုတ်မီမှာ PIN ကို မေးရန်"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ပင်မဖြုတ်မီမှာ စကားဝှက်ကို မေးကြည့်ရန်"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"သော့ခတ်ကိရိယာ ပင်ထိုးမှုဖြုတ်နေ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"အလုပ် ပရိုဖိုင်"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ဤအလုပ်ပရိုဖိုင်အား စီမံခန့်ခွဲသည်မှာ-"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> မှ စီမံသည်။"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(စမ်းသပ်ရေး)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"အကြောင်းကြားချက်များ"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ပုံမှန်"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"ပိတ်ဆို့ရန်"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"အထိခိုက်မခံသော အကြောင်းအရာဝှက်ထားသည်"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ဦးစားပေးမှု"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"မချောင်းကြည့်ပါနှင့်"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ကိုယ်ရေး"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"အလုပ်"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ပိတ်ဆို့ထား"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ဦးစားပေးမှု"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"အထိခိုက်မခံသော အကြောင်းအရာဝှက်ထားသည်"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"မချောင်းကြည့်ပါနှင့်"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ဒိုမိန်း URL များဖြင့်"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"စီမံအုပ်ချုပ်မှ ပိတ်ထား"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
     <string name="configure_apps" msgid="6685680790825882528">"apps များ ပုံစံပြင်သတ်မှတ်ပါ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အပလီကေးရှင်း"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ပရိုဖိုင်ရွေးရန်"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App ခွင့်ပြုချက်များ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များနောက်ထပ် အသုံးပြုမှုများ ခွင့်ပြုထား"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များ ခွင့်ပြုထား"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ဓာတ်ပုံအရောင်မုဒ်"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ကို အသုံးပြုပါ"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"မြင်ကွင်း စကေး"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"မြင်ကွင်း သိပ်သည်းဆ ချုံ့ချဲ့မှု စက​ေး စကေးညှိမှု"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"သေး"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ပုံမှန်"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ကြီး"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ပိုကြီး"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"အကြီးဆုံး"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"စိတ်ကြိုက် (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"အားလုံးကြည့်ပါ"</string>
+    <string name="see_less" msgid="1250265310929558370">"လျှော့ ကြည့်ရန်"</string>
+    <string name="disconnected" msgid="5787956818111197212">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"ဒေတာ၏ <xliff:g id="AMOUNT">%1$s</xliff:g> ကိုအသုံးပြုထားသည်"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> အက်ပ်များ ထည့်သွင်းပြီးပါပြီ"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> ၏ <xliff:g id="SIZE1">%1$s</xliff:g> ကိုအသုံးပြုထားသည်"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"အလိုက်သင့် တောက်ပမှုကို ဖွင့်ထားပါသည်"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"အလိုက်သင့် တောက်ပမှုကို ပိတ်ထားပါသည်"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index e22eefa..372395b 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Stor"</item>
     <item msgid="7786168277516233536">"Kjempestor"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Svært langsom"</item>
-    <item msgid="2361722960903353554">"Langsom"</item>
-    <item msgid="1145554631248513562">"Vanlig"</item>
-    <item msgid="7553665153391107454">"Rask"</item>
-    <item msgid="1370673569131070146">"Raskere"</item>
-    <item msgid="4648206845228970803">"Veldig rask"</item>
-    <item msgid="4977949754169483251">"Rask"</item>
-    <item msgid="6106302964845503577">"Veldig rask"</item>
-    <item msgid="6800277205640837264">"Raskest"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Svært lav"</item>
-    <item msgid="2692137425242433765">"Lav"</item>
-    <item msgid="3332408460740717754">"Vanlig"</item>
-    <item msgid="4907380534957572531">"Høy"</item>
-    <item msgid="4699640516390840297">"Svært høy"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skanner ..."</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 499fdcd..6de1bac 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Deaktivert av administratoren"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtrykk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Admin. fingeravtrykk"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bruk fingeravtrykk for"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ikke spill av lyd når nettbrettet settes inn eller tas ut av forankringsstasjonen"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ikke spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
     <string name="account_settings" msgid="6403589284618783461">"Kontoer"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personlig"</string>
-    <string name="category_work" msgid="8699184680584175622">"Jobb"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Joobprofil-kontoer – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personlig profil-kontoer"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Jobbkonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Slått av"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alltid på"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisk"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertér til kryptert fil"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertér …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Allerede kryptert og lagret som fil"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Konvertér til filbasert kryptering"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konvertér datapartisjonen til filbasert kryptering.\n !!Advarsel!! Dette sletter alle dataene dine.\n Dette er en alfafunksjon og kommer kanskje ikke til å fungere skikkelig.\n Trykk på «Slett og konvertér …» for å fortsette."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Slett og konvertér …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</string>
     <string name="print_settings" msgid="4742428530112487843">"Utskrift"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjenester"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumentet ditt kan bli sendt til skriveren via flere tjenere."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ingen tjenester er installert"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Fant ingen skrivere"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Innstillinger"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Full tjeneste for kommandoord og interaksjon"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Enkel tjeneste for tale til tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Denne taleinndata-tjenesten kan utføre «alltid på»-taleovervåking og kontrollere taleaktiverte apper på dine vegne. Den kommer fra <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>-appen. Vil du slå på denne tjenesten?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Talesyntese-kontroller"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Tekst-til-tale"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Overstyr innstillinger"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardinnstillingene nedenfor overstyrer innstillingene for appen"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardvalg"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmotor"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Angi bruk av talesyntesemotoren ved muntlig tekst"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Talehastighet"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hvor raskt teksten leses"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Stemmeleie"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Endrer tonehøyden teksten sies med"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Bruk systemspråk"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Språk er ikke valgt"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Velger språkspesifikk stemme"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Lytt til et eksempel"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Spill en kort demonstrasjon av talesyntesen"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installer stemmedata"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installer nødvendige stemmedata for talesyntese"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Datafilene som behøves for talesynese er allerede korrekt installert"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Du har endret innstillingene dine. Dette er et eksempel på hvordan de høres ut."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Du har valgt en motor som ikke kan kjøre."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Velg en annen motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne talesyntesemotoren kan samle inn all uttalt tekst, herunder personlige opplysninger som for eksempel passord og kredittkortnumre. Den er basert på motoren <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Vil du slå på denne talesyntesemotoren?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Dette språket krever en fungerende nettverkstilkobling for tekst-til-tale."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dette er et eksempel på talesyntese."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status for standardspråk"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> støttes fullt ut"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> krever nettverkstilkobling"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> støttes ikke"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Kontrollerer ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motorer"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Innstillinger for <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktivert"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er deaktivert"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Innstillinger for motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Innstillinger for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Språk og stemmer"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installert"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Ikke installert"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kvinne"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mann"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Talesyntesemotor installert"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktiver ny motor før bruk."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Innstillinger for kjøring av motor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Foretrukket motor"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Generelt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Strømkontroll"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Oppdaterer innstilling for trådløst nett ..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Oppdatere Bluetooth-innstilling"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis Appen svarer ikke-dialog for bakgrunnsapper"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Tving frem tillatelse for ekstern lagring av apper"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Gjør at apper kan skrives til ekstern lagring, uavhengig av manifestverdier"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Tving aktiviteter til å kunne endre størrelse"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Dette gjør at alle aktivitene kan endre størrelse for flervindusmodus, uavhengig av manifestverdier."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens databruk"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatørens metoder for måling av databruk kan være forskjellig fra metodene i enheten."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Bare alarmer"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Total stillhet"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuelle forstyrrelser"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonringelyd"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standard varslingslyd"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også når det ringer"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hvordan ønsker du at varsler skal vises når enheten er låst?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Varsler"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Emnevarsler"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andre lyder"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tastaturtoner"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Skjermlåslyder"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldri varsler fra denne appen"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandle som prioritert"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Ikke kutt lyden for varsler fra denne appen når «Ikke forstyrr» er angitt som «Bare prioriterte»"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillat smugtitting"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"La denne appen legge vekt på bestemte varsler ved å vise dem kjapt på skjermen"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Overstyr Ikke forstyrr"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"La disse varslene fortsette å forstyrre når Ikke forstyrr er angitt til Bare prioriterte"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skjul sensitivt innhold"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Når enheten er låst, skjules innhold i denne appens varsler som kan avsløre privat informasjon"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Skjul innhold i disse varslene som kan vise personlig informasjon når enheten er låst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokkert"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitivt"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Endre til Bare alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Bytt til Alltid forstyrr"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ingen skjermforstyrrelser"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Unngå at varsler som er dempet når «Ikke forstyrr»-modusen er slått på, vises på skjermen"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Ikke noe varsellys"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Unngå at varsler som er dempet når «Ikke forstyrr»-modusen er slått på, får lyset til å blinke"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-kode for å løsne apper"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Krev passord for å løsne apper"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten under løsning av apper"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Jobbprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbeidsprofilen administreres av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrert av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentell)"</string>
@@ -2711,9 +2667,9 @@
     <string name="encrypt_require_pin" msgid="2063945047845243752">"Krev PIN-kode for å starte enheten"</string>
     <string name="encrypt_require_pattern" msgid="6898479411004015810">"Krev mønster for å starte enheten"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"Krev passord for å starte enheten"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei takk"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei takk"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei takk"</string>
+    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei, takk"</string>
+    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei, takk"</string>
+    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei, takk"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vil du kreve PIN-kode?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vil du kreve mønster?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vil du kreve passord?"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Varsler"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Vanlig"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokkér"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Sensitivt innhold er skjult"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritert"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ingen smugtitting"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Jobb"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokkert"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritert"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Sensitivt innhold er skjult"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ingen smugtitting"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med nettadresser på domenet"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Avslått av administratoren"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurer apper"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Velg profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Apptillatelser"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper har ekstra tilgang"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper er tillatt"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Fargemodus for bilder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Bruk sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skjermskala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"skjerm tetthet zoom skala skalering"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Liten"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Vanlig"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stor"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Større"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Størst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Egendefinert (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Se alle"</string>
+    <string name="see_less" msgid="1250265310929558370">"Se mindre"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Frakoblet"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> av dataen er brukt"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apper er installert"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> av <xliff:g id="SIZE2">%2$s</xliff:g> er brukt"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Lysstyrke som kan tilpasses, er slått PÅ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Lysstyrke som kan tilpasses, er slått AV"</string>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index 112b68d..e8e2aa6 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ठूलो"</item>
     <item msgid="7786168277516233536">"विशाल"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"निकै बिस्तारो"</item>
-    <item msgid="2361722960903353554">"ढिलो"</item>
-    <item msgid="1145554631248513562">"साधारण"</item>
-    <item msgid="7553665153391107454">"छिटो"</item>
-    <item msgid="1370673569131070146">"झन छिटो"</item>
-    <item msgid="4648206845228970803">"ज्यादै छिटो"</item>
-    <item msgid="4977949754169483251">"तीव्र"</item>
-    <item msgid="6106302964845503577">"धेरै तीव्र"</item>
-    <item msgid="6800277205640837264">"सबभन्दा छिटो"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"धेरै कम"</item>
-    <item msgid="2692137425242433765">"कम"</item>
-    <item msgid="3332408460740717754">"साधारण"</item>
-    <item msgid="4907380534957572531">"उच्च"</item>
-    <item msgid="4699640516390840297">"निकै उच्च"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"स्क्यान गरिँदै..."</item>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index e07200c..b243e32 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्डहरू"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"प्रशासकद्वारा असक्षम पारियो"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"औंठाछाप"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"निम्नको लागि औठाछाप प्रयोग गर्नुहोस्"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डकमा ट्याब्लेट राख्दा वा झिक्दा आवाज नबजाउनुहोस्"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डकमाफोन राख्दा वा झिक्दा आवाज नबजाउनुहोस्"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाताहरू"</string>
-    <string name="category_personal" msgid="1299663247844969448">"व्यक्तिगत"</string>
-    <string name="category_work" msgid="8699184680584175622">"काम"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफाइल खाताहरू - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"व्यक्तिगत प्रोफाइल खाताहरू"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्य खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"असक्षम गरियो"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"सधैं खुल्‍ला"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"फाइल इन्क्रिप्सनमा रूपान्तरण गर्नुहोस्"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"रुपान्तरण गर्नुहोस्…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"पहिल्यै फाइल इन्क्रिप्ट गरिएको छ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"इन्क्रिप्सन आधारित फाइलमा रुपान्तरण गर्दै"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"डेटा विभाजनलाई इन्क्रिप्सन आधारित फाइलमा रूपान्तर गर्नुहोस्।\n !!चेतावनी!! यसले तपाईँको सबै डेटा मेट्नेछ।\n यो विशेषता अल्फा चरणमा छ, र ठीकसँग काम नगर्न सक्छ।\n जारी गर्न \'हटाएर रुपान्तरण गर्नुहोस्...\' मा थिच्नुहोस्।"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"हटाएर रूपान्तरण गर्नुहोस्..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रिन बन्द हुन्छ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रियता पछि"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"सेटिङहरू"</string>
     <string name="print_settings" msgid="4742428530112487843">"मुद्रण"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"प्रिन्ट सेवाहरु"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>प्रयोग गर्ने हो?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"तपाईँको कागजात प्रिन्टरमा जाँदा एक वा धेरै सर्वरहरूमा पास हुनसक्छ।"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कुनै पनि सेवाहरू स्थापित छैनन्"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कुनै प्रिन्टरहरु भेटाईएन"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिङहरू"</string>
@@ -1827,7 +1830,7 @@
     <string name="battery_saver" msgid="1426682272004907982">"ब्याट्री सेभर"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वतः खोल्नुहोस्"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कहिले पनि होइन"</string>
-    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%%१$ ब्याट्रीमा"</string>
+    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"%1$s ब्याट्रीमा"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रक्रिया तथ्याङ्क"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चालु रहने प्रक्रियाहरूको बारेको geeky तथ्याङ्क"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"मेमोरी प्रयोग"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"पूर्ण हटवर्ड शब्द र अन्तरक्रिया"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"पाठको लागि सरल बोली"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"यो आवाज प्रविष्ट सेवाले आफ्नो तर्फबाट सधैं-आवाज अनुगमन र आवाज नियन्त्रण उपकरण सक्षम प्रदर्शन गर्न सक्षम हुनेछ। यो <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> उपकरणबाट आउँछ। यो सेवाको प्रयोग सक्षम गर्ने हो?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"पाठ-वाचन सेटिङहरू"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"पाठ-बाट-वाणी उत्पादन"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"सधैँ मेरा सेटिङहरू प्रयोग गर्नुहोस्"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ओभरराइड अनुप्रयोग सेटिङहरूमुनि पूर्वनिर्धारित सेटिङहरू"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"पूर्वनिर्धारित सेटिङहरू"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"पूर्वनिर्धारित इन्जिन"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"वाणी संश्लेषण इन्जिनलाई पाठ वाचनको लागि मिलाउनहोस्"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"वाणी दर"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"पाठ वाचन हुने गति"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोलिएको पाठको टोनलाई प्रभावित पार्छ"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"भाषा"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"प्रणाली भाषा प्रयोग गर्नुहोस्"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा चयन गरिएको छैन"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"बोली पाठका लागि भाषा-विशेष आवाज सेट गर्दछ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"एउटा उदाहरणलाई सुन्नुहोस्"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"वाणी संश्लेषणको एउटा छोटो प्रदर्शन बजाउनुहोस्"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"आवाज डेटा स्थापना गर्नुहोस्"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"वाणी संश्लेषणका लागि आवश्यक आवाज डेटा स्थापना गर्नुहोस्"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"भाषण संश्लेषणको लागि चाहिने भ्वाइसहरू पहिले नै राम्रोसँग स्थापित भइसकेको छ।"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"तपाईँका सेटिङहरू परिवर्तन गर्नुहोस्। कस्तो हुन्छ भनेर यो एउटा उदाहरण हो।"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"तपाईँले छनौंट गर्नु भएको इन्जिन चल्न सक्दैन।"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"कन्फिगर गर्नुहोस्"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"अर्को इञ्जिन छान्नुहोस्"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"यो वाणी संश्लेषण इन्जिनले पासवर्ड र क्रेडिट कार्ड नम्बर जस्ता निजी डेटासहित बोलिने सबै पाठ जम्मा गर्न सक्षम हुन सक्छ। यो <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इन्जिनबाट आउँछ। यो वाणी संश्लेषण इन्जिनको उपयोग सक्षम गर्नुहुन्छ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"पाठ वाचकको आउटपुटका लागि यस भाषालाई काम गरिरहेको सञ्जाल जडान आवाश्यक पर्छ।"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"यो वाणी संश्लेषणको एउटा उदाहरण हो।"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"पूर्वनिर्धारित भाषाको वस्तुस्थिति"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> पूर्ण रूपले समर्थित छ"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> नेटवर्क जडान चाहिन्छ"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> समर्थित छैन"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"जाँच गर्दै..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"इन्जिनहरू"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सेटिङहरू"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सक्षम गरियो"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> असक्षम पारियो"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"इञ्जिन सेटिङहरू"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>को लागि सेटिङ गर्दै"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"भाषा र आवाजहरू"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"स्थापित"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"स्थापित छैन"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"महिला"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"पुरुष"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"ध्वनि संश्लेषण इन्जिन स्थापना भयो"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"प्रयोग गर्नुभन्दा पहिले नयाँ इन्जिनलाई सक्रिय गर्नुहोस्।"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"इन्जिन सेटिङहरू सुरुवात गर्नुहोस्"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"रुचाइएको इन्जिन"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"सामान्य"</string>
     <string name="gadget_title" msgid="5519037532720577836">"उर्जा नियन्त्रण"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाइफाइ सेटिङ अपडेट गर्दै"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लुटुथ सेटिङ अपडेट गर्दै"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"पृष्ठभूमि अनुप्रयोगका लागि जवाफ नदिइरहेका अनुप्रयोगहरू देखाउनुहोस्"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"बाह्यमा बल प्रयोगको अनुमति प्राप्त अनुप्रयोगहरू"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"म्यानिफेेस्टको उपेक्षा गरी, कुनै पनि अनुप्रयोगलाई बाह्य भण्डारणमा लेख्न योग्य बनाउँछ"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"गतिविधिहरू रिसाइज गर्नको लागि बाध्य गर्नुहोस्"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"म्यानिफेेस्ट मानहरूको ख्याल नगरी, बहु-विन्डोको लागि सबै रिसाइज गर्न सकिने गतिविधिहरू बनाउँछ।"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा प्रयोग"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"अनुप्रयोग डेटा उपयोग"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"वाहक डेटा लेखा तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"अलार्महरू मात्र"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"पूरै शान्त"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"दृश्य बाधाहरू"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिङटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"पूर्वनिर्धारित सूचना रिङ्गटोन"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कलका लागि भाइब्रेट पनि"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"तपाईँको उपकरण बन्द हुँदा, तपाईँ कसरी सूचनाहरू देखाउन चाहनुहुन्छ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"सूचनाहरू"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"अनुप्रयोग सूचनाहरू"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"शीर्षक सूचनाहरू"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनिहरू"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"प्याड टोनहरू डायल गर्नुहोस्"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्किन लक आवाज"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सबै रोक्नुहोस्"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"यस अनुप्रयोगबाट सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राथमिकताको रूपमा व्यवहार गर्नुहोस्"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"प्राथमिकतामा मात्र बाधा नगर्नुहोस् भन्ने सेट भएको बेला यो अनुप्रयोगका सूचनाहरू सुनिने पार्न अनुमति दिनुहोस्"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"हेर्न अनुमति दिनुहोस्"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"हालको स्क्रिनमा दृश्यका लागि हल्का स्लाइड गरेर  यो अनुप्रयोगले निश्चित सूचनाहरूलाई महत्त्व दिने व्यवस्था मिलाउनुहोस्"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"बाधा नपुर्याउनुहोस् मा ओभरराइड गर्नुहोस्"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"बाधा नपुर्याउनुहोस् प्राथमिकतामा मात्र सेट भएको बेला यी सूचनाहरूबाट हुने अवरोधका लागि अनुमति दिनुहोस्।"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री लुकाउनुहोस्"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"यन्त्र लक भएको बेलामा यो अनुप्रयोगको सूचनाहरूमा निजी जानकारी प्रकट गर्ने सामाग्री लुकाउनुहोस्"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"यन्त्र बन्द हुँदा, यी सूचनाहरूमा सामग्री लुकाउनुहोस् जसबाट निजी जानकारी बाहिर जान सक्छ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरूद्ध गरियो"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राथमिकता"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> सम्मको लागि मात्र अलार्म परिवर्तन गर्नुहोस्"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"सधैं अवरोध गर्ने गरी परिवर्तन गर्नुहोस्"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"कुनै स्क्रिन बाधाहरू छैनन्"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"हालको स्क्रिनमा झलक देखाउने वा देखापर्नबाट बाधा नपुर्याउनुहोस् मार्फत मौन गरिएका सूचनाहरू रोक्नुहोस्"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"कुनै सूचना प्रकाश छैन"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"पल्समा प्रकाशको कारणबाट बाधा नपुर्याउनुहोस् मार्फत मौन गरिएको सूचनाहरू रोक्नुहोस्"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
     <string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"पिन निकाल्नुअघि पासवर्ड सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन गर्दा उपकरण लक गर्नुहोस्"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाइल"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यो कार्य प्रोफाइल निम्नद्वारा व्यवस्थित गरिन्छ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा व्यवस्थापन गरिएको"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रयोगात्मक)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"सूचनाहरू"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"सामान्य"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"रोक्नुहोस्"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"संवेदनशील सामग्री लुकाइएको"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"प्राथमिकता"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"चियाउन मनाही"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"रोकियो"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"प्राथमिकता"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"संवेदनशील सामग्री लुकाइएको"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"चियाउन मनाही"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"डोमेन URLहरू मार्फत"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"प्रशासकद्वारा निष्क्रिय पारिएको"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
     <string name="configure_apps" msgid="6685680790825882528">"अनुप्रयोगहरू कन्फिगर गर्नुहोस्"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string>
     <string name="app_permissions" msgid="4148222031991883874">"अनुप्रयोग अनुमतिहरू"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई थप पहुँच अनुमति छ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई अनुमति छ"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रङ्ग मोड"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB प्रयोग गर्नुहोस्"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"प्रदर्शनको अनुपात"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"घनत्व जुम अनुपात मापन प्रदर्शन गर्नुहोस्"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"सानो"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"सामान्य"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ठूलो"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"थप ठूलो"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"सबैभन्दा ठूलो"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"अनुकूलन (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"सबै हेर्नुहोस्"</string>
+    <string name="see_less" msgid="1250265310929558370">"कम हेर्नुहोस्"</string>
+    <string name="disconnected" msgid="5787956818111197212">"विच्छेद भयो"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"डेटाको <xliff:g id="AMOUNT">%1$s</xliff:g> प्रयोग गरियो"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरू स्थापना गरियो"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> को <xliff:g id="SIZE1">%1$s</xliff:g> प्रयोग गरियो"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"अनुकूलनीय उज्यालोपन सक्रिय छ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"अनुकूलनीय उज्यालोपन निष्क्रिय छ"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 676eb73..06cecda 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Groot"</item>
     <item msgid="7786168277516233536">"Enorm"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Zeer langzaam"</item>
-    <item msgid="2361722960903353554">"Langzaam"</item>
-    <item msgid="1145554631248513562">"Normaal"</item>
-    <item msgid="7553665153391107454">"Snel"</item>
-    <item msgid="1370673569131070146">"Vlug"</item>
-    <item msgid="4648206845228970803">"Behoorlijk vlug"</item>
-    <item msgid="4977949754169483251">"Snel"</item>
-    <item msgid="6106302964845503577">"Zeer snel"</item>
-    <item msgid="6800277205640837264">"Snelst"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Zeer laag"</item>
-    <item msgid="2692137425242433765">"Laag"</item>
-    <item msgid="3332408460740717754">"Normaal"</item>
-    <item msgid="4907380534957572531">"Hoog"</item>
-    <item msgid="4699640516390840297">"Zeer hoog"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scannen..."</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 73bddd6..3efad83 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"\'Mijn locatie\', schermontgrendeling, SIM- en certificaatopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, certificaatopslag vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Uitgeschakeld door beheerder"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Vingerafdrukbeheer"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Vingerafdruk voor"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Geen geluid afspelen wanneer de tablet in het dockstation wordt geplaatst of uit het dockstation wordt verwijderd"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Geen geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persoonlijk"</string>
-    <string name="category_work" msgid="8699184680584175622">"Werk"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Werkprofielaccounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Persoonlijke profielaccounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Werkaccount - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Uitgeschakeld"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Altijd aan"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisch"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteren naar versleuteling op basis van bestanden"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converteren…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Al versleuteld op basis van bestanden"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Converteren naar versleuteling op basis van bestanden"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Gegevenspartitie converteren naar versleuteling op basis van bestanden.\n !!Waarschuwing!! Al je gegevens worden gewist.\n Deze functie bevindt zich in de alfafase en werkt mogelijk niet correct.\n Druk op \'Wissen en converteren\' om door te gaan."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Wissen en converteren…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Instellingen"</string>
     <string name="print_settings" msgid="4742428530112487843">"Afdrukken"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Afdrukservices"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Je document kan via een of meer servers naar de printer worden verzonden."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen services geïnstalleerd"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Geen printers gevonden"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellingen"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Volledige hotword- en interactieservice"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Eenvoudige spraak-naar-tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Deze spraakinvoerservice kan doorlopend de spraakinvoer volgen en namens jou spraakgestuurde apps bedienen. De service wordt geleverd door de <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Wil je het gebruik van deze service inschakelen?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Instellingen tekst-naar-spraak"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Spraakuitvoer"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Mijn instellingen gebruiken"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Onderstaande standaardinstellingen overschrijven instellingen van app"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standaardinstellingen"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Standaardengine"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"De spraaksynthese-engine instellen die wordt gebruikt voor gesproken tekst"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Spreeksnelheid"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Snelheid waarmee de tekst wordt gesproken"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hoogte"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Is van invloed op de toon van de gesproken tekst"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Systeemtaal gebruiken"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal niet geselecteerd"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"De taalspecifieke stem voor de gesproken tekst instellen"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Luisteren naar een voorbeeld"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Een korte demonstratie van spraaksynthese afspelen"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Spraakgegevens installeren"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"De stemgegevens voor spraaksynthese installeren"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Stemmen die zijn vereist voor spraaksynthese, zijn al correct geïnstalleerd"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Je instellingen zijn gewijzigd. Dit is een voorbeeld van hoe ze klinken."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"De door jou geselecteerde engine kan niet worden uitgevoerd."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configureren"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Een andere engine kiezen"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Deze engine voor spraaksynthese kan mogelijk alle tekst verzamelen die wordt gesproken, waaronder persoonlijke gegevens zoals wachtwoorden en creditcardnummers. Deze engine is afkomstig van de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-engine. Het gebruik van deze engine voor spraaksynthese inschakelen?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Deze taal heeft een werkende netwerkverbinding nodig voor tekst-naar-spraak-uitvoer."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dit is een voorbeeld van spraaksynthese"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status van standaardtaal"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> wordt volledig ondersteund"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> heeft een netwerkverbinding nodig"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> wordt niet ondersteund"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Controleren..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Instellingen voor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is ingeschakeld"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is uitgeschakeld"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Zoekmachine-instellingen"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Instellingen voor <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Talen en stemmen"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Geïnstalleerd"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Niet geïnstalleerd"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Vrouw"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Man"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Spraaksynthese-engine is geïnstalleerd"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Nwe engine insch. vóór gebr."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Engine-instellingen openen"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Voorkeursengine"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Algemeen"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiebeheer"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wifi-instelling bijwerken"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-instelling bijwerken"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"\'App reageert niet\' weerg. voor apps op achtergr."</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Toestaan van apps op externe opslag afdwingen"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Hierdoor komt een app in aanmerking om te worden geschreven naar externe opslag, ongeacht de manifestwaarden"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Formaat activiteiten geforceerd aanpasbaar maken"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Hiermee wordt het formaat van alle activiteiten aanpasbaar gemaakt, ongeacht de manifestwaarden."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gegevensgebruik van app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"De door de provider berekende gegevens kunnen afwijken van de berekening van je apparaat."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alleen alarmen"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Totale stilte"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuele onderbrekingen"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standaardbeltoon voor meldingen"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Ook trillen voor oproepen"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hoe moeten meldingen worden weergegeven wanneer je apparaat is vergrendeld?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Meldingen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Onderwerpmeldingen"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andere geluiden"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toetsenbloktonen"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Geluid v. schermvergrendeling"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nooit meldingen van deze app weergeven"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandelen als prioriteit"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Laat de meldingen van deze app horen wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Korte weergave toestaan"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Laat deze app bepaalde meldingen benadrukken door ze kort in beeld te schuiven op het huidige scherm"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'Niet storen\' overschrijven"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Deze meldingen nog steeds laten onderbreken wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Gevoelige inhoud verbergen"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Inhoud in meldingen van deze app verbergen die privégegevens openbaar kan maken wanneer het apparaat is vergrendeld"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Content in deze meldingen die privé-informatie kan vrijgeven, verbergen wanneer het apparaat is vergrendeld"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeerd"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Gevoelig"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Wijzigen in \'Alleen alarmen\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Wijzigen in \'Altijd onderbreken\'"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Geen schermonderbreking"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', op het huidige scherm verschijnen"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Geen meldingslampje"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', het lampje laten knipperen"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vraag pin voor losmaken"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vraag wachtwoord voor losmaken"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Apparaat vergrendelen wanneer items worden losgemaakt"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dit werkprofiel wordt beheerd door:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Beheerd door <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Meldingen"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normaal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokkeren"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Gevoelige inhoud verborgen"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioriteit"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Geen korte weergave"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlijk"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Geblokkeerd"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioriteit"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Gevoelige inhoud verborgen"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Geen korte weergave"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Met domein-URL\'s"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Uitgeschakeld door beheerder"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps configureren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profiel kiezen"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App-machtigingen"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Extra toegang verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Kleurenmodus voor afbeeldingen"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB gebruiken"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Weergaveschaal"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"weergavedichtheid zoomschaal schalen"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Klein"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normaal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Groot"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Groter"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Grootst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Aangepast (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Alles weergeven"</string>
+    <string name="see_less" msgid="1250265310929558370">"Minder weergeven"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Verbinding verbroken"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> van data gebruikt"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps geïnstalleerd"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> van <xliff:g id="SIZE2">%2$s</xliff:g> gebruikt"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Aanpasbare helderheid is AAN"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Aanpasbare helderheid is UIT"</string>
 </resources>
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa-rIN/arrays.xml
index f6c758c..952a807 100644
--- a/res/values-pa-rIN/arrays.xml
+++ b/res/values-pa-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ਵੱਡਾ"</item>
     <item msgid="7786168277516233536">"ਵਿਸ਼ਾਲ"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ਬਹੁਤ ਹੌਲੀ"</item>
-    <item msgid="2361722960903353554">"ਹੌਲੀ"</item>
-    <item msgid="1145554631248513562">"ਸਧਾਰਨ"</item>
-    <item msgid="7553665153391107454">"ਤੇਜ਼"</item>
-    <item msgid="1370673569131070146">"ਵੱਧ ਤੇਜ਼"</item>
-    <item msgid="4648206845228970803">"ਬਹੁਤ ਤੇਜ਼"</item>
-    <item msgid="4977949754169483251">"ਤੇਜ਼"</item>
-    <item msgid="6106302964845503577">"ਬਹੁਤ ਤੇਜ਼"</item>
-    <item msgid="6800277205640837264">"ਸਭ ਤੋਂ ਵੱਧ ਤੇਜ਼"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ਬਹੁਤ ਘੱਟ"</item>
-    <item msgid="2692137425242433765">"ਘੱਟ"</item>
-    <item msgid="3332408460740717754">"ਸਧਾਰਨ"</item>
-    <item msgid="4907380534957572531">"ਉੱਚ"</item>
-    <item msgid="4699640516390840297">"ਬਹੁਤ ਤੇਜ਼"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</item>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 6dcb39c..f8d164a 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, SIM ਕਾਰਡ ਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈਟ ਕਰੋ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈਟ ਕਰੋ"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"ਪਾਸਵਰਡ"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਈ ਗਈ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ਡੌਕ ਤੋਂ ਟੈਬਲੇਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ਡੌਕ ਤੋਂ ਫੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ਖਾਤੇ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ਨਿੱਜੀ"</string>
-    <string name="category_work" msgid="8699184680584175622">"ਦਫ਼ਤਰ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ਕੰਮ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ਆਟੋਮੈਟਿਕ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ਤਬਦੀਲ ਕਰੋ ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ਫ਼ਾਈਲ ਪਹਿਲਾਂ ਤੋਂ ਇਨਕ੍ਰਿਪਟਡ ਹੈ"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ਫ਼ਾਈਲ ਆਧਾਰਿਤ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ਡੈਟਾ ਪਾਰਟੀਸ਼ਨ ਨੂੰ ਫ਼ਾਈਲ ਆਧਾਰਿਤ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ\n !!ਚੇਤਾਵਨੀ!! ਇਹ ਤੁਹਾਡੇ ਸਾਰੇ ਡੈਟੇ ਨੂੰ ਸਾਫ਼ ਕਰ ਦੇਵੇਗਾ\n ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਅਲਫਾ ਹੈ, ਅਤੇ ਸ਼ਾਇਦ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰੇ।\n ਜਾਰੀ ਰੱਖਣ ਲਈ \'ਮਿਟਾਓ ਅਤੇ ਤਬਦੀਲ ਕਰੋ...\' ਨੂੰ ਦਬਾਓ।"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ਮਿਟਾਓ ਅਤੇ ਤਬਦੀਲ ਕਰੋ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ਸਲੀਪ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੈ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਦੀ ਕਿਰਿਆਹੀਣਤਾ ਤੋਂ ਬਾਅਦ"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="print_settings" msgid="4742428530112487843">"ਪ੍ਰਿੰਟਿੰਗ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਵਰਤਣਾ ਹੈ?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ਤੁਹਾਡਾ ਦਸਤਾਵੇਜ਼ ਪ੍ਰਿੰਟਰ ਵਿੱਚ ਜਾਣ ਲਈ ਇੱਕ ਜਾਂ ਦੋ ਸਰਵਰਾਂ ਵਿੱਚੋਂ ਲੰਘਦਾ ਹੈ।"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ਕੋਈ ਸੇਵਾਵਾਂ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ਕੋਈ ਪ੍ਰਿੰਟਰ ਨਹੀਂ ਮਿਲੇ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ਸੈਟਿੰਗਾਂ"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"ਪੂਰਾ ਹੌਟਵਰਡ ਅਤੇ ਇੰਟਰੈਕਸ਼ਨ"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ਸਧਾਰਨ ਸਪੀਚ ਟੂ ਟੈਕਸਟ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ਇਹ ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ ਵੌਇਸ ਨਿਰੀਖਣ ਪਰਫੌਰਮ ਕਕਰ ਵਿੱਚ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵੌਇਸ ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ। ਇਹ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਆਉਂਦੀ ਹੈ। ਕੀ ਇਸ ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ਟੈਕਸਟ-ਟੂ-ਸਪੀਚ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"ਟੈਕਸਟ-ਟੂ-ਸਪੀਚ ਆਉਟਪੁਟ"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ਹਮੇਸ਼ਾਂ ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ ਵਰਤੋ"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ਹੇਠਾਂ ਡਿਫੌਲਟ ਸੈਟਿੰਗਾਂ ਐਪ ਸੈਟਿੰਗਾਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਦੀਆਂ ਹਨ"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ਡਿਫੌਲਟ ਸੈਟਿੰਗਜ਼"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ਡਿਫੌਲਟ ਇੰਜਣ"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ਬੋਲੇ ਗਏ ਟੈਕਸਟ ਲਈ ਵਰਤੇ ਜਾਣ ਲਈ ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਇੰਜਣ ਸੈਟ ਕਰਦਾ ਹੈ"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"ਸਪੀਚ ਰੇਟ"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ਸਪੀਡ ਜਿਸਤੇ ਟੈਕਸਟ ਬੋਲਿਆ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ਪਿਚ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ਬੋਲੇ ਗਏ ਟੈਕਸਟ ਦੀ ਟੋਨ ਤੇ ਅਸਰ ਪਾਉਂਦਾਾ ਹੈ"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ਭਾਸ਼ਾ"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"ਸਿਸਟਮ ਭਾਸ਼ਾ ਵਰਤੋ"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ਭਾਸ਼ਾ ਨਹੀਂ ਚੁਣੀ"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ਬੋਲੇ ਗਏ ਟੈਕਸਟ ਲਈ ਭਾਸ਼ਾ-ਵਿਸ਼ੇਸ਼ ਵੌਇਸ ਸੈਟ ਕਰਦਾ ਹੈ"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ਇੱਕ ਉਦਾਹਰਨ ਲਈ ਸੁਣੋ"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਦਾ ਇੱਕ ਛੋਟਾ ਪ੍ਰਦਰਸ਼ਨ ਪਲੇ ਕਰੋ"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ਵੌਇਸ ਡਾਟਾ ਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਲਈ ਲੁੜੀਂਦਾ ਵੌਇਸ ਡਾਟਾ ਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਲਈ ਲੁੜੀਦੀਆਂ ਵੌਇਸਿਜ ਪਹਿਲਾਂ ਹੀ ਸਹੀ ਢੰਗ ਨਾਲ ਇੰਸਟੌਲ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ਤੁਹਾਡੀਆਂ ਸੈਟਿੰਗਾਂ ਬਦਲੀਆਂ ਗਈਆਂ ਹਨ। ਇਹ ਇਸਦਾ ਇੱਕ ਉਦਾਹਰਨ ਹੈ ਕਿ ਉਹ ਕਿਵੇਂ ਅਵਾਜ਼ ਕਰਦੀਆਂ ਹਨ।"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਚੁਣਿਆ ਗਿਆ ਇੰਜਣ ਚੱਲ ਨਹੀਂ ਸਕਦਾ।"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ਕੌਂਫਿਗਰ ਕਰੋ"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ਦੂਜਾ ਇੰਜਣ ਚੁਣੋ"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ਇਹ ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਇੰਜਣ ਉਹ ਸਾਰਾ ਟੈਕਸਟ ਇਕੱਤਰ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋ ਸਕਦਾ ਹੈ, ਜੋ ਬੋਲਿਆ ਜਾਏਗਾ, ਨਿੱਜੀ ਡਾਟਾ ਸਮੇਤ ਜਿਵੇਂ ਪਾਸਵਰਡ ਅਤੇ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ। ਇਹ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ਇੰਜਣ ਤੋਂ ਆਉਂਦਾ ਹੈ। ਕੀ ਇਸ ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਇੰਜਣ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ਇਸ ਭਾਸ਼ਾ ਲਈ ਟੈਕਸਟ-ਟੂ-ਸਪੀਚ ਆਉਟਪੁਟ ਲਈ ਇੱਕ ਚਾਲੂ ਨੈਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ਇਹ ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਦਾ ਇੱਕ ਉਦਾਹਰਨ ਹੈ"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ਡਿਫੌਲਟ ਭਾਸ਼ਾ ਸਥਿਤੀ"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਮਰਥਿਤ ਹੈ"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ਲਈ ਨੈਟਵਰਕ ਕਨੈਕਸ਼ਨ ਲੁੜੀਂਦਾ ਹੈ"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"ਇੰਜਣ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ਸੈਟਿੰਗਾਂ"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ਸਮਰਥਿਤ ਹੈ"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ਅਸਮਰਥਿਤ ਹੈ"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"ਇੰਜਣ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> ਲਈ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ਭਾਸ਼ਾਵਾਂ ਅਤੇ ਵੌਇਸਿਜ"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ਇੰਸਟੌਲ ਕੀਤਾ"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ਇਸਤਰੀ"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ਪੁਰਸ਼"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"ਸਪੀਚ ਸਿੰਥੈਸਿਸ ਇੰਜਣ ਇੰਸਟੌਲ ਕੀਤਾ"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਨਵਾਂ ਇੰਜਣ ਸਮਰੱਥ ਬਣਾਓ।"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ਇੰਜਨ ਸੈਟਿੰਗਾਂ ਲੌਂਚ ਕਰੋ"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ਤਰਜੀਹੀ ਇੰਜਣ"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ਸਧਾਰਨ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ਪਾਵਰ ਨਿਯੰਤਰਣ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi ਸੈਟਿੰਗ ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ਸੈਟਿੰਗ ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ਪਿਛੋਕੜ ਐਪਸ ਲਈ ਐਪਸ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੇ ਡਾਇਲੌਗ ਦਿਖਾਓ"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"ਐਪਸ ਨੂੰ ਬਾਹਰਲੇ ਤੇ ਜ਼ਬਰਦਸਤੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ਇੱਕ ਐਪ ਨੂੰ ਬਾਹਰਲੀ ਸਟੋਰੇਜ ਤੇ ਲਿਖਣ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ, ਮੈਨੀਫੈਸਟ ਵੈਲਯੂਜ ਤੇ ਵਿਚਾਰ ਕੀਤੇ ਬਿਨਾਂ"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"ਮੁੜ-ਆਕਾਰ ਬਦਲਣ ਲਈ ਸਰਗਰਮੀਆਂ \'ਤੇ ਜ਼ੋਰ ਦਿਓ"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"ਮਲਟੀ-ਵਿੰਡੋ ਲਈ ਸਾਰੀਆਂ ਸਰਗਰਮੀਆਂ ਨੂੰ ਮੁੜ-ਆਕਾਰ ਵਿੱਚ ਲਿਆਉਂਦੀ ਹੈ, ਚਾਹੇ ਮੈਨੀਫੈਸਟ ਵੈਲਯੂਜ਼ ਕੁਝ ਵੀ ਹੋਣ।"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ਕੇਵਲ ਅਲਾਰਮ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ਕੁਲ ਚੁੱਪੀ"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"ਦਿੱਖ ਰੁਕਾਵਟਾਂ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ਫੋਨ ਰਿੰਗਟੋਨ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ਡਿਫੌਲਟ ਸੂਚਨਾ ਰਿੰਗਟੋਨ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਵਾਈਬ੍ਰੇਟ ਵੀ ਕਰੋ"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ਜਦੋਂ ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਲੌਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਕਿਵੇਂ ਦਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ਐਪ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"ਵਿਸ਼ਾ ਸੂਚਨਾਵਾਂ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ਹੋਰ ਅਵਾਜ਼ਾਂ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ਡਾਇਲ ਪੈਡ ਟੋਨਾਂ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲੌਕ ਕਰਨ ਦੀਆਂ ਅਵਾਜ਼ਾਂ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲੌਕ ਕਰੋ"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ਇਸ ਐਪ ਤੋਂ ਕਦੇ ਵੀ ਸੂਚਨਾਵਾਂ ਨਾ ਦਿਖਾਓ"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ਤਰਜੀਹੀ ਦੇ ਤੌਰ ਤੇ ਵਿਹਾਰ ਕਰੋ"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਸੁਣਨ ਦਿਓ ਜਦੋਂ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਕੇਵਲ ਤਰਜੀਹੀ ਤੇ ਸੈਟ ਕੀਤਾ ਗਿਆ ਹੋਵੇ"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"ਪੀਕਿੰਗ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ਇਸ ਐਪ ਨੂੰ ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਤੇ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਸੰਖੇਪ ਵਿੱਚ ਸਲਾਈਡ ਕਰਕੇ ਕੁਝ ਸੂਚਨਾਵਾਂ ਤੇ ਜ਼ੋਰ ਦੇਣ ਦਿਓ"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਿਰਫ਼ ਤਰਜੀਹ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਲੁਕਾਓ"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"ਜਦੋਂ ਡਿਵਾਈਸ ਲੌਕ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਉਹ ਸਮੱਗਰੀ ਲੁਕਾਓ, ਜਿਸ ਨਾਲ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪ੍ਰਗਟ ਹੋ ਸਕਦੀ ਹੈ"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"ਜਦੋਂ ਡੀਵਾਈਸ ਲੌਕ ਕੀਤੀ ਹੋਵੇ, ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਦਿੱਤੀ ਇਹੋ ਜਿਹੀ ਸਮੱਗਰੀ ਨੂੰ ਲੁਕਾਓ ਜਿਸ ਨਾਲ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਪ੍ਰਗਟ ਹੋ ਸਕਦੀ ਹੈ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ਬਲੌਕ ਕੀਤਾ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ਤਰਜੀਹ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ਸੰਵੇਦਨਸ਼ੀਲ"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ਅਲਾਰਮ ਨੂੰ ਸਿਰਫ਼ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ਤੱਕ ਬਦਲੋ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ਹਮੇਸ਼ਾਂ ਵਿਘਨ ਪਾਓ ਵਿੱਚ ਬਦਲੋ"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ਕੋਈ ਸਕਰੀਨ ਰੁਕਾਵਟਾਂ ਨਹੀਂ"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੁਆਰਾ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਮੌਜੂਦਾ ਸਕਰੀਨ \'ਤੇ ਝਲਕਣ ਅਤੇ ਵਿਖਾਈ ਦੇਣ ਤੋਂ ਰੋਕੋ"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"ਕੋਈ ਸੂਚਨਾ ਬੱਤੀ ਨਹੀਂ"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੁਆਰਾ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬੱਤੀ ਨੂੰ ਜਗਮਗਾਉਣ ਤੋਂ ਰੋਕੋ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ਐਪ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ਇਸ ਡਿਵਾਈਸ ਬਾਰੇ ਫੀਡਬੈਕ ਭੇਜੋ"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ PIN ਮੰਗੋ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਮੰਗੋ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ਅਨਪਿੰਨ ਕਰਨ ਵੇਲੇ ਡਿਵਾਈਸ ਲੌਕ ਕਰੋ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ਇਹ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਇਸ ਵੱਲੋਂ ਵਿਵਸਥਿਤ ਕੀਤੀ ਗਈ ਹੈ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ਪ੍ਰਯੋਗਾਤਮਿਕ)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ਸਧਾਰਨ"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"ਬਲੌਕ ਕਰੋ"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਲੁਕਾਈ ਗਈ"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ਤਰਜੀਹ"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"ਝਾਤੀ ਨਾ ਮਾਰੋ"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ਨਿੱਜੀ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ਦਫ਼ਤਰ"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ਬਲੌਕ ਕੀਤਾ"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ਤਰਜੀਹ"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਲੁਕਾਈ ਗਈ"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"ਝਾਤੀ ਨਾ ਮਾਰੋ"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ਡੋਮੇਨ URL ਨਾਲ"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਅਸਮਰਥਿਤ।"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ਉੱਨਤ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ਐਪਸ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ਐਪ ਅਨੁਮਤੀਆਂ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ਦੇ <xliff:g id="COUNT_0">%d</xliff:g> ਨੂੰ ਵਾਧੂ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ਦੇ <xliff:g id="COUNT_0">%d</xliff:g> ਐਪਸ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ਤਸਵੀਰ ਰੰਗ ਮੋਡ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ਡਿਸਪਲੇਅ ਸਕੇਲ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ਡਿਸਪਲੇਅ ਡੈਨਸਿਟੀ ਜ਼ੂਮ ਸਕੇਲ ਸਕੇਲਿੰਗ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ਛੋਟਾ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ਸਧਾਰਨ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ਵੱਡਾ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ਕਾਫ਼ੀ ਵੱਡਾ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ਸਭ ਤੋਂ ਵੱਡਾ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ਕਸਟਮ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"ਸਭ ਵੇਖੋ"</string>
+    <string name="see_less" msgid="1250265310929558370">"ਘੱਟ ਵੇਖੋ"</string>
+    <string name="disconnected" msgid="5787956818111197212">"ਡਿਸਕਨੈਕਟ ਹੋਇਆ"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ਡੈਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਸਥਾਪਤ ਹੋਈਆਂ"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> ਵਿੱਚੋਂ <xliff:g id="SIZE1">%1$s</xliff:g> ਵਰਤਿਆ"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"ਅਨੁਕੂਲ ਚਮਕ ਚਾਲੂ ਹੈ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"ਅਨੁਕੂਲ ਚਮਕ ਬੰਦ ਹੈ"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 23c0186..704d41e 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Duży"</item>
     <item msgid="7786168277516233536">"Ogromny"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Bardzo wolno"</item>
-    <item msgid="2361722960903353554">"Wolno"</item>
-    <item msgid="1145554631248513562">"Normalnie"</item>
-    <item msgid="7553665153391107454">"Szybko"</item>
-    <item msgid="1370673569131070146">"Trochę szybciej"</item>
-    <item msgid="4648206845228970803">"Szybciej"</item>
-    <item msgid="4977949754169483251">"Jeszcze szybciej"</item>
-    <item msgid="6106302964845503577">"Bardzo szybko"</item>
-    <item msgid="6800277205640837264">"Najszybciej"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Bardzo niskie"</item>
-    <item msgid="2692137425242433765">"Niskie"</item>
-    <item msgid="3332408460740717754">"Normalne"</item>
-    <item msgid="4907380534957572531">"Wysokie"</item>
-    <item msgid="4699640516390840297">"Bardzo wysokie"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Trwa skanowanie..."</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a6dd4a8..29cd4b6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Wyłączone przez administratora"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odcisk palca"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Zarządzaj odciskami"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Używaj odcisku palca do"</string>
@@ -549,7 +550,7 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Połącz"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Rozłącz"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Sparuj i połącz"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Rozłącz parę"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Anuluj sparowanie"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Rozłącz i anuluj parowanie"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcje…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Zaawansowane"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Nie odtwarzaj dźwięku podczas umieszczania tabletu w doku i wyjmowania go"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konta"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobiste"</string>
-    <string name="category_work" msgid="8699184680584175622">"Praca"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Konta profili do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Konta profili osobistych"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Konto do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Wyłączone"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Zawsze włączone"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatycznie"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Przekształć na szyfrowanie plików"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Przekształć…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Pliki są już zaszyfrowane"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Przekształcanie na szyfrowanie plików"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Przekształć zwykłą partycję danych w system szyfrowania plików.\n !!Ostrzeżenie!! Spowoduje to wykasowanie wszystkich Twoich danych.\n Ta funkcja jest w wersji alfa i może działać nieprawidłowo.\n Naciśnij „Wyczyść i przekształć…”, by kontynuować."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Wyczyść i przekształć…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drukowanie"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Usługi drukowania"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Włączyć <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Zanim dokument dotrze do drukarki, może przejść przez jeden lub kilka serwerów."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Brak zainstalowanych usług"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nie znaleziono drukarek"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ustawienia"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Pełne słowo-klucz i interakcja"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Prosta zamiana mowy na tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ta usługa głosowego wprowadzania tekstu będzie mogła nieustannie monitorować aktywność głosową i sterować aplikacjami z włączoną obsługą głosową w Twoim imieniu. Pochodzi z tej aplikacji: <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Włączyć ją?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Zamiana tekstu na mowę"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Zamiana tekstu na mowę"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Używaj moich ustawień"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Poniższe ustawienia domyślne zastępują ustawienia aplikacji."</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Ustawienia domyślne"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Mechanizm domyślny"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Ustaw mechanizm syntezy mowy do obsługi tekstu mówionego"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Szybkość mowy"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Szybkość czytania tekstu"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tony"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Określa ton czytanego tekstu"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Język"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Użyj języka systemu"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nie wybrano języka"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ustawia zależny od języka głos dla czytanych tekstów"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Posłuchaj przykładu"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Odtwórz krótką prezentację syntezy mowy"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Zainstaluj dane głosowe"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Zainstaluj dane głosowe wymagane do syntezy mowy"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Dane głosowe wymagane do syntezy mowy zostały już poprawnie zainstalowane"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ustawienia zostały zmienione. Oto przykład aktualnie skonfigurowanego brzmienia."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Nie można uruchomić wybranego mechanizmu."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguruj"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Wybierz inny mechanizm"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ten mechanizm syntezy mowy może gromadzić cały odczytywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Nazwa mechanizmu to <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Włączyć ten mechanizm syntezy mowy?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Do przetwarzania tekstu na mowę w tym języku wymagane jest działające połączenie sieciowe."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"To jest przykład syntezy mowy"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Stan domyślnego języka"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Język <xliff:g id="LOCALE">%1$s</xliff:g> jest w pełni obsługiwany"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Język <xliff:g id="LOCALE">%1$s</xliff:g> wymaga połączenia z siecią"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Język <xliff:g id="LOCALE">%1$s</xliff:g> nie jest obsługiwany"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Sprawdzam..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mechanizmy"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ustawienia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mechanizm <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> jest włączony"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Mechanizm <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> jest wyłączony"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Ustawienia mechanizmu"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Ustawienia <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Języki i głosy"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Zainstalowano"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nie zainstalowano"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kobieta"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mężczyzna"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Zainstalowano mechanizm syntezy mowy"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Najpierw włącz nowy mechanizm."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Otwórz ustawienia mechanizmu"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferowany mechanizm"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Ogólne"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Zarządzanie energią"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Aktualizowanie ustawień Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualizowanie ustawień Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Pokaż okno Aplikacja Nie Reaguje dla aplikacji w tle"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Wymuś zezwalanie na aplikacje w pamięci zewn."</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Pozwala na zapis aplikacji w pamięci zewn. niezależnie od wartości w pliku manifestu"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Wymuś zmianę rozmiaru okien aktywności"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Umożliwia zmianę rozmiaru wszystkich okien aktywności w trybie wielu okien niezależnie od ustawień w pliku manifestu."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Przesył danych w aplikacji"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tylko alarmy"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Całkowita cisza"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Powiadomienia wizualne"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Domyślny dzwonek powiadomień"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja przy połączeniach"</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Jak mają pokazywać się powiadomienia, gdy urządzenie jest zablokowane?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Powiadomienia"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Powiadomienia o tematach"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Inne dźwięki"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dźwięki wybierania numeru"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Dźwięki blokady ekranu"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nigdy nie pokazuj powiadomień z tej aplikacji"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Traktuj jako priorytetowe"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Zezwalaj na powiadomienia dźwiękowe z tej aplikacji, gdy opcja Nie przeszkadzać jest ustawiona na Tylko priorytetowe"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Zezwalaj na szybki podgląd powiadomień"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Pozwalaj tej aplikacji na krótkie wyświetlanie niektórych powiadomień na bieżącym ekranie"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zastąp Nie przeszkadzać"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Zezwól na działanie tych powiadomień, gdy Nie przeszkadzać ma ustawienie Tylko priorytetowe"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ukryj poufne treści"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Gdy urządzenie jest zablokowane, w powiadomieniach z tej aplikacji ukrywaj treści, które mogłyby ujawniać prywatne informacje"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Gdy urządzenie jest zablokowane, ukryj treść powiadomień, które mogłyby zawierać prywatne informacje"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Zablokowane"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorytet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Poufne"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmień na same alarmy do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmień na ciągle powiadamianie"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Bez powiadomień na ekranie"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Powiadomienia wyciszone w trybie Nie przeszkadzać nie będą pojawiać się w szybkim podglądzie ani na bieżącym ekranie"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Bez diody powiadomień"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Powiadomienia wyciszone w trybie Nie przeszkadzać nie będą sygnalizowane diodą"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Podaj PIN, aby odpiąć"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Aby odpiąć, poproś o hasło"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Zablokuj urządzenie przy odpinaniu"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil do pracy"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tym profilem do pracy zarządza:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Zarządzane przez: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Funkcja eksperymentalna)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Powiadomienia"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normalne"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Zablokuj"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Poufne treści ukryte"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Priorytetowe"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Bez szybkiego podglądu"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Zablokowane"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priorytetowe"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Poufne treści ukryte"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Bez szybkiego podglądu"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ami domeny"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Wyłączone przez administratora"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Skonfiguruj aplikacje"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Wybierz profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Uprawnienia aplikacji"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Dodatkowy dostęp dozwolony dla <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dozwolone: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
@@ -2978,4 +2927,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Tryb kolorów obrazu"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Użyj sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala wyświetlania"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"wyświetlacz gęstość powiększenie skala skalowanie"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mała"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normalna"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Duża"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Większa"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Największa"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Niestandardowa (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Pokaż wszystko"</string>
+    <string name="see_less" msgid="1250265310929558370">"Pokaż mniej"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Rozłączono"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Użycie danych: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Zainstalowane aplikacje: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Używasz <xliff:g id="SIZE1">%1$s</xliff:g> z <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Automatyczna jasność jest WŁ."</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Automatyczna jasność jest WYŁ."</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 8bbe13c..0ad7256 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Muito devagar"</item>
-    <item msgid="2361722960903353554">"Devagar"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="1370673569131070146">"Mais rápida"</item>
-    <item msgid="4648206845228970803">"Muito rápida"</item>
-    <item msgid="4977949754169483251">"Rápida"</item>
-    <item msgid="6106302964845503577">"Muito rápida"</item>
-    <item msgid="6800277205640837264">"Máxima"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Muito baixa"</item>
-    <item msgid="2692137425242433765">"Baixa"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alta"</item>
-    <item msgid="4699640516390840297">"Muito alta"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Procurando…"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 362139d..17d7da1 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desativada pelo administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Não reproduzir sons ao inserir ou remover o tablet da dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Não reproduzir sons ao inserir ou remover o telefone da dock."</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil pessoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desativada"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre ativada"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para criptografia de arquivos"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Já criptografado com base em arquivos"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Convertendo para criptografia baseada em arquivos"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converter partição de dados para criptografia baseada em arquivos.\n !!Atenção!! Isso limpará todos os seus dados.\n Esse recurso é alfa e pode não funcionar corretamente.\n Pressione \"Limpar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Limpar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Seu documento pode passar por um ou mais servidores até chegar à impressora."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configurações"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Hotword completa e interação"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Conversão simples de fala em texto"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de controle por voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Deseja ativar o uso deste serviço?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configurações da conversão de texto em voz"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Conversão de texto em voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas configurações"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"As configurações padrão abaixo substituem as configurações do app"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Mecanismo padrão"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Definir o mecanismo de síntese de fala a ser usado para texto falado"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de fala"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade em que o texto é falado"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Usar idioma do sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma rápida demonstração da voz sintetizada"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"É necessário instalar os dados de voz para a sintetização da fala"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para sintetização já estão instaladas corretamente"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Suas configurações foram alteradas. Veja um exemplo de como elas ficaram."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"O mecanismo escolhido não pode ser executado."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecione outro mecanismo"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este mecanismo de síntese de fala pode coletar todo texto que será falado, inclusive dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do mecanismo <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Deseja ativar o uso desse mecanismo de síntese de fala?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma conexão de rede ativa para a conversão de texto em voz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Este é um exemplo de sintetização de voz."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status de idioma padrão"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é totalmente suportada"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requer conexão de rede"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportado"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Verificando…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mecanismos"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configurações de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi ativado"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi desativado"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configurações do mecanismo"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configurações para <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas e vozes"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalado"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Não instalado"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminino"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Sintetização de voz instalada"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Ativ. novo mecanismo antes do uso"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configurações do mecanismo"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mecanismo preferencial"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Gerais"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controle de energia"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atualizando configuração de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para app em 2º plano"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forçar permissão de apps em armazenamento externo"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Qualifica apps p/ gravação em armazenamento externo, independentemente de valores de manifestos"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forçar atividades a serem redimensionáveis"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Torna todas as atividades redimensionáveis para várias janelas, independentemente dos valores do manifesto."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silêncio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupções visuais"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação padrão"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Quando o dispositivo estiver bloqueado, como você deseja que as notificações sejam exibidas?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificações"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificações por assunto"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueio de tela"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações deste app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permitir que as notificações deste app sejam ouvidas quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir exibição"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que este app enfatize determinadas notificações, deslizando-as brevemente para visualização na tela atual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar conteúdo confidencial"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Quando o dispositivo estiver bloqueado, ocultar conteúdo das notificações deste app que possa revelar informações particulares"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Quando o dispositivo estiver bloqueado, ocultar conteúdo dessas notificações que possa revelar informações particulares"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Sem interrup de tela"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela atual"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Sem luz de notif."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedir que notifficações silenciadas pelo modo \"Não perturbe\" façam a luz pulsar"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao desafixar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"O perfil de trabalho é gerenciado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerenciado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificações"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normais"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Conteúdo confidencial oculto"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Sem exibição"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueados"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Conteúdo confidencial oculto"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Sem exibição"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permissões do app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps receberam acesso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps permitidos"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usar sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de exibição"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densidade de exibição zoom escala dimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Muito grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Maior"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ver tudo"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desconectado"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de dados usados"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps instalados"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> usados"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"O brilho adaptável está ATIVADO"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"O brilho adaptável está DESATIVADO"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 28ea228..f2352b3 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Muito lenta"</item>
-    <item msgid="2361722960903353554">"Lenta"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="1370673569131070146">"Mais Rápida"</item>
-    <item msgid="4648206845228970803">"Muito rápida"</item>
-    <item msgid="4977949754169483251">"Rápida"</item>
-    <item msgid="6106302964845503577">"Muito rápida"</item>
-    <item msgid="6800277205640837264">"A Mais Rápida"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Muito baixa"</item>
-    <item msgid="2692137425242433765">"Baixa"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alta"</item>
-    <item msgid="4699640516390840297">"Muito alto"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"A procurar..."</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6c06464..c69429a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desativado pelo administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerir impressões dig."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impr. dig. para"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Não reproduzir som ao inserir ou remover o tablet da estação de ancoragem"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Não reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de trabalho – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil pessoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta de trabalho – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desativado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre ativado"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para a encriptação de ficheiros"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Os ficheiros já estão encriptados"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Converter para a encriptação baseada em ficheiros"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converter a partição de dados para a encriptação baseada em ficheiros.\n Aviso! Esta ação eliminará todos os seus dados.\n Esta funcionalidade está na fase alfa e pode não funcionar corretamente.\n Prima \"Limpar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Limpar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"O ecrã desliga-se"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Definições"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"O seu documento pode passar por um ou mais servidores no seu caminho para a impressora."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Definições"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Palavra de ativação e interação completas"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Serviço simples de voz para texto"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada de texto por voz poderá efetuar monitorização de voz permanente e controlar aplicações ativadas por voz em seu nome. É proveniente da aplicação <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Pretende permitir a utilização deste serviço?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Definições de texto para voz"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Saída de texto para voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar sempre as minhas definições"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"As predefinições abaixo substituem as definições da aplicação"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Predefinições"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor predefinido"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Definir o motor de síntese de voz a utilizar para o texto falado"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de voz"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade a que o texto é falado"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonalidade"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta o tom do texto falado"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utilizar idioma do sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz do idioma específico para o texto lido"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Ouvir um exemplo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma breve demonstração de síntese de voz"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalar os dados de voz necessários para a síntese de voz"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para a síntese de voz já estão instaladas correctamente"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"As suas definições foram alteradas. Segue-se um exemplo do respectivo som."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Não é possível executar o motor selecionado"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Escolher outro motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este motor de síntese de discurso pode permitir a recolha de todo o texto que será falado, incluindo dados pessoais, como palavras-passe e números de cartão de crédito. O serviço é fornecido com o motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permitir a utilização deste motor de síntese de discurso?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma ligação de rede ativa para uma saída de síntese de voz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Exemplo de síntese de voz."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Estado do idioma predefinido"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é totalmente suportado"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> necessita de ligação de rede"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportado"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"A verificar..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Definições de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está ativado"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está desactivado"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Definições do motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Definições do <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas e vozes"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalado"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Não instalada"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminino"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor de sintet. fala instalado"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Ative o novo motor antes de utilizar."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar as definições do motor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Geral"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controlo de energia"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"A atualizar definição de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizar a definição do Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar erro \"Aplic. não Resp.\" p/ aplic. 2º plano"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forçar perm. de aplicações no armazenamento ext."</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Qualquer aplic. pode ser gravada no arm. ext., independ. dos valores do manif."</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forçar as atividades a serem redimensionáveis"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Torna todas as atividades redimensionáveis para várias janelas, independentemente dos valores do manifesto."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilização dados da apli."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"A contagem do operador de dados pode diferir do seu dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Apenas alarmes"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silêncio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupções visuais"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação predefinido"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar também para chamadas"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Como pretende que as notificações sejam apresentadas quando o dispositivo está bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificações"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicações"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificações de tópicos"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Sons do teclado"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueio de ecrã"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações desta aplicação"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permitir que as notificações desta aplicação sejam ouvidas quando Não incomodar estiver definido como Apenas prioridade"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir espreitar"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que esta aplicação dê ênfase a determinadas notificações ao deslizá-las brevemente para visualização no ecrã atual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substituir o modo Não incomodar"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver definido como Apenas prioridade"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar conteúdo sensível"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Quando o dispositivo está bloqueado, ocultar o conteúdo nas notificações desta aplicação que possam revelar informações privadas"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Quando o dispositivo estiver bloqueado, ocultar o conteúdo destas notificações que possa revelar informações privadas"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueado"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensível"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Sem interrupções no ecrã"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Evitar que as notificações silenciadas pelo modo Não incomodar surjam no ecrã atual"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Sem luz de notific."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Evitar que as notif. silenc. pelo modo Não incomodar ativem a luz de forma intermitente"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de soltar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir palavra-passe antes de soltar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao soltar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabalho é gerido por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerido por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificações"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Conteúdo confidencial oculto"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Espreitar desativado"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"De trabalho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Conteúdo confidencial oculto"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Espreitar desativado"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicações"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permissões da aplicação"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas com acesso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilizar sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de apresentação"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"apresentação densidade zoom escala dimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Maior"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"A maior"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ver tudo"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desligado"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> dos dados utilizados"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicações instaladas"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> utilizados"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"A luminosidade adaptável está ATIVADA"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"A luminosidade adaptável está DESATIVADA"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 8bbe13c..0ad7256 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Grande"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Muito devagar"</item>
-    <item msgid="2361722960903353554">"Devagar"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="1370673569131070146">"Mais rápida"</item>
-    <item msgid="4648206845228970803">"Muito rápida"</item>
-    <item msgid="4977949754169483251">"Rápida"</item>
-    <item msgid="6106302964845503577">"Muito rápida"</item>
-    <item msgid="6800277205640837264">"Máxima"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Muito baixa"</item>
-    <item msgid="2692137425242433765">"Baixa"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alta"</item>
-    <item msgid="4699640516390840297">"Muito alta"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Procurando…"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 362139d..17d7da1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Desativada pelo administrador"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Não reproduzir sons ao inserir ou remover o tablet da dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Não reproduzir sons ao inserir ou remover o telefone da dock."</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil pessoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desativada"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre ativada"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para criptografia de arquivos"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Já criptografado com base em arquivos"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Convertendo para criptografia baseada em arquivos"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converter partição de dados para criptografia baseada em arquivos.\n !!Atenção!! Isso limpará todos os seus dados.\n Esse recurso é alfa e pode não funcionar corretamente.\n Pressione \"Limpar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Limpar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Seu documento pode passar por um ou mais servidores até chegar à impressora."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configurações"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Hotword completa e interação"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Conversão simples de fala em texto"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este serviço de entrada por voz poderá executar monitoramento por voz sempre ativado e apps com o recurso de controle por voz em seu nome. Ele está incluído no app <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Deseja ativar o uso deste serviço?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configurações da conversão de texto em voz"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Conversão de texto em voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas configurações"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"As configurações padrão abaixo substituem as configurações do app"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Mecanismo padrão"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Definir o mecanismo de síntese de fala a ser usado para texto falado"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Taxa de fala"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Velocidade em que o texto é falado"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Usar idioma do sistema"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma rápida demonstração da voz sintetizada"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalar dados de voz"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"É necessário instalar os dados de voz para a sintetização da fala"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"As vozes necessárias para sintetização já estão instaladas corretamente"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Suas configurações foram alteradas. Veja um exemplo de como elas ficaram."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"O mecanismo escolhido não pode ser executado."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecione outro mecanismo"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este mecanismo de síntese de fala pode coletar todo texto que será falado, inclusive dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do mecanismo <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Deseja ativar o uso desse mecanismo de síntese de fala?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma conexão de rede ativa para a conversão de texto em voz."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Este é um exemplo de sintetização de voz."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status de idioma padrão"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é totalmente suportada"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requer conexão de rede"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportado"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Verificando…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mecanismos"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configurações de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi ativado"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi desativado"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configurações do mecanismo"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configurações para <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas e vozes"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalado"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Não instalado"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminino"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculino"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Sintetização de voz instalada"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Ativ. novo mecanismo antes do uso"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Iniciar configurações do mecanismo"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mecanismo preferencial"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Gerais"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controle de energia"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atualizando configuração de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para app em 2º plano"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forçar permissão de apps em armazenamento externo"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Qualifica apps p/ gravação em armazenamento externo, independentemente de valores de manifestos"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forçar atividades a serem redimensionáveis"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Torna todas as atividades redimensionáveis para várias janelas, independentemente dos valores do manifesto."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dados uso de apps"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Somente alarmes"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silêncio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Interrupções visuais"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação padrão"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Quando o dispositivo estiver bloqueado, como você deseja que as notificações sejam exibidas?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificações"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificações por assunto"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueio de tela"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nunca mostrar notificações deste app"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratar como prioridade"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permitir que as notificações deste app sejam ouvidas quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permitir exibição"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permitir que este app enfatize determinadas notificações, deslizando-as brevemente para visualização na tela atual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ocultar conteúdo confidencial"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Quando o dispositivo estiver bloqueado, ocultar conteúdo das notificações deste app que possa revelar informações particulares"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Quando o dispositivo estiver bloqueado, ocultar conteúdo dessas notificações que possa revelar informações particulares"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para \"Sempre interromper\""</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Sem interrup de tela"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela atual"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Sem luz de notif."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedir que notifficações silenciadas pelo modo \"Não perturbe\" façam a luz pulsar"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao desafixar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"O perfil de trabalho é gerenciado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerenciado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificações"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normais"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloquear"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Conteúdo confidencial oculto"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioridade"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Sem exibição"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueados"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritárias"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Conteúdo confidencial oculto"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Sem exibição"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Com URLs de domínio"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Desativado pelo administrador"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permissões do app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps receberam acesso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps permitidos"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usar sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de exibição"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densidade de exibição zoom escala dimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Muito grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Maior"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Ver tudo"</string>
+    <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Desconectado"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de dados usados"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps instalados"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> de <xliff:g id="SIZE2">%2$s</xliff:g> usados"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"O brilho adaptável está ATIVADO"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"O brilho adaptável está DESATIVADO"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 90eceec..92f72eb 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Mare"</item>
     <item msgid="7786168277516233536">"Foarte mare"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Foarte încet"</item>
-    <item msgid="2361722960903353554">"Încet"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Rapid"</item>
-    <item msgid="1370673569131070146">"Mai repede"</item>
-    <item msgid="4648206845228970803">"Foarte repede"</item>
-    <item msgid="4977949754169483251">"Rapid"</item>
-    <item msgid="6106302964845503577">"Foarte rapid"</item>
-    <item msgid="6800277205640837264">"Cel mai repede"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Foarte scăzut"</item>
-    <item msgid="2692137425242433765">"Redusă"</item>
-    <item msgid="3332408460740717754">"Normală"</item>
-    <item msgid="4907380534957572531">"Ridicată"</item>
-    <item msgid="4699640516390840297">"Foarte ridicat"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"În curs de scanare..."</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d0ed7aa..f7e57ec 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Nu"</string>
-    <string name="create" msgid="3578857613172647409">"Creaţi"</string>
+    <string name="create" msgid="3578857613172647409">"Creați"</string>
     <string name="allow" msgid="3349662621170855910">"Permiteți"</string>
     <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Închideți"</string>
@@ -236,7 +236,7 @@
     <string name="skip_label" msgid="47510779345218297">"Omiteți"</string>
     <string name="next_label" msgid="4693520878012668114">"Înainte"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Limba"</string>
-    <string name="activity_picker_label" msgid="6295660302548177109">"Alegeţi activitatea"</string>
+    <string name="activity_picker_label" msgid="6295660302548177109">"Alegeți activitatea"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informații despre dispozitiv"</string>
     <string name="display_label" msgid="8074070940506840792">"Ecran"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informații tabletă"</string>
@@ -254,7 +254,7 @@
     <string name="settings_shortcut" msgid="3936651951364030415">"Comandă rapidă pentru setări"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mod Avion"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Mai multe"</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless și reţele"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless și rețele"</string>
     <string name="radio_controls_summary" msgid="2837395036275123133">"Gestionați Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și VPN"</string>
     <string name="cellular_data_title" msgid="2525947635539415202">"Date mobile"</string>
     <string name="calls_title" msgid="3544471959217176768">"Apeluri"</string>
@@ -312,8 +312,9 @@
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locația mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Dezactivată de administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Amprentă"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestionați amprentele"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Folosiți amprenta la"</string>
@@ -378,7 +379,7 @@
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea telefonului, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric ori o parolă), va trebui să deblocați ecranul pentru a decripta telefonul de fiecare dată când îl porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți telefonul conectat pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptați tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptați telefonul"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria și încercaţi din nou."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcați bateria și încercaţi din nou."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectați încărcătorul și încercați din nou."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setați un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
@@ -395,13 +396,13 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avertisment: datele de pe dispozitiv vor fi șterse după încă <xliff:g id="COUNT">^1</xliff:g> încercări nereușite de deblocare!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereușită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuați o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuați o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuați o resetare la valorile din fabrică. Când configurați tableta după resetare, veți putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuați o resetare la valorile din fabrică. Când configurați telefonul după resetare, veți putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decriptarea nu a reușit"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea tabletei, trebuie să reveniți la setările din fabrică. Când vă configurați tableta după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea telefonului, trebuie să reveniți la setările din fabrică. Când vă configurați telefonul după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Comutaţi metoda de introducere"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeți blocare ecran"</string>
     <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Alegeți blocarea ecranului"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Alegeți metoda de rezervă de blocare a ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
@@ -610,7 +611,7 @@
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificare de rețea"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Notifică-mă când este disponibilă o rețea publică"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitați conexiunile slabe"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nu utilizați o reţea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nu utilizați o rețea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizați numai rețelele care au conexiune bună la internet"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Folosiți automat rețelele Wi‑Fi deschise"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Permiteți ca un asistent Wi‑Fi să conecteze automat dispozitivul la rețele de calitate deschise"</string>
@@ -650,7 +651,7 @@
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Se porneşte WPS…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Apăsați pe butonul Configurare protejată Wi‑Fi de pe router. Se poate numi „WPS” sau poate fi marcat cu acest simbol:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Introduceți codul PIN <xliff:g id="NUMBER">%1$s</xliff:g> pe routerul Wi-Fi. Finalizarea configurării poate dura până la două minute."</string>
-    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS finalizată. Se conectează la reţea…"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS finalizată. Se conectează la rețea…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectat la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS este deja în desfăşurare. Finalizarea poate dura până la două minute."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS eşuată. Încercați din nou peste câteva minute."</string>
@@ -695,13 +696,13 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Această rețea nu are acces la internet. Se păstrează conectarea?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nu mai întreba pentru această rețea"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectați-vă"</string>
-    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la reţea"</string>
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la rețea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminați"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nu s-a putut elimina reţeaua"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvați"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva reţeaua"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulați"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignoraţi oricum"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignorați oricum"</string>
     <string name="wifi_dont_skip" msgid="3615535136327231588">"Înapoi"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, tableta dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, dispozitivul dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
@@ -726,7 +727,7 @@
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Introduceţi o adresă IP validă."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"Introduceţi o adresă gateway validă."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"Introduceţi o adresă DNS validă."</string>
-    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"Introduceţi prefix reţea din 0 – 32 caractere."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"Introduceţi prefix rețea din 0 – 32 caractere."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
@@ -819,8 +820,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Nu doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nu redaţi sunetul la introducerea și la scoaterea telefonului din dispozitivul de andocare"</string>
     <string name="account_settings" msgid="6403589284618783461">"Conturi"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Serviciu"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Conturi cu profil de serviciu – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Conturi cu profil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Cont de serviciu – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +842,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Dezactivată"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Activată permanent"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automat"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Faceți conversia la criptarea bazată pe sistemul de fișiere"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertiți…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Criptarea bazată pe sistemul de fișiere este finalizată"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Se face conversia la criptarea bazată pe sistemul de fișiere"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Faceți conversia partiției de date la criptarea bazată pe sistemul de fișiere. \n !!Avertisment!! Astfel, toate datele dvs. vor fi șterse.\n Aceasta este o funcție în versiune alpha și este posibil să nu funcționeze corect.\n Apăsați pe „Ștergeți și convertiți…” pentru a continua."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Ștergeți și convertiți…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
@@ -985,7 +990,7 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"În curs de demontare"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontare în curs"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Spațiu de stocare aproape ocupat"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcţii de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercați să eliberați spațiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicații sau conținut media)."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcții de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercați să eliberați spațiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicații sau conținut media)."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Redenumiți"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Montați"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"Scoateți"</string>
@@ -1208,15 +1213,15 @@
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Aplicațiile estimează mai rapid locația cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Sateliți GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicațiilor să utilizeze GPS de pe tabletă pentru a indica locaţia dvs."</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicațiilor să utilizeze GPS de pe telefon pentru a indica locaţia dvs."</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicațiilor să utilizeze GPS de pe tabletă pentru a indica locația dvs."</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicațiilor să utilizeze GPS de pe telefon pentru a indica locația dvs."</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizați GPS asistat"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizați serverul pentru a asista funcția GPS (debifați pentru a reduce utilizarea rețelei)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizați serverul pentru a asista funcția GPS (debifați pentru a îmbunătăți performanța GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Locație și căutare Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permiteți Google să utilizeze locația dvs. pt. îmbunătățirea rezultatelor căutării și a serviciilor"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acces la locaţia dvs."</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicațiilor care v-au solicitat, permisiunea să utilizeze informaţiile dvs. de localizare"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Acces la locația dvs."</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicațiilor care v-au solicitat, permisiunea să utilizeze informațiile dvs. de localizare"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Surse de locații"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
@@ -1287,7 +1292,7 @@
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionați aplicații"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionați și eliminaţi aplicațiile instalate"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicații"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionați aplicații, creaţi comenzi rapide pentru lansare rapidă"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionați aplicații, creați comenzi rapide pentru lansare rapidă"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicații"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permite aplic. din orice surse"</string>
@@ -1296,7 +1301,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor ce provin din surse necunoscute. Sunteți de acord că sunteți singura persoană responsabilă pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicații."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor ce provin din surse necunoscute. Sunteți de acord că sunteți singura persoană responsabilă pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicații."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"Activați mai multe opţiuni pentru setări"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"Activați mai multe opțiuni pentru setări"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informații despre aplicație"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stocare"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Deschide în mod prestabilit"</string>
@@ -1340,7 +1345,7 @@
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicațiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionați spațiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrați"</string>
-    <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeţi opţiunile de filtrare"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeți opţiunile de filtrare"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toate"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"Dezactivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descărcate"</string>
@@ -1389,14 +1394,14 @@
     <string name="insufficient_storage" msgid="481763122991093080">"Nu există suficient spațiu de stocare."</string>
     <string name="does_not_exist" msgid="1501243985586067053">"Aplicaţia nu există."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Aplicaţia este protejată la copiere."</string>
-    <string name="invalid_location" msgid="4354595459063675191">"Locaţia de instalare nu este validă."</string>
+    <string name="invalid_location" msgid="4354595459063675191">"Locația de instalare nu este validă."</string>
     <string name="system_package" msgid="1352722848400644991">"Actualizările de sistem nu pot fi instalate pe suportul extern."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Opriți forţat?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Dacă forţaţi oprirea unei aplicații, aceasta se poate comporta necorespunzător."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplicaţia nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Locație preferată de instalare"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicații"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locația preferată de instalare pentru noile aplicații"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Dezactivați aplicația"</string>
     <string name="app_disable_dlg_text" msgid="7824930380425568584">"Dacă dezactivați această aplicație, este posibil ca alte aplicații să nu mai funcționeze corespunzător."</string>
@@ -1451,7 +1456,7 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Serviciul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Furnizorul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriți serviciul de sistem?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide și redeschide."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcții ale tabletei să nu mai funcţioneze corect decât după ce o veți închide și redeschide."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriți acest serviciu, este posibil ca unele funcții ale telefonului să nu mai funcționeze corect decât după ce îl veți închide și redeschide."</string>
     <string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă și introducere de text"</string>
@@ -1477,8 +1482,8 @@
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controler de joc"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizaţi mecanismul de vibrare"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecţionaţi mecanismul de vibrare pentru controlerul de joc când este conectat."</string>
-    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Alegeţi aspectul tastaturii"</string>
-    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configuraţi aspectele tastaturii"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Alegeți aspectul tastaturii"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurați aspectele tastaturii"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Pentru comutare, apăsați pe Control-Space"</string>
     <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
     <skip />
@@ -1499,7 +1504,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificați cuvântul"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modificați"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ștergeți"</string>
-    <string name="user_dict_settings_empty_text" msgid="996593969349827966">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugaţi (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="996593969349827966">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugați (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pentru toate limbile"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mai multe limbi..."</string>
     <string name="testing" msgid="6584352735303604146">"Testare"</string>
@@ -1523,7 +1528,7 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Tastatură fizică"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setări pentru tastatura fizică"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opțiuni dezvoltator"</string>
-    <string name="development_settings_summary" msgid="1815795401632854041">"Setați opţiuni pentru dezvoltarea aplicației"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"Setați opțiuni pentru dezvoltarea aplicației"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"Opțiunile de dezvoltator nu sunt disponibile pentru acest utilizator"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"Setările VPN nu sunt disponibile pentru acest utilizator"</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"Setările pentru tethering nu sunt disponibile pentru acest utilizator"</string>
@@ -1586,8 +1591,8 @@
     <string name="enable_terminal_summary" msgid="67667852659359206">"Activați aplicația terminal care oferă acces la shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeți obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeți obiectul widget"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul și permiteţi accesul?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creaţi widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afișează."</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creați widgetul și permiteţi accesul?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creați widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afișează."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permiteţi întotdeauna ca <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> să creeze widgeturi și să acceseze datele acestora"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> z <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
@@ -1609,11 +1614,11 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Afișaj"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtitrări"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"După activarea acestei funcţii, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriți, puteţi:\n"<ul><li>"să deplasați: deplasați două sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriți temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menținând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părți ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepția tastaturii și a barei de navigare."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"După activarea acestei funcții, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriți, puteţi:\n"<ul><li>"să deplasați: deplasați două sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriți temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menținând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părți ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepția tastaturii și a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă de accesibilitate"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activați rapid funcţiile de accesibilitate în doi pași:\n\nPasul 1: apăsați și menţineţi apăsat butonul de pornire până când auziți un sunet sau simțiți o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete și menţineţi degetele pe ecran până când auziți o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcții, puteţi să activați rapid funcțiile de accesibilitate în doi pași:\n\nPasul 1: apăsați și menţineţi apăsat butonul de pornire până când auziți un sunet sau simțiți o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete și menţineţi degetele pe ecran până când auziți o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text cu contrast ridicat"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
@@ -1712,8 +1717,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Setări"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printare"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicii de printare"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Documentul poate trece printr-un server sau mai multe pe calea spre imprimantă."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nu există servicii instalate"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nu au fost găsite imprimante"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Setări"</string>
@@ -1821,7 +1824,7 @@
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Baterie utilizată de Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"Dezactivați rețeaua Wi-Fi atunci când nu o utilizați sau când nu este disponibilă"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Baterie utilizată de Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Dezactivați funcţia Bluetooth atunci când nu o utilizaţi"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Dezactivați funcția Bluetooth atunci când nu o utilizaţi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Încercați să vă conectaţi la un alt dispozitiv Bluetooth"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Baterie utilizată de aplicații"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Opriți sau dezinstalați aplicația"</string>
@@ -1894,54 +1897,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Expresie de activare și interacțiune complete"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Transformare simplă a vorbirii în text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Acest serviciu de introducere vocală va putea să asigure în permanență monitorizarea vocală și să controleze aplicațiile cu comenzi vocale în locul dvs. Acesta provine din aplicația <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Activați utilizarea acestui serviciu?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Setări text în vorbire"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Transformare text în vorbire"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Doresc să se utilizeze întotdeauna setările mele"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setările prestabilite de mai jos înlocuiesc setările aplicației"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Setări standard"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motor prestabilit"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Setează motorul de sinteză vocală de utilizat pentru textul vorbit"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Ritmul vorbirii"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Viteza cu care este vorbit textul"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Înălțime"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afectează tonul textului vorbit"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Limbă"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utilizaţi limba sistemului"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nu ați selectat limba"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Setează vocea caracteristică limbii pentru textul vorbit"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Ascultați un exemplu"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Redați o demonstrație scurtă a sintetizării vorbirii"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalați date vocale"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalați datele vocale necesare pentru sintetizarea vorbirii"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Vocile necesare pentru sintetizarea vorbirii sunt deja instalate corect"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setările s-au modificat. Acesta este un exemplu de sunet pentru aceste setări."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Motorul pe care l-aţi ales nu poate rula."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurați"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Alegeți alt motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele și numerele cărților de credit. Metoda provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteți utilizarea acestui motor de sintetizare a vorbirii?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Pentru rezultatul transformării textului în vorbire pentru această limbă este necesară o conexiune de reţea care să funcţioneze."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Acesta este un exemplu de sintetizare a vorbirii"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Starea limbii prestabilite"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> este acceptată integral"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> necesită conexiune la rețea"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nu este acceptată"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Se verifică..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motoare"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Setări <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> este activat"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> este dezactivat"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Setările motorului"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Setări pentru <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Limbi și voci"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Instalată"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Neinstalată"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminină"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Masculină"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motor sintetiz. vorbire instalat"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Activ. mot. nou înaintea util."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Lansați setările motorului"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferat"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Preferințe generale"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Comandă alimentare"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Se actualizează setarea Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Se actualizează setarea pentru Bluetooth"</string>
@@ -2040,7 +1995,7 @@
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Conectat la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adăugați o rețea"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Neconectat"</string>
-    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adăugați reţea"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adăugați rețea"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizați lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Omiteți"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Înainte"</string>
@@ -2053,7 +2008,7 @@
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Se scanează reţelele..."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Atingeți o rețea pentru a vă conecta la aceasta"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectați-vă la rețeaua existentă"</string>
-    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectați-vă la reţea nesecurizată"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectați-vă la rețea nesecurizată"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Introduceți configurația rețelei"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Conectați-vă la o rețea nouă"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Se conectează..."</string>
@@ -2120,7 +2075,7 @@
     <string name="checking_decryption" msgid="8287458611802609493">"Se verifică..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Se pornește Android..."</string>
     <string name="delete" msgid="4219243412325163003">"Ștergeți"</string>
-    <string name="misc_files" msgid="6720680815969643497">"Fişiere diverse"</string>
+    <string name="misc_files" msgid="6720680815969643497">"Fișiere diverse"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selectați-le pe toate"</string>
@@ -2141,7 +2096,7 @@
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorizare"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modul Strict activat"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Iluminare intermitentă la operații lungi pe firul principal"</string>
-    <string name="pointer_location" msgid="6084434787496938001">"Locaţia indicatorului"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Locația indicatorului"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Suprapunere care indică date curente pt. atingeri"</string>
     <string name="show_touches" msgid="1356420386500834339">"Afișați atingerile"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Afișați feedback vizual pentru atingeri"</string>
@@ -2182,10 +2137,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Aplicații din fundal: afișați Aplicația nu răspunde"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Forțați accesul aplicațiilor la stocarea externă"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Face orice aplicație eligibilă să fie scrisă în stocarea externă, indiferent de valorile manifestului"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Forțați redimensionarea activităților"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Permite redimensionarea tuturor activităților pentru modul cu ferestre multiple, indiferent de valorile manifestului."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizarea datelor aplic."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
@@ -2245,7 +2198,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Modificările conturilor dvs. pe web vor fi copiate automat pe tabletă.\n\nDe asemenea, unele conturi pot să copieze automat pe web toate modificările pe care le efectuați pe tabletă. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ceea ce modificați în conturi pe web se va reflecta automat și pe telefon.\n\nUnele conturi pot să copieze automat pe web toate modificările de pe telefon. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Opriți sincronizarea automată?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Această acţiune va economisi date și durata bateriei, dar va trebui să sincronizați fiecare cont manual pentru a culege informaţiile recente. În plus, nu veţi primi notificări atunci când apar actualizări."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Această acţiune va economisi date și durata bateriei, dar va trebui să sincronizați fiecare cont manual pentru a culege informațiile recente. În plus, nu veți primi notificări atunci când apar actualizări."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data din fiecare lună:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setați"</string>
@@ -2290,7 +2243,7 @@
     <string name="vpn_routes" msgid="3818655448226312232">"Rute de redirecționare (ex.: 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Nume de utilizator"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Parolă"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"Salvați informaţiile contului"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Salvați informațiile contului"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(neutilizat)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(nu verificaţi serverul)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primit de la server)"</string>
@@ -2298,22 +2251,22 @@
     <string name="vpn_done" msgid="8678655203910995914">"Închideți"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvați"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectați"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"Editaţi profilul VPN"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Editați profilul VPN"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Ștergeți"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectați-vă la <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="2555877026824771115">"Deconectați-vă de la VPN."</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Deconectați-vă"</string>
     <string name="vpn_version" msgid="1939804054179766249">"Versiunea <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"Adăugaţi un profil VPN"</string>
-    <string name="vpn_menu_edit" msgid="408275284159243490">"Editaţi profilul"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Adăugați un profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editați profilul"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Ștergeți profilul"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Reţea VPN activată permanent"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectaţi un profil VPN pentru a rămâne conectat întotdeauna la reţea. Traficul de reţea va fi permis numai atunci când sunteți conectat(ă) la această reţea VPN."</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectaţi un profil VPN pentru a rămâne conectat întotdeauna la rețea. Traficul de rețea va fi permis numai atunci când sunteți conectat(ă) la această rețea VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Niciuna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Activarea permanentă a reţelei VPN necesită o adresă IP, atât pentru server, cât și pentru DNS."</string>
-    <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la reţea. Încercați din nou mai târziu."</string>
-    <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editaţi profilul."</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la rețea. Încercați din nou mai târziu."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editați profilul."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utilizator"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Dezactivați"</string>
@@ -2346,7 +2299,7 @@
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adăugați un utilizator/un profil"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugați utilizator"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limitat"</string>
     <string name="user_need_lock_message" msgid="5879715064416886811">"Înainte de a putea crea un profil cu permisiuni limitate, va trebui să configurați blocarea ecranului pentru a vă proteja aplicațiile și datele personale."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Configurați blocarea"</string>
@@ -2365,7 +2318,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Adăugați utilizator nou?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Puteți să permiteți accesul la acest dispozitiv altor persoane creând utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările dispozitivului, cum ar fi setările pentru Wi-Fi, care îi afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOricare dintre utilizatori poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Când adăugați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurați utilizatorul acum?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asigurați-vă că utilizatorul are posibilitatea de a prelua dispozitivul și de a-și configura spațiul"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurați profilul acum?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurați acum"</string>
@@ -2577,6 +2530,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Numai alarme"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Niciun sunet"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Întreruperi vizuale"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de apel implicit pentru notificări"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrații și pentru apeluri"</string>
@@ -2590,6 +2544,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Când dispozitivul este blocat, cum doriți să se afișeze notificările?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificări"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Notificări după subiect"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Alte sunete"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonuri pentru tastatura numerică"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sunete la blocarea ecranului"</string>
@@ -2618,12 +2573,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nu afișați notificări de la această aplicație"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratați ca având prioritate"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Permiteți ca notificările acestei aplicații să se audă când opțiunea Nu deranja este setată la Numai cu prioritate"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Afișează scurt timp"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permiteți ca această aplicație să evidențieze anumite notificări glisându-le pentru scurt timp la vedere pe ecranul actual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoră Nu deranja"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permiteți acestor notificări să vă întrerupă când modul Nu deranja este setat la Numai cu prioritate"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ascundeți conținutul confidențial"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Când dispozitivul este blocat, ascundeți conținutul din notificările acestei aplicații, care poate dezvălui informații private"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Când dispozitivul este blocat, ascundeți conținutul din aceste notificări, care poate dezvălui informații private"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocat"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritate"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidențial"</string>
@@ -2696,6 +2649,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Schimbați la „Numai alarme” până la <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Schimbați la „Întrerupe întotdeauna”"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Nicio întrerupere pe ecran"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Împiedicați afișarea de scurtă durată sau pe ecranul actual a notificărilor dezactivate prin Nu deranja"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Nicio lumină de notificare"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Împiedicați lumina intermitentă de la notificările dezactivate prin Nu deranja"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificări aplicații"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
@@ -2708,7 +2665,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitați codul PIN înainte de a anula fixarea"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitați parola înainte de a anula fixarea"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blocați dispozitivul la anularea fixării"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil de serviciu"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Acest profil de serviciu este gestionat de:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestionat de <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2761,9 +2717,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Notificări"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blocate"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Conținut confidențial ascuns"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritare"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Fără afișare de scurtă durată"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2788,15 +2741,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Serviciu"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blocate"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritare"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Conținut confidențial ascuns"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Fără afișare de scurtă durată"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Cu adrese URL de domeniu"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Setare dezactivată de administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurați aplicațiile"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Alegeți un profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisiuni aplicație"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> aplicații cu acces suplimentar"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> aplicații au această permisiune"</string>
@@ -2956,4 +2905,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modul de culori pentru imagini"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Folosiți sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Scară afișaj"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"afișaj densitate zoom scară scalare"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mică"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normală"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Mare"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Mai mare"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Cea mai mare"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizată (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Afișați-le pe toate"</string>
+    <string name="see_less" msgid="1250265310929558370">"Afișați mai puține"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Deconectată"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Date folosite: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> (de) aplicații instalate"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Stocare utilizată: <xliff:g id="SIZE1">%1$s</xliff:g> din <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Luminozitatea adaptivă este ACTIVATĂ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Luminozitatea adaptivă este DEZACTIVATĂ"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 5b114d4..2f25a05 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Крупный"</item>
     <item msgid="7786168277516233536">"Огромный"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Очень медленная"</item>
-    <item msgid="2361722960903353554">"Медленная"</item>
-    <item msgid="1145554631248513562">"Обычная"</item>
-    <item msgid="7553665153391107454">"Умеренно быстрая"</item>
-    <item msgid="1370673569131070146">"Быстрая"</item>
-    <item msgid="4648206845228970803">"Очень быстрая"</item>
-    <item msgid="4977949754169483251">"Ускоренная"</item>
-    <item msgid="6106302964845503577">"Сильно ускоренная"</item>
-    <item msgid="6800277205640837264">"Максимальная"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Очень низкий"</item>
-    <item msgid="2692137425242433765">"Низкий"</item>
-    <item msgid="3332408460740717754">"Обычный"</item>
-    <item msgid="4907380534957572531">"Высокий"</item>
-    <item msgid="4699640516390840297">"Очень высокий"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Поиск..."</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8631aa3..20cb797 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Отключено администратором"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечатки пальцев"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Управление отпечатками"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Для чего использовать"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не воспроизводить звук при установке или извлечении планшетного ПК из док-станции"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не воспроизводить звук при установке или извлечении телефона"</string>
     <string name="account_settings" msgid="6403589284618783461">"Аккаунты"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Личные данные"</string>
-    <string name="category_work" msgid="8699184680584175622">"Работа"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Аккаунты в рабочем профиле – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Аккаунты в личном профиле"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Рабочий аккаунт – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Отключено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Всегда включено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматическое переключение"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Переход к шифрованию файлов"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Перейти…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Шифрование файлов уже включено"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Переход к шифрованию отдельных файлов"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Перейти к шифрованию отдельных файлов.\nВнимание! Все ваши данные будут удалены.\nЭто альфа-версия функции. Возможны ошибки.\nНажмите \"Очистить и перейти…\"."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Очистить и перейти…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спящий режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Отключение экрана"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="print_settings" msgid="4742428530112487843">"Печать"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Средства печати"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Путь вашего документа до принтера может проходить через несколько серверов."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Сервисов нет"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Ничего не найдено"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Расширенный режим: управление с помощью голосовых команд"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Обычный режим: распознавание речи"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Эта служба голосового ввода сможет выполнять непрерывный мониторинг речи и управлять приложениями от вашего имени. Для ее работы необходимо установить приложение \"<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>\". Включить службу?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Настройки синтеза речи"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Синтез речи"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Только мои настройки"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Настройки по умолчанию переопределяют настройки приложений"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Настройки по умолчанию"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Система по умолчанию"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Выберите систему синтеза речи, которая будет использоваться для озвучивания текста"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Скорость речи"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Скорость чтения текста"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Язык системы"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Язык не выбран"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Выбор языка для чтения текста"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Прослушать пример"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Воспроизвести краткую демонстрацию синтезированной речи"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Установка голосовых данных"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Установить голосовые данные, необходимые для синтеза речи"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Данные, необходимые для синтеза речи, уже загружены"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ваши настройки изменены. Вот пример того, как это звучит."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Невозможно запустить синтезатор речи."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Настроить"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Выбрать другую систему"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Данная система синтеза речи может записывать произносимые слова, включая личные данные, такие как пароли и номера кредитных карт. Это осуществляет система <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Разрешить использование этой системы синтеза речи?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Чтобы включить синтезатор речи для этого языка, необходимо подключение к Интернету."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Это пример синтеза речи."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Язык по умолчанию"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> поддерживается"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> поддерживается только при подключении к сети"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не поддерживается"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Проверка..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Системы"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> вкл."</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>: отключено"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Настройки синтеза"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Языки и голос"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Установлено"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Не установлено"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Женский"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Мужской"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Синтезатор речи установлен"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Включите новый модуль."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Настройки синтеза речи"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Система по умолчанию"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Общие"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Энергосбережение"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Обновление настроек Wi-Fi…"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Уведомлять о том, что приложение не отвечает"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Разрешить сохранение на внешние накопители"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Разрешает сохранение приложений на внешние накопители независимо от значения манифеста"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Изменение размера в многооконном режиме"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Позволяет менять размер в многооконном режиме (независимо от значений манифеста)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафик приложений"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Статистика вашего оператора связи может отличаться от статистики устройства."</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Только будильник"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Полная тишина"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Визуальное оповещение"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Мелодия уведомлений по умолчанию"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрация при звонке"</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Выберите режим уведомлений на заблокированном устройстве."</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Уведомления"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Темы уведомлений"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Другие звуки"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Звук при наборе номера"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звук блокировки экрана"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Не показывать уведомления из этого приложения"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Считать важными"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Разрешить звуковые уведомления от этого приложения в режиме оповещения \"Важные\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Краткие уведомления"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Разрешить приложению ненадолго выводить некоторые уведомления на текущий экран"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить режим \"Не беспокоить\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешить эти уведомления, когда в режиме \"Не беспокоить\" выбрано \"Только важные\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Скрыть конфиденциальные данные"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Не показывать конфиденциальные данные в уведомлениях этого приложения, когда устройство заблокировано"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Не показывать конфиденциальные данные в уведомлениях, когда устройство заблокировано"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблокировано"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Важные"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфиденциальные"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активировать режим \"Только будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Режим \"Не беспокоить\" отключен."</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Не показывать на экране"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Не показывать на экране уведомления, отключенные в режиме \"Не беспокоить\"."</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Без свет. индикатора"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Не включать световой индикатор для уведомлений, отключенных в режиме \"Не беспокоить\"."</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-код для отключения"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запрашивать пароль для отключения блокировки в приложении"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокировать устройство при откл. блокировки в приложении"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Рабочий профиль"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Профилем управляет"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управляется <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(экспериментальная настройка)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Уведомления"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Обычные"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Заблокировать"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Конфиденциальные данные скрыты"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Важные"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Без кратких уведомлений"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблокированные"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Важные"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Конфиденциальные данные скрыты"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Без кратких уведомлений"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"С URL домена"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Отключено администратором"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Настроить приложения"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Разрешения приложений"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Расширенный доступ: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Разрешено: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2978,4 +2927,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Цветовой режим"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Использовать sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Масштаб экрана"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"разрешение экрана увеличение уменьшение"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Мелкий"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Обычный"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Крупный"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Очень крупный"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Максимальный"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Другой (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Показать все"</string>
+    <string name="see_less" msgid="1250265310929558370">"Скрыть"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Отключено"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Использовано трафика: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Установлено приложений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Использовано: <xliff:g id="SIZE1">%1$s</xliff:g> из <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Адаптивная регулировка включена"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Адаптивная регулировка отключена"</string>
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index 89fe66e..6203690 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"විශාල"</item>
     <item msgid="7786168277516233536">"දැවැන්ත"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ඉතා සෙමින්"</item>
-    <item msgid="2361722960903353554">"මන්දගාමී"</item>
-    <item msgid="1145554631248513562">"සාමාන්‍ය"</item>
-    <item msgid="7553665153391107454">"වේගවත්"</item>
-    <item msgid="1370673569131070146">"වේශවත්"</item>
-    <item msgid="4648206845228970803">"ඉතා වේගවත්"</item>
-    <item msgid="4977949754169483251">"සීඝ්‍ර"</item>
-    <item msgid="6106302964845503577">"ඉතා සීඝ්‍ර"</item>
-    <item msgid="6800277205640837264">"ඉතාමත් වේගවත්"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ඉතාමත් අඩු"</item>
-    <item msgid="2692137425242433765">"පහල"</item>
-    <item msgid="3332408460740717754">"සාමාන්‍ය"</item>
-    <item msgid="4907380534957572531">"ඉහල"</item>
-    <item msgid="4699640516390840297">"ඉතා ඉහළ"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"පරිලෝකනය කරමින්…"</item>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index a99ae23..1277165 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"මුරපද"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"පරිපාලක විසින් අබල කරන ලදී"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ඇඟිලි සලකුණ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ඇඟිලි සලකුණු කළමනාකරණය කරන්න"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"මෙය සඳහා ඇඟිලි සලකුණු භාවිත කරන්න"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ටැබ්ලටය රඳවනයට දමන විට එයින් ඉවත් කරන විට ශබ්දයක් ඇති නොකරන්න"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"දුරකථනය රඳවනය වෙතින් ඉවත් කරන විට ඊට හෝ ඇතුලත් කරන විට ශබ්දයක් ඇති නොකරන්න"</string>
     <string name="account_settings" msgid="6403589284618783461">"ගිණුම්"</string>
-    <string name="category_personal" msgid="1299663247844969448">"පෞද්ගලික"</string>
-    <string name="category_work" msgid="8699184680584175622">"කාර්යාලය"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"කාර්යාල පැතිකඩ ගිණුම් - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"පුද්ගලික පැතිකඩ ගිණුම්"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"කාර්යාල ගිණුම - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"අබලයි"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"සැමවිට ක්‍රියාත්මක"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ස්වයංක්‍රීය"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ගොනු සංකේතනයට පරිවර්තනය කරන්න"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"පරිවර්තනය කරන්න..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"දැනටමත් ගොනුව සංකේතනය කර ඇත"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ගොනු පදනම් සංකේතනයට පරිවර්තනය කිරීම"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"දත්ත වෙන් කිරීම ගොනු පදනම් සංකේතනයට පරිවර්තනය කරන්න.\n !!අනතුරු ඇඟවීමයි!! මෙය ඔබේ සියලු දත්ත මකනු ඇත.\n මෙම විශේෂාංගය ඇල්ෆා වන අතර, නිවැරදිව ක්‍රියා නොකළ හැකිය.\n දිගටම කරගෙන යාමට \'මකා පරිවර්තනය කරන්න...\' ඔබන්න."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"මකා පරිවර්තනය කරන්න..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"නිද්‍රාව"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"තිරය අක්‍රිය කරන්න"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"අක්‍රියතාවයෙන් <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> පසු"</string>
@@ -1699,8 +1704,6 @@
     <string name="settings_button" msgid="3006713718908152930">"සැකසීම්"</string>
     <string name="print_settings" msgid="4742428530112487843">"මුද්‍රණය කිරීම්"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"මුද්‍රණ සේවා"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> භාවිත කරන්න ද?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ඔබගේ ලේඛනය මුද්‍රණ යන්ත්‍රයට යන අතරතුර සේවාදායක එකක් හෝ කිහිපයක් හරහා යා හැක."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"සේවා ස්ථාපනය කර නැත"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"මුද්‍රක සොයා නොගැනුණි"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"සැකසීම්"</string>
@@ -1881,54 +1884,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"සම්පුර්ණ අණවදන සහ අන්තර්ක්‍රියාව"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"සරළ කථනයෙන් පෙළට"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"හඬ නිරීක්ෂණය කිරීම සැමවිටම සක්‍රියව තැබීමට සහ ඔබ වෙනුවෙන් හඬ සබල කර ඇති යෙදුම් පාලනය කිරීමට හැකියාව හඬ ආදාන සේවාවට තිබේ. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> යෙදුමෙන් එය පැමිණේ. මෙම සේවාවේ භාවිතා කිරීම සබල කරන්නද?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"පෙළ-සිට-කථාවට සැකසුම්"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"පෙළ-සිට-කථන ප්‍රතිදානය"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"සෑමවිටම මගේ සැකසුම් භාවිතා කරන්න"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"වැඩිකොට දක්වන යෙදුම් සැකසීම් යටින් සුපුරුදු සැකසීම්"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"සුපුරුදු සැකසුම්"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"සුපුරුදු යන්ත්‍රය"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"කථා කරන පෙළ සඳහා භාවිතා කිරීමට කථන සංකලන යන්ත්‍රයක් සකස් කරන්න"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"කථන ශීඝ්‍රතාව"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"පෙළ කථා කරනා වේගය"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"තාරතාව"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"කියවන පෙළෙහි ස්වරයට බලපායි"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"භාෂාව"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"පද්ධති භාෂාව භාවිතා කරන්න"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"භාෂාව තෝරා ගෙන නැත"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"කථා කරන පෙළ සඳහා භාෂා-විශේෂිත හඬ සකසන්න"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"උදාහරණයකට සවන් දෙන්න"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"කථන සංස්ලෙෂණයේ කුඩා ආදර්ශනයක් ධාවනය කරන්න"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"හඬ දත්ත ස්ථාපනය කරන්න"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"කථන සංකලනයට අවශ්‍ය හඬ දත්ත ස්ථාපනය කරන්න"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"කථන සංකලනය සඳහා අවශ්‍ය හඬ දැනටමත් නිසි ලෙස ස්ථාපනය කර ඇත"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ඔබගේ සැකසීම් වෙනස් වී ඇත. ඒවා ඇසෙන්නේ කෙසේද කියා දැනගැනීමට මෙය උදාහරණයකි."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"ඔබ තේරූ යන්ත්‍රය ධාවනය කළ නොහැක."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"වින්‍යාස කරන්න"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"තවත් එන්ජිමක් තෝරාගන්න"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"මෙම කථා සංස්ලේෂණ යන්ත්‍රයට කථා කරන සියළුම පෙළ එකතු කර ගත හැකිය, මුරපද සහ ණයපත් අංකද ඇතුලත්ව. එය පැමිණ ඇත්තේ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> යන්ත්‍රයෙනි. මෙම කථා සංස්ලේෂණ යන්ත්‍රයෙහි භාවිතය සබල කරන්නද?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"මෙම භාෂාවට පෙළ-සිට-කථනය ප්‍රතිදානය සඳහා වැඩ කරන ජාල සම්බන්ධතාවයක් අවශ්‍යයි."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"මෙය කථන සංස්ලේෂණයට උදාහරණයකි"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"සුපුරුදු භාෂා තත්වය"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> මුළුමනින්ම සහාය දක්වයි"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> සඳහා ජාල සම්බන්ධතාවයක් අවශ්‍යයි"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> සහාය නොදක්වයි"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"පරික්ෂා කරමින්..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"යන්ත්‍ර"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> සැකසුම්"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> සබලයි"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> අබල කර ඇත"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"එන්ජිම් සැකසීම්"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> සඳහා සැකසුම්"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"භාෂා සහ කටහඬ"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ස්ථාපිතයි"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ස්ථාපනය කර නැත"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ස්ත්‍රී"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"පුරුෂ"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"කථා සංස්ලේෂණ යන්ත්‍රය ස්ථාපිතයි"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"භාවිතයට පෙර වන යන්ත්‍රය සබල කරන්න."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"එන්ජිම් සැකසීම් දියත් කරන්න"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"වරණ එන්ජිම"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"සාමාන්‍ය"</string>
     <string name="gadget_title" msgid="5519037532720577836">"බල පාලනය"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi සැකසීම් යාවත්කාලින වෙමින්"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"බ්ලූටූත් සැකසීම් යාවත්කාලීන කරමින්"</string>
@@ -2169,10 +2124,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"පසුබිම් යෙදුම් වලට යෙදුම ප්‍රතිචාර නොදක්වයි කවුළුව පෙන්වන්න"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"බාහිර මත යෙදුම් ඉඩ දීම බල කරන්න"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"මැනිෆෙස්ට් අගයන් නොසලකා, ඕනෑම යෙදුමක් අභ්‍යන්තර ගබඩාවට ලිවීමට සුදුසුකම් ලබා දෙයි"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"ක්‍රියාකාරකම් ප්‍රතිප්‍රමාණ කළ හැකි බවට බල කරන්න"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"මැනිෆෙස්ට් අගයන් නොසලකා, සියලු ක්‍රියාකාරකම් බහු-කවුළු සඳහා ප්‍රතිප්‍රමාණ කළ හැකි බවට පත් කරයි."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"දත්ත භාවිතය"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"යෙදුම් දත්ත භාවිතය"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ඔබගේ උපාංගයේ වාහක දත්ත ගිණුම් ගත කිරීම ඇතැම් විට වැර දේ."</string>
@@ -2564,6 +2517,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"එලාම පමණයි"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"සම්පූර්ණ නිහඬතාව"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"දෘශ්‍ය බාධා"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"දුරකථන රිගින්ටෝනය"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"සුපුරුදු දැනුම්දීම් රිගින්ටෝනය"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ඇමතුම් සඳහා කම්පනයද කරන්න"</string>
@@ -2577,6 +2531,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"උපාංගය අගුළු දමා ඇති විට, ඔබට දැනුම්දීම් පෙන්න විය යූත්තේ කෙසේද?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"දැනුම්දීම්"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"යෙදුම් දැනුම්දීම්"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"මාතෘකාව දැනුම්දීම්"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"වෙනත් ශබ්ද"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ඇමතුම් පැඩ නාද"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"තිරය අඟුළු දැමීමේ ශබ්ද"</string>
@@ -2604,12 +2559,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"සියල්ල අවහිර කරන්න"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"මෙම යෙදුමෙන් කවදාවත් දැනුම්දීම් පෙන්වන්න එපා"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ප්‍රමුඛතාව ලෙස සලකන්න"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"බාධා නොකරන්න යන්න ප්‍රමුඛතාව පමණි වෙත සකසා ඇති විට මෙම යෙදුමේ දැනුම්දීම් ඇසීමට ඉඩ දෙන්න"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"හොරෙන් බැලීමට ඉඩ දෙන්න"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"වත්මන් තිරය මත බැලීමට ඒවා සැකෙවින් ස්ලයිඩ් කිරීම මගින් සමහර දැනුම්දීම් අවධාරණය කිරීමට මෙම යෙදුමට ඉඩ දෙන්න"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"බාධා නොකරන්න ඉක්මවන්න"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"බාධා නොකරන්න, ප්‍රමුඛතා පමණි වෙත සකසා ඇති විට මෙම දැනුම්දීම්වලට බාධා කිරීමට දිගටම ඉඩ දෙන්න"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"සංවේදී අන්තර්ගතය සඟවන්න"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"උපාංගය අගුළු දමා ඇති විට, මෙම යෙදුමේ දැනුම්දීම්වල ඇති පෞද්ගලික තොරතුරු අනාවරණය කළ හැකි අන්තර්ගතය සඟවන්න"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"උපාංගය අගුලු දමා ඇති විට, පුද්ගලික තොරතුරු හෙළිදරව් කළ හැකි මෙම දැනුම්දීම්වල ඇති අන්තර්ගතය සඟවන්න"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"අවහිර කරන ලදි"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ප්‍රමුඛතාව"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"සංවේදී"</string>
@@ -2680,6 +2633,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> පමණක් දක්වා ඇති සීනු වෙත මාරු වෙන්න"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"සෑම විටම බාධා කිරීම වෙත මාරු වෙන්න"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"තිර බාධා නැත"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"වත්මන් තිරය මත පෙනී සිටීමෙන් හෝ දිස් වීමෙන් බාධා නොකරන්න වෙතින් දැනුම්දීම් නිහඬ වීම වළක්වන්න"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"දැනුම්දීම් ආලෝකය නැත"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ආලෝකය ස්පන්දනය වීමෙන් බාධා නොකරන්න වෙතින් දැනුම්දීම් නිහඬ වීම වළක්වන්න"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
     <string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්‍රතිපෝෂණ යවන්න"</string>
@@ -2692,7 +2649,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ගැලවීමට පෙර PIN විමසන්න"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ගැලවීමට පෙර මුරපදය විමසන්න"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ගැලවීමට උපාංගය අගුළු දමා ඇත"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"කාර්යාල පැතිකඩ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"මෙම කාර්යාල පැතිකඩ කළමනාකරණය කරන්නේ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> විසින් කළමනාකරණය කරන ලදී"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(පරීක්ෂණාත්මක)"</string>
@@ -2745,9 +2701,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"දැනුම්දීම්"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"සාමාන්‍ය"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"අවහිර කරන්න"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"සංවේදී අන්තර්ගතය සඟවන ලද"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ප්‍රමුඛතාවය"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"එබී බැලීම් නැත"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2769,15 +2722,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"පුද්ගලික"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"කාර්යාලය"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"අවහිර කරන ලදි"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ප්‍රමුඛතාව"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"සංවේදී අන්තර්ගතය සඟවන ලද"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"එබී බැලීම් නැත"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"වසම් URL සමග"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"පරිපාලක මඟින් අබල කරන ලදි"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
     <string name="configure_apps" msgid="6685680790825882528">"යෙදුම් වින්‍යාස කරන්න"</string>
     <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"පැතිකඩ තෝරන්න"</string>
     <string name="app_permissions" msgid="4148222031991883874">"යෙදුම් අවසර"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> කින් <xliff:g id="COUNT_0">%d</xliff:g> කට අමතර ප්‍රවේශය ඉඩ දෙන ලදී"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> න් <xliff:g id="COUNT_0">%d</xliff:g> කට ඉඩ දෙන ලදී"</string>
@@ -2934,4 +2883,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"පින්තූර වර්ණ ප්‍රකාරය"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB භාවිතා කරන්න"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"සංදර්ශන පරිමාණය"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"සංදර්ශන ඝනත්ව විශාලන පරිමාණය පරිමාණ කිරීම"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"කුඩා"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"සාමාන්‍ය"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"විශාල"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"වඩා විශාල"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"විශාලතම"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"අභිරුචි (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"සියල්ල බලන්න"</string>
+    <string name="see_less" msgid="1250265310929558370">"අඩුවෙන් බලන්න"</string>
+    <string name="disconnected" msgid="5787956818111197212">"විසන්ධි වුණි"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"දත්තවලින් <xliff:g id="AMOUNT">%1$s</xliff:g>ක් ස්ථාපනය කරන ලදී"</string>
+    <string name="apps_summary" msgid="193158055537070092">"යෙදුම් <xliff:g id="COUNT">%1$d</xliff:g>ක් ස්ථාපනය කරන ලදී"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g>න් <xliff:g id="SIZE1">%1$s</xliff:g>ක් භාවිත කරන ලදී"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"අනුවර්තී දීප්තිය ක්‍රියාත්මකයි"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"අනුවර්තී දීප්තිය ක්‍රියාවිරහිතයි"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index b7a48ea..cd18766 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Veľké"</item>
     <item msgid="7786168277516233536">"Veľmi veľké"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Veľmi pomalá"</item>
-    <item msgid="2361722960903353554">"Pomalá"</item>
-    <item msgid="1145554631248513562">"Normálna"</item>
-    <item msgid="7553665153391107454">"Rýchla"</item>
-    <item msgid="1370673569131070146">"Rýchlejšia"</item>
-    <item msgid="4648206845228970803">"Veľmi rýchla"</item>
-    <item msgid="4977949754169483251">"Svižná"</item>
-    <item msgid="6106302964845503577">"Veľmi svižná"</item>
-    <item msgid="6800277205640837264">"Najrýchlejšia"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Veľmi nízka"</item>
-    <item msgid="2692137425242433765">"Nízka"</item>
-    <item msgid="3332408460740717754">"Normálna"</item>
-    <item msgid="4907380534957572531">"Vysoká"</item>
-    <item msgid="4699640516390840297">"Veľmi vysoká"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Prebieha vyhľadávanie..."</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a2a97ca..82dd60c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Zakázané správcom"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odtlačok prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa odtlačkov"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Použiť odtlačok na"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní tabletu z doku"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
     <string name="account_settings" msgid="6403589284618783461">"Účty"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobné"</string>
-    <string name="category_work" msgid="8699184680584175622">"Práca"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Účty pracovných profilov – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Účty osobných profilov"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Pracovný účet – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Vypnuté"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vždy zapnuté"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatický"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertovať na šifrovanie súborov"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertovať…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Súbory sú už šifrované"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Konvertovanie na šifrovanie založené na súboroch"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Chystáte sa konvertovať dátový oddiel na šifrovanie založené na súboroch.\n !!Upozornenie!! Týmto procesom vymažete všetky dáta.\n Táto funkcia je v alfa verzii a nemusí fungovať správne.\n Ak chcete pokračovať, stlačte tlačidlo „Vymazať a konvertovať…“."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Vymazať a konvertovať…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tlač"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tlačové služby"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Používať službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Skôr ako sa váš dokument dostane do tlačiarne, môže prejsť jedným alebo viacerými servermi."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenašli sa žiadne tlačiarne"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavenia"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Úplná aktivácia kľúčových slov a interakcia"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednoduchý prevod reči na text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Táto služba hlasového vstupu bude môcť neustále monitorovať hlas a ovládať za vás aplikácie so zapnutým hlasovým vstupom. Pochádza z aplikácie <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Chcete povoliť používanie tejto služby?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Nastavenia prevodu textu na reč"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Výstup prevodu textu na reč"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vždy používať moje nastavenia"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Predvolené nastavenia nižšie prepíšu nastavenia aplikácií"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Predvolené nastavenia"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Predvolený nástroj"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nastavenie použitia nástroja na syntézu reči pri vyslovení textu"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Rýchlosť reči"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Rýchlosť hovoreného textu"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje zvuk hovoreného textu"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Používať jazyk systému"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebol vybratý jazyk"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavenia jazyka hlasu pre hovorený text"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Vypočuť príklad"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Prehrať krátku ukážku syntézy reči"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Nainštalovať hlasové dáta"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Nainštalovať hlasové dáta potrebné na syntézu reči"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Hlas pre syntézu reči už je správne nainštalovaný."</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavenia sa zmenili. Toto je príklad súčasného znenia."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Vybratý nástroj nie je možné spustiť."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovať"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Zvoliť iný nástroj"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Nástroj na syntézu reči môže zhromažďovať všetok hovorený text, vrátane osobných údajov, ako sú heslá alebo čísla kreditných kariet. Je založený na nástroji <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete aktivovať nástroj na syntézu reči?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"V prípade tohto jazyka je na prevod textu na rečový výstup potrebné pripojenie k sieti."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Toto je príklad syntézy reči"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Stav predvoleného jazyka"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> je plne podporovaný"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> vyžaduje pripojenie k sieti"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> nie je podporovaný"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Prebieha kontrola..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Moduly"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavenia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Možnosť <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivovaná"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Nástroj <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je zakázaný"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Nastavenia nástroja"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jazyky a hlasy"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Nainštalované"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Nie je nainštalované"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Žena"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Muž"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Nainštal. nástroj syntézy reči"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Nástroj pred použ. povoľte."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Spustiť nastavenia nástroja"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferovaný nástroj"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Všeobecné"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Ovládanie napájania"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobrazovať dialóg „Aplikácia neodpovedá“ aj pre aplikácie na pozadí"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Vynútiť povolenie aplikácií na externom úložisku"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Umožňuje zapísať akúkoľvek aplikáciu do externého úložiska bez ohľadu na hodnoty v manifeste"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Vynútiť možnosť zmeny veľkosti aktivít"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Veľkosti všetkých aktivít bude možné zmeniť na niekoľko okien (bez ohľadu na hodnoty manifestu)."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Spotreba dát"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Spotreba dát apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Iba budíky"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Úplné ticho"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizuálne vyrušenia"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Predvolený tón upozornení"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Pri hovoroch aj vibrovať"</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Akým spôsobom chcete zobrazovať upozornenia na uzamknutom zariadení?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Upozornenia"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Upozornenia podľa tém"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Iné zvuky"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Zvuky číselnej klávesnice"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvuky zámky obrazovky"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovať upozornenia z tejto aplikácie"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Považovať za prioritné"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Umožniť aplikácii zobrazovať upozornenia, keď je režim Nerušiť nastavený na hodnotu Iba prioritné"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Povoliť nahliadnutie"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Umožniť aplikácii zdôrazniť určité upozornenia tak, že ich krátko zobrazí na aktuálnej obrazovke"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prepísať možnosť Nerušiť"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožniť týmto upozorneniam vyrušiť ma, ak je možnosť Nerušiť nastavená na možnosť Iba prioritné"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skryť citlivý obsah"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Keď je zariadenie uzamknuté, skryte obsah upozornení tejto aplikácie, ktorý by mohol odhaliť súkromné informácie"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Keď je zariadenie uzamknuté, skryť v týchto upozorneniach obsah, ktorý by mohol odhaliť súkromné informácie"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokované"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorita"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmena na možnosť Iba budíky platná do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmena na možnosť Vždy prerušiť"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Žiadne preruš. obr."</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Zabráňte, aby sa upozornenia stlmené nastavením Nerušiť čiastočne alebo úplne zobrazovali na aktuálnej obrazovke"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Žiadne svetlo upoz."</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Zabráňte, aby upozornenia stlmené nastavením Nerušiť nespúšťali blikajúce svetlo"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia aplikácií"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú väzbu o zariadení"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pred uvoľnením požiadať o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred uvoľnením požiadať o heslo"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Uzamknúť zariadenie počas uvoľňovania"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Pracovný profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovný profil spravuje aplikácia:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravované aplikáciou <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Upozornenia"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normálne"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokované"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Citlivý obsah je skrytý"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritné"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Žiadny náhľad"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobné"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Pracovné"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokované"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritné"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Citlivý obsah je skrytý"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Žiadny náhľad"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"S webovými adresami domény"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Zakázané správcom"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurácia aplikácií"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Výber profilu"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Povolenia aplikácií"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Ďalší prístup povolený <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikácií"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povolené: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikácií"</string>
@@ -2978,4 +2927,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Farebný režim obrázka"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije sa sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Hustota zobrazenia"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"zobrazenie hustota priblížiť upraviť hustotu úprava hustoty"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Malá"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Štandardná"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Veľká"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Väčšia"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Najväčšia"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Vlastná (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Zobraziť všetko"</string>
+    <string name="see_less" msgid="1250265310929558370">"Zobraziť menej"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Odpojené"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Objem využitých dát: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Počet nainštalovaných aplikácií: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Využité miesto: <xliff:g id="SIZE1">%1$s</xliff:g> z <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Prispôsobivý jas je ZAPNUTÝ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Prispôsobivý jas je VYPNUTÝ"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 7c3dda3..886d6f8 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Velika"</item>
     <item msgid="7786168277516233536">"Zelo velika"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Zelo počasna"</item>
-    <item msgid="2361722960903353554">"Počasna"</item>
-    <item msgid="1145554631248513562">"Običajna"</item>
-    <item msgid="7553665153391107454">"Hitra"</item>
-    <item msgid="1370673569131070146">"Hitreje"</item>
-    <item msgid="4648206845228970803">"Zelo hitro"</item>
-    <item msgid="4977949754169483251">"Naglo"</item>
-    <item msgid="6106302964845503577">"Zelo naglo"</item>
-    <item msgid="6800277205640837264">"Najhitreje"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Zelo nizek"</item>
-    <item msgid="2692137425242433765">"Nizka"</item>
-    <item msgid="3332408460740717754">"Običajna"</item>
-    <item msgid="4907380534957572531">"Visoka"</item>
-    <item msgid="4699640516390840297">"Zelo visok"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Iskanje …"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 25955a6..f80f2fe 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogočil skrbnik"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Prstni odtis"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravlj. prst. odtisov"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upor. prst. odtisa za"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ne predvajaj zvoka med vstavljanjem tabličnega računalnika v stojalo ali odstranjevanjem iz njega"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ne predvajaj zvoka pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
     <string name="account_settings" msgid="6403589284618783461">"Računi"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osebno"</string>
-    <string name="category_work" msgid="8699184680584175622">"Služba"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Računi za delovne profile – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Računi za osebne profile"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Delovni račun – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Onemogočeno"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vedno vklopljeno"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Samodejno"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Preklop na šifriranje podatkov"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Preklop …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Šifriranje podatkov je že uveljavljeno"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Preklop na šifriranje na ravni datotek"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Preklop particije s podatki na šifriranje na ravni datotek.\n !!Opozorilo!! S tem bodo izbrisani vsi podatki.\n Ta funkcija je različice alfa, zato morda ne bo delovala pravilno.\n Če želite nadaljevati, pritisnite »Izbriši in preklopi ...«."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Izbriši in preklopi …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po toliko nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tiskanje"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tiskalne storitve"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokument gre lahko na poti do tiskalnika skozi enega ali več strežnikov."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nameščena ni nobena storitev"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Tiskalnikov ni mogoče najti"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavitve"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Polna uporaba sprožilnih besed in govora"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Pretvorba preprostega govora v besedilo"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Storitev glasovnega vnosa bo lahko izvajala stalno vklopljeno nadziranje glasu in v vašem imenu upravljala aplikacije, ki omogočajo glasovno upravljanje. Storitev izvira iz aplikacije <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Želite omogočiti njeno uporabo?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Nastavitve pretvorbe besedila v govor"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Besedilo v govor"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vedno uporabi moje nastavitve"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Spodnje privzete nastavitve preglasijo nastavitve aplikacij"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Privzete nastavitve"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Privzeti mehanizem"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Nastavite mehanizem za sintezo govora na izgovorjeno besedilo"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Hitrost govora"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Hitrost govorjenega besedila"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Višina tona"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vpliva na ton govorjenega besedila"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Uporabi sistemski jezik"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik ni izbran"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavite glas, odvisen od jezika, za govorjeno besedilo"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušaj primer"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Predvajaj kratko predstavitev sinteze govora"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Namesti glasovne podatke"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Namestite govorne datoteke, ki jih potrebujete za sintezo govora"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Glasovi, ki jih potrebujete za sintezo govora, so že pravilno nameščeni"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nastavitve so spremenjene. To je primer, kako so slišati."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Izbranega mehanizma ni mogoče zagnati."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izberite drug mehanizem"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ta mehanizem za sintezo govora bo morda lahko zbiral izgovorjeno besedilo, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča ga mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Ali želite omogočiti uporabo tega mehanizma za sintezo govora?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Za pretvorbo besedila v govor potrebuje ta jezik delujočo omrežno povezavo."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"To je primer sinteze govora."</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Stanje privzetega jezika"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Jezik <xliff:g id="LOCALE">%1$s</xliff:g> je v celoti podprt"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> zahteva omrežno povezavo"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Jezik <xliff:g id="LOCALE">%1$s</xliff:g> ni podprt"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Preverjanje ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mehanizmi"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavitve za <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je omogočen"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogočen"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Nastavitve mehanizma"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Nastavitve za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jeziki in glasovi"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Nameščeno"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Ni nameščeno"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Ženski"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Moški"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Mehanizem za sintezo govora nameščen"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Pred upor. omogoč. nov mehan."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Zagon nastavitev mehanizma"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Prednostni mehanizem"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Splošno"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Nadzor porabe"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Posodabljanje nastavitve Wi‑Fi-ja"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Posodabljanje nastavitev Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Prikaz pogovornega okna za neodzivanje aplikacije v ozadju"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Vsili omogočanje aplikacij v zunanji shrambi"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Poskrbi, da je ne glede na vrednosti v manifestu mogoče vsako aplikacijo zapisati v zunanjo shrambo"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Vsili povečanje velikosti za aktivnosti"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Poskrbi, da je ne glede na vrednosti v manifestu mogoče vsem aktivnostim povečati velikost za način z več okni."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Poraba podatk. aplikacije"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Popolna tišina"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizualne prekinitve"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Privzeti ton zvonjenja za obvestila"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibriranje tudi za klice"</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kako naj se obvestila prikazujejo, ko je naprava zaklenjena?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Obvestila"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Obvestila glede tem"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvoki"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tipkovnice"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvoki ob zaklepanju zaslona"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikoli ne pokaži obvestil za to aplikacijo"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Obravnavanje kot prednostno"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Naj se slišijo obvestila te aplikacije, ko je funkcija »Ne moti« nastavljena na »Samo prednostno«"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Omogočanje kukanja"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Naj ta aplikacija poudari nekatera obvestila, tako da jih za hip pokaže na trenutnem zaslonu"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Preglasitev načina »Ne moti«"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Naj ta obvestila še naprej motijo, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skrivanje občutljive vsebine"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Ko je naprava zaklenjena, skrij vsebino obvestil te aplikacije, ki bi lahko razkrivala zasebne podatke"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Ko je naprava zaklenjena, skrij vsebino teh obvestil, ki bi lahko razkrivala zasebne podatke"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prednost"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Občutljivo"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Sprememba na samo alarme do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Sprememba na vedno prekini"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Brez prekinitev na zaslonu"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Preprečevanje, da bi si bilo mogoče obvestila, utišana z načinom »ne moti«, ogledati s kukanjem, ali da bi se prikazala na trenutnem zaslonu"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Brez lučke za obvestila"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Preprečevanje, da bi obvestila, utišana z načinom »ne moti«, povzročila utripanje lučke"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Zahtevaj PIN pred odpenjanjem"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred odpenjanjem vprašaj za geslo"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Pri odpenjanju zakleni napravo"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Delovni profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ta delovni profil upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Poskusno)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Obvestila"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Običajno"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blokirano"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Občutljiva vsebina skrita"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prednostno"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Brez kukanja"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prednostno"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Občutljiva vsebina skrita"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Brez kukanja"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Z URL-ji domene"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Onemogočil skrbnik"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguriranje aplikacij"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Izbira profila"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplik."</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Dod. dostop dovoljen toliko aplikacijam: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dovoljene aplikacije: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2978,4 +2927,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Način barv slike"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Uporaba sRGB-ja"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Zaslonsko razmerje"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"gostota zaslona povečava razmerje spreminjanje velikosti"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Majhno"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Običajno"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Veliko"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Večje"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Največje"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Po meri (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Pokaži vse"</string>
+    <string name="see_less" msgid="1250265310929558370">"Pokaži manj"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Povezava prekinjena"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Prenesenih podatkov: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Nameščenih aplikacij: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Uporabljeno: <xliff:g id="SIZE1">%1$s</xliff:g> od <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Prilagodljiva svetlost je VKLOPLJENA"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Prilagodljiva svetlost je IZKLOPLJENA"</string>
 </resources>
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq-rAL/arrays.xml
index 45d827e..7500c54 100644
--- a/res/values-sq-rAL/arrays.xml
+++ b/res/values-sq-rAL/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"Të gjitha"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 sekonda"</item>
-    <item msgid="8881760709354815449">"30 sekonda"</item>
-    <item msgid="7589406073232279088">"1 minutë"</item>
-    <item msgid="7001195990902244174">"2 minuta"</item>
-    <item msgid="7489864775127957179">"5 minuta"</item>
-    <item msgid="2314124409517439288">"10 minuta"</item>
-    <item msgid="6864027152847611413">"30 minuta"</item>
+    <item msgid="3342301044271143016">"15 sek."</item>
+    <item msgid="8881760709354815449">"30 sek."</item>
+    <item msgid="7589406073232279088">"1 min."</item>
+    <item msgid="7001195990902244174">"2 min."</item>
+    <item msgid="7489864775127957179">"5 min."</item>
+    <item msgid="2314124409517439288">"10 min."</item>
+    <item msgid="6864027152847611413">"30 min."</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Asnjëherë"</item>
-    <item msgid="2194151041885903260">"15 sekonda"</item>
-    <item msgid="5892295237131074341">"30 sekonda"</item>
-    <item msgid="3538441365970038213">"1 minutë"</item>
-    <item msgid="412343871668955639">"2 minuta"</item>
-    <item msgid="5076853889688991690">"5 minuta"</item>
-    <item msgid="1903860996174927898">"10 minuta"</item>
-    <item msgid="6415509612413178727">"30 minuta"</item>
+    <item msgid="2194151041885903260">"15 sek."</item>
+    <item msgid="5892295237131074341">"30 sek."</item>
+    <item msgid="3538441365970038213">"1 min."</item>
+    <item msgid="412343871668955639">"2 min."</item>
+    <item msgid="5076853889688991690">"5 min."</item>
+    <item msgid="1903860996174927898">"10 min."</item>
+    <item msgid="6415509612413178727">"30 min."</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Menjëherë"</item>
-    <item msgid="6736512735606834431">"5 sekonda"</item>
-    <item msgid="8044619388267891375">"15 sekonda"</item>
-    <item msgid="1822002388249545488">"30 sekonda"</item>
-    <item msgid="8538071621211916519">"1 minutë"</item>
-    <item msgid="5663439580228932882">"2 minuta"</item>
-    <item msgid="49888496216106852">"5 minuta"</item>
-    <item msgid="9002737361305019353">"10 minuta"</item>
-    <item msgid="4322676235684793329">"30 minuta"</item>
+    <item msgid="6736512735606834431">"5 sek."</item>
+    <item msgid="8044619388267891375">"15 sek."</item>
+    <item msgid="1822002388249545488">"30 sek."</item>
+    <item msgid="8538071621211916519">"1 min."</item>
+    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="49888496216106852">"5 min."</item>
+    <item msgid="9002737361305019353">"10 min."</item>
+    <item msgid="4322676235684793329">"30 min."</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"E vogël"</item>
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"E madhe"</item>
     <item msgid="7786168277516233536">"Shumë e madhe"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Shumë e ulët"</item>
-    <item msgid="2361722960903353554">"E ngadaltë"</item>
-    <item msgid="1145554631248513562">"Normale"</item>
-    <item msgid="7553665153391107454">"E shpejtë"</item>
-    <item msgid="1370673569131070146">"Më e shpejtë"</item>
-    <item msgid="4648206845228970803">"Shumë e shpejtë"</item>
-    <item msgid="4977949754169483251">"E shpejtë"</item>
-    <item msgid="6106302964845503577">"Shumë e shpejtë"</item>
-    <item msgid="6800277205640837264">"Më e shpejta"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Shumë i ulët"</item>
-    <item msgid="2692137425242433765">"E ulët"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"I lartë"</item>
-    <item msgid="4699640516390840297">"Shumë i lartë"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Po skanon..."</item>
@@ -151,8 +133,8 @@
     <item msgid="2330782789550628803">"Jashtë rrezes"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 minuta"</item>
-    <item msgid="8675215713017289017">"5 minuta"</item>
+    <item msgid="8151962652413645395">"2 min."</item>
+    <item msgid="8675215713017289017">"5 min."</item>
     <item msgid="477015974247590543">"1 orë"</item>
     <item msgid="5198271470953124739">"Skadim të kohës së veprimit, asnjëherë!"</item>
   </string-array>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index a95df8a..0331402 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Cakto \"Vendndodhjen time\", shkyçjen e ekranit, kyçjen e kartës SIM, kyçjen e hapësirës për ruajtjen e kredencialeve"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Cakto \"Vendndodhja ime\", shkyçjen e ekranit, kyçjen e hapësirës ruajtëse të kredencialeve"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Fjalëkalimet"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Çaktivizuar nga administratori"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Gjurma e gishtit"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Menaxho gjurm. gishtit"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Përdor gjurmën për"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Mos lësho asnjë tingull kur futet ose hiqet tableti nga stacioni"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Mos lësho asnjë tingull kur futet ose hiqet telefoni nga stacioni"</string>
     <string name="account_settings" msgid="6403589284618783461">"Llogaritë"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personale"</string>
-    <string name="category_work" msgid="8699184680584175622">"Punë"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Llogaritë e profilit të punës - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Llogaritë e profilit personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Llogari pune - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Çaktivizuar"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Gjithmonë aktive"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatike"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konverto në enkriptimin e skedarit"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konverto..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkriptimi i skedarit është kryer tashmë"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Po konvertohet në enkriptimin e bazuar te skedari"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konverto ndarjen e të dhënave në enkriptimin e bazuar te skedari.\n !!Paralajmërim!! Kjo gjë do të spastrojë të gjitha të dhënat e tua.\n Ky funksion është alfa dhe mund të mos punojë si duhet.\n Shtyp \"Pastro dhe konverto...\" për të vazhduar."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Pastro dhe konverto..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Në gjendje gjumi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrani çaktivizohet"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kur, <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Cilësimet"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printimi"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Shërbimet e printimit"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Të përdoret \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumenti mund të kalojë përmes një ose shumë serverëve deri te printeri."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nuk është instaluar asnjë shërbim"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nuk u gjet asnjë printer"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Cilësimet"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ndërveprimi dhe fjalëkyçi i aktivizimit (hotword), i plotë"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Shërbim i thjeshtë \"ligjërim-në-tekst\""</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ky shërbim i hyrjes së zërit do të kryejë gjithmonë monitorim të zërit si dhe do të kontrollojë në emrin tënd, të gjitha aplikacionet që mundësohen me zë. Ai ofrohet nga aplikacioni <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Të aktivizohet përdorimi e këtij shërbimi?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Cilësimet \"tekst-në-ligjërim\""</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Dalja \"tekst-në-ligjërim\""</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Përdor gjithmonë cilësimet e mia"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Cilësimet e parazgjedhura më poshtë zëvendësojnë cilësimet e aplikacionit"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Cilësimet e parazgjedhura"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Motori i parazgjedhur"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Vendos motorin e sintezës së të folurit që do të përdoret për tekstin e folur"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Shpejtësia e të folurit"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Shpejtësia me të cilën thuhet teksti"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonaliteti"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ndikon te toni i tekstit të folur"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Gjuha"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Përdor gjuhën e sistemit"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nuk është përzgjedhur gjuha"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Cakton zërin specifik të gjuhës për tekstin e folur"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Dëgjo një shembull"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Luaj një demonstrim të shkurtër të sintezës së të folurit"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instalo të dhënat e zërit"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalo të dhënat e zërit që kërkohen për sintezën e të folurit"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Zërat e kërkuar për sintezën e ligjërimit janë instaluar si duhet"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Cilësimet kanë ndryshuar. Ky është një shembull si tingëllojnë."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Motori që zgjodhe nuk mund të ekzekutohet."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguro"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Zgjidh një motor tjetër"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ky motor i sintezës së të folurit mund të mbledhë të gjithë tekstin që do të flitet, duke përfshirë të dhëna personale si fjalëkalime dhe numra kartash krediti. Ai vjen nga motori <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Të aktivizohet përdorimi i këtij motori të sintezës së të folurit?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Kjo gjuhë kërkon një lidhje funksionale interneti për daljen \"tekst-në-ligjërim\"."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ky është një shembull i sintezës së të folurit"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Statusi i gjuhës së parazgjedhur"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> mbështetet plotësisht"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> kërkon lidhje interneti"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nuk mbështetet"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Po kontrollon..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motorët"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Cilësimet e <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> është i aktivizuar"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> është i çaktivizuar"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Cilësimet e motorit"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Cilësimet për \"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>\""</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Gjuhët dhe zërat"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"I instaluar"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Jo i instaluar"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femër"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mashkull"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Motori i sintezës së të folurit u instalua"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktivizo një motor të ri para përdorimit."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Hap cilësimet e motorit"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motori i preferuar"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Të përgjithshme"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrolli i energjisë"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Po përditëson cilësimin e Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Po përditëson cilësimin e \"Bluetooth-it\""</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Shfaq raportet ANR (Aplikacioni nuk përgjigjet) për aplikacionet në sfond"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Detyro lejimin në hapësirën e jashtme"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Bën që çdo aplikacion të jetë i përshtatshëm për t\'u shkruar në hapësirën ruajtëse të jashtme, pavarësisht nga vlerat e manifestit"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Detyro madhësinë e ndryshueshme për aktivitetet"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Bën që të gjitha aktivitetet të kenë madhësi të ndryshueshme për përdorimin me shumë dritare, pavarësisht vlerave të manifestit."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Përdorimi i të dhënave"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Përdorimi i të dhënave"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Vetëm alarmet"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Heshtje e plotë"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Ndërprerjet vizuale"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Zilja e telefonit"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Zilja e parazgjedhur e njoftimit"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Edhe dridhje për telefonatat"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kur pajisja jote të jetë e kyçur, si dëshiron të të shfaqen njoftimet?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Njoftimet"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Njoftimet e apl."</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Njoftimet e temave"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Tinguj të tjerë"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonet e bllokut të tasteve"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Tingujt e kyçjes së ekranit"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Po ngarkon aplikacionet..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Bllokoji të gjitha"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Mos shfaq asnjëherë njoftime nga ky aplikacion"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Trajtoje si prioritet"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Lejo dëgjimin e njoftimeve të këtij aplikacioni kur modaliteti \"Mos shqetëso\" të vendoset në gjendjen \"Vetëm me prioritet\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Lejo përgjimin"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Lejoje këtë aplikacion që të theksojë njoftime të caktuara duke i rrëshqitur shkurtimisht në pamje në ekranin aktual"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anulo \"Mos shqetëso\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lejo që këto njoftime të vazhdojnë të ndërpresin kur \"Mos shqetëso\" është vendosur në \"Vetëm prioritare\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fshihe përmbajtjen delikate"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Kur pajisja është e kyçur, fshih përmbajtjen në njoftimet e këtij aplikacioni e cila mund të shfaqë informacione private"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kur pajisja është e kyçur, fshih përmbajtjen në këto njofitme që mund të zbulojnë informacione personale"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"I bllokuar"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Me prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikate"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ndrysho në gjendjen \"vetëm alarmet\" deri në <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ndrysho te \"ndërprit gjithmonë\""</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Asnjë ndërprerje e ekranit"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Mos lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të duken ose të shfaqen në ekranin aktual"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Asnjë dritë njoftimi"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Mos lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të bëjnë që drita të pulsojë"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Njoftimet e apl."</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cilësimet e njoftimeve"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dërgo përshtypjet për këtë pajisje"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Zhgozhdimi kërkon PIN-in"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Kërko fjalëkalim para heqjes nga gozhdimi"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kyçe pajisjen kur heq gozhdimin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profili i punës"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ky profil pune menaxhohet nga:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"I menaxhuar nga <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentale)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Njoftimet"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normale"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blloko"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Përmbajtje delikate të fshehur"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Me prioritet"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Pa pamje"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Punë"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Të bllokuara"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Me prioritet"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Përmbajtje delikate të fshehur"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Pa pamje"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Me URL-të e domenit"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Çaktivizuar nga administratori"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Të përparuara"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguro aplikacionet"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikacion i panjohur"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Zgjidh profilin"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Lejet e aplikacionit"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> nga gjithsej <xliff:g id="COUNT_1">%d</xliff:g> aplikacione lejuan qasje shtesë"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> aplikacione nga <xliff:g id="COUNT_1">%d</xliff:g> të tilla u lejuan"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modalitti i ngjyrave të figurës"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Përdor sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Shkalla e ekranit"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekrani dendësia shkalla e zmadhimit shkallëzimi"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"E vogël"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"E madhe"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Më e madhe"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Më e madhja"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"E personalizuar (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Shikoji të gjitha"</string>
+    <string name="see_less" msgid="1250265310929558370">"Shiko më pak"</string>
+    <string name="disconnected" msgid="5787956818111197212">"E shkëputur"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> nga të dhënat janë përdorur"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplikacione të instaluara"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> nga <xliff:g id="SIZE2">%2$s</xliff:g> janë përdorur"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Ndriçimi përshtatës është AKTIV"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Ndriçimi përshtatës është JOAKTIV"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index b2b4904..d291126 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Велика"</item>
     <item msgid="7786168277516233536">"Огромна"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Веома споро"</item>
-    <item msgid="2361722960903353554">"Полако"</item>
-    <item msgid="1145554631248513562">"Нормалан"</item>
-    <item msgid="7553665153391107454">"Брзо"</item>
-    <item msgid="1370673569131070146">"Брже"</item>
-    <item msgid="4648206845228970803">"Веома брзо"</item>
-    <item msgid="4977949754169483251">"Брзо"</item>
-    <item msgid="6106302964845503577">"Веома брзо"</item>
-    <item msgid="6800277205640837264">"Најбрже"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Веома ниско"</item>
-    <item msgid="2692137425242433765">"Низак"</item>
-    <item msgid="3332408460740717754">"Нормалан"</item>
-    <item msgid="4907380534957572531">"Висок"</item>
-    <item msgid="4699640516390840297">"Веома високо"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Скенирање..."</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3e2c010..c60ed97 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -314,6 +314,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Онемогућио је администратор"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отисак прста"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Управљај отис. прстију"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Користи отис. прста за"</string>
@@ -819,8 +820,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не репродукуј звук приликом постављања таблета на базну станицу или уклањања са ње"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не пуштај звук приликом уметања телефона на постоље или уклањања са њега"</string>
     <string name="account_settings" msgid="6403589284618783461">"Налози"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Лично"</string>
-    <string name="category_work" msgid="8699184680584175622">"Посао"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Налози профила за посао – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Налози личног профила"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Налог за посао – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +842,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Онемогућено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Увек укључено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Аутоматски"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертуј у шифровање датотека"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Конвертуј..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Већ се користи шифровање датотека"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Конвертовање у шифровање појединачних датотека"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Конвертујте шифровање партиције података у шифровање појединачних датотека.\n !!Упозорење!! Тиме бришете све податке.\n Ово је алфа верзија функције и вероватно неће функционисати исправно.\n Притисните „Избриши и конвертуј...“ да бисте наставили."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Избриши и конвертуј..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спавање"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екран се искључује"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
@@ -1711,8 +1716,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Подешавања"</string>
     <string name="print_settings" msgid="4742428530112487843">"Штампање"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуге штампања"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Документ може да прође кроз један или више сервера на путу до штампача."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ниједна услуга није инсталирана"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Није пронађен ниједан штампач"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Подешавања"</string>
@@ -1893,54 +1896,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Цела актуелна реч и интеракција"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Једноставан говор у текст"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ова услуга гласовног уноса ће моћи уместо вас да обавља константно гласовно праћење и контролише апликације у којима је омогућен глас. Она је део апликације <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове услуге?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Подешавања преласка из текста у говор"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Излаз за претварање текста у говор"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Увек користи моја подешавања"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Доленаведена подразумевана подешавања замењују подешавања апликације"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Подразумевана подешавања"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Подразумевани уређај"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Подесите механизам за синтетисање говора који ће да се користи за изговорени текст"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Брзина говора"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Брзина изговарања текста"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ниво"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Утиче на тон изговореног текста"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Језик"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Користи језик система"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Језик није изабран"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Подешава глас специфичан за језик намењен говорном тексту"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Послушај пример"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Пуштање кратке демонстрације синтезе говора"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Инсталирај гласовне податке"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Инсталирање говорних података потребних за синтезу говора"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Гласови потребни за синтезу говора већ су исправно инсталирани"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Подешавања су промењена. Ово је пример како звуче."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Није могуће покренути уређај који сте изабрали."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриши"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Изабери други уређај"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ова технологија за синтезу говора можда може да прикупља сав текст који ће бити изговорен, укључујући личне податке као што су лозинке и бројеви кредитних картица. То потиче из технологије <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове технологије за синтезу говора?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање текста у говор."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ово је пример синтезе говора"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Статус подразумеваног језика"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> је подржан у потпуности"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> захтева везу са мрежом"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> није подржан"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Провера..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Машине"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> подешавања"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> је омогућено"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> је онемогућено"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Подешавања машине"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Подешавања за <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Језици и гласови"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Инсталирано"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Није инсталирано"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Женски"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Мушки"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Машина за синтезу говора инстал."</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Омогући нов механизам пре употребе."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Покрени подешавања машине"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Жељена машина"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Опште"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контрола напајања"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ажурирање Wi-Fi подешавања"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање Bluetooth подешавања"</string>
@@ -2181,10 +2136,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Прикажи дијалог Апликација не реагује за апликације у позадини"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Принудно дозволи апликације у спољној"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Омогућава уписивање свих апликација у спољну меморију, без обзира на вредности манифеста"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Принудно омогући промену величине активности"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Омогућава промену величине свих активности за режим са више прозора, без обзира на вредности манифеста."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Коришћење података аплик."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Обрачун података код мобилног оператера се можда разликује од вашег уређаја."</string>
@@ -2576,6 +2529,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само аларми"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Потпуна тишина"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Визуелни прекиди"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Подразумевана мелодија звона обавештења"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрација и за позиве"</string>
@@ -2589,6 +2543,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Када је уређај закључан, како желите да се обавештења приказују?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Обавештења"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Обавештења за теме"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Други звукови"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонови нумеричке тастатуре"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звукови закључавања екрана"</string>
@@ -2617,12 +2572,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавају се апликације..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Никада не приказуј обавештења из ове апликације"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Третирај као приоритет"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Дозволите да се обавештења ове апликације чују када је опција Не узнемиравај подешена на Само приоритетни прекиди"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволи завиривање"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволите овој апликацији да истиче одређена обавештења тако што ће их накратко приказивати на актуелном екрану"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Замени режим Не узнемиравај"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Омогућава да ова обавештења наставе да се приказују када је режим Не узнемиравај подешен на опцију Само приоритетни прекиди"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Сакриј осетљив садржај"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Када је уређај закључан, сакријте садржај из обавештења ове апликације који може да открије приватне податке"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Када је уређај закључан, сакрива садржај у овим обавештењима који може да открије приватне информације"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Блокирано"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Приоритет"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Осетљиво"</string>
@@ -2695,6 +2648,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Пребацује у режим само са алармима до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Пребацује у режим увек прекидај"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Без прекида на екрану"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Спречава да се на актуелном екрану приказују обавештења која су искључена режимом Не узнемиравај"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Без светла за обавештења"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Спречава да светло трепери за обавештења која су искључена режимом Не узнемиравај"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
@@ -2707,7 +2664,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Тражи PIN пре откачињања"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Тражи лозинку пре откачињања"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Закључај уређај пре откачињања"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Профил за посао"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Овим профилом за Work управља:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управља <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
@@ -2760,9 +2716,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Обавештења"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Нормално"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Блокирана"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Скривен осетљив садржај"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Приоритетна"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Без завиривања"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2787,15 +2740,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Личне"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Посао"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Блокирана"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Приоритетна"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Скривен осетљив садржај"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Без завиривања"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Са URL-овима домена"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Онемогућио је администратор"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигуришите апликације"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Изаберите профил"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Дозволе за апликације"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Апликације са додатним приступом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Апликације са дозволом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
@@ -2955,4 +2904,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Режим боја слика"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Размера приказа"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"приказ густина зумирање размера прилагођавање"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Мала"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Нормална"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Велика"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Већа"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Највећа"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Прилагођена (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Прикажи све"</string>
+    <string name="see_less" msgid="1250265310929558370">"Прикажи мање"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Веза је прекинута"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Користи се <xliff:g id="AMOUNT">%1$s</xliff:g> података"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Инсталираних апликација: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Користи се <xliff:g id="SIZE1">%1$s</xliff:g> од <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Прилагодљива осветљеност је УКЉУЧЕНА"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Прилагодљива осветљеност је ИСКЉУЧЕНА"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 25e69aa..fce9f67 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Stor"</item>
     <item msgid="7786168277516233536">"Mycket stor"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Mycket långsam"</item>
-    <item msgid="2361722960903353554">"Långsam"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Snabb"</item>
-    <item msgid="1370673569131070146">"Snabbare"</item>
-    <item msgid="4648206845228970803">"Mycket snabbt"</item>
-    <item msgid="4977949754169483251">"Supersnabbt"</item>
-    <item msgid="6106302964845503577">"Turbosnabbt"</item>
-    <item msgid="6800277205640837264">"Snabbast"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Mycket låg"</item>
-    <item msgid="2692137425242433765">"Låg"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Hög"</item>
-    <item msgid="4699640516390840297">"Mycket hög"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Skannar…"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8e7f869..0063bb4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Har inaktiverats av administratören"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtryck"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Hantera fingeravtryck"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Använd avtryck för"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Spela inte upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konton"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personligt"</string>
-    <string name="category_work" msgid="8699184680584175622">"Arbetet"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Jobbprofilkonton – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personliga profilkonton"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Jobbkonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Inaktiverad"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alltid på"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatiskt"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertera till filkryptering"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertera …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Filkryptering används redan"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Konverterar till filbaserad kryptering"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konvertera datapartitionen till filbaserad kryptering.\n Varning! All data raderas.\n Detta är en alfafunktion och fel kan uppstå.\n Tryck på Rensa och konvertera … om du vill fortsätta."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Rensa och konvertera …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Inställningar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Utskrift"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjänster"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"På vägen till skrivaren kan dokumentet passera via en eller flera servrar."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Inga tjänster är installerade"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Det gick inte att hitta några skrivare"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Inställningar"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Alla kommandoord och fullständig interaktion"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Enkelt tal till text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Den här röstinmatningstjänsten kan ha röstövervakning aktiverad hela tiden och styra röstaktiverade appar åt dig. Den kommer från <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vill du aktivera tjänsten?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Text-till-tal-inställningar"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Text-till-tal"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Använd alltid mina inställningar"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Standardinställningarna nedan åsidosätter appinställningarna"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Standardinställningar"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Standardmotor"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Konfigurera talsyntesmotorn så att den kan användas för talad test"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Talhastighet"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Talhastighet för texten"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påverkar den talade textens ton"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Använd systemspråk"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Inget språk valt"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ange språkspecifik röst för den talade texten"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Lyssna på ett exempel"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Spela upp en kort demonstration av talsyntes"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Installera röstdata"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installera de ljuddata som krävs för talsyntes"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Rösterna som krävs för talsyntes är redan installerade"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Dina inställningar har ändrats. Detta är ett exempel på hur de låter."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Det gick inte att köra den valda motorn."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurera"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Välj en annan motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Talsyntesmotorn kan samla in all text som ska talas, inklusive personlig information som lösenord och kreditkortsnummer. Den kommer från <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-motorn. Vill du använda den här talsyntesmotorn?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Det krävs en fungerande nätverksanslutning för att text-till-tal ska fungera för det här språket."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Detta är ett exempel på talsyntes"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status för standardspråk"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> stöds"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> kräver nätverksanslutning"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> stöds inte"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Kontrollerar ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motorer"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-inställningar"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> är aktiverad"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> är inaktiverad"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Inställningar för motor"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Inställningar för <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Språk och röster"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Installerad"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Inte installerad"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kvinna"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Man"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Talsyntesmotor installerad"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Aktivera motor före användning"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Öppna inställningar för sökmotor"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Prioriterad sökmotor"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Allmänt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Strömkontroll"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi-inställningar uppdateras"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppdatera Bluetooth-inställningar"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Visa dialogrutan om att appen inte svarar för bakgrundsappar"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Tillåt appar i externt lagringsutrymme"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Appen kan skrivas till extern lagring, oavsett manifestvärden"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Framtvinga storleksanpassning för aktiviteter"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Detta gör det möjligt att ändra storleken på alla aktiviteter i flerfönsterläge, oavsett manifestvärden."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataanvändning"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Endast alarm"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Helt tyst"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Visuella avbrott"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardsignal för avisering"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrera också vid samtal"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Hur vill du att aviseringar visas när enheten är låst?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Aviseringar"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Ämnesaviseringar"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andra ljud"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Knappsatsljud"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ljud vid skärmlåsning"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Visa aldrig aviseringar från den här appen"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandla som prioriterad"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Tillåt att aviseringar från den här appen hörs när funktionen Stör ej är inställd på Endast prioriterade"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillåt snabbtitt"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Tillåt att den här appen framhäver vissa aviseringar genom att dra in dem på den aktuella skärmen en kort stund."</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Åsidosätt Stör ej"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Fortsätt att få dessa aviseringar när Endast prioriterade har angetts för Stör ej"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Dölj känsligt innehåll"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Dölj innehåll som kan avslöja privat information från appens aviseringar när enheten är låst"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Dölj innehåll som kan avslöja privata uppgifter i dessa aviseringar när enheten är låst"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockerad"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Känsligt"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ändra till endast alarm fram till kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ändra till avbryt alltid"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Inga skärmavbrott"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Hindra att aviseringar visas på den aktuella skärmen när du har aktiverat tysta aviseringar via läget Stör ej"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Ingen ljusavisering"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Hindra att aviseringslampan blinkar när du har aktiverat tysta aviseringar via läget Stör ej"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Be om pinkod innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Be om lösenord innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten när skärmen lossas"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Arbetsprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Den här jobbprofilen hanteras av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Hanteras av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(experimentellt)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Aviseringar"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normalt"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Blockera"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Känsligt innehåll har dolts"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Prioritet"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Ingen förhandstitt"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g>/<xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>/<xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personligt"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Arbetet"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blockerad"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritet"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Känsligt innehåll har dolts"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Ingen förhandstitt"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Med domänadresser"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Har inaktiverats av administratören"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurera appar"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Välj profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Appens behörigheter"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar har ytterligare åtkomst"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar tillåts"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Färgläge för bilder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Använd sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala på skärmen"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"skärmdensitet skala zoom förstoring"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Små"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normalstora"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stora"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Större"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Störst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Anpassad (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Visa alla"</string>
+    <string name="see_less" msgid="1250265310929558370">"Visa färre"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Frånkopplad"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> data används"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> appar har installerats"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> av <xliff:g id="SIZE2">%2$s</xliff:g> används"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Anpassad ljusstyrka är PÅ"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Anpassad ljusstyrka är AV"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index daf733c..f1c50ca 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Kubwa"</item>
     <item msgid="7786168277516233536">"Kubwa sana"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Polepole sana"</item>
-    <item msgid="2361722960903353554">"Polepole"</item>
-    <item msgid="1145554631248513562">"Kawaida"</item>
-    <item msgid="7553665153391107454">"Haraka"</item>
-    <item msgid="1370673569131070146">"Kwa kasi"</item>
-    <item msgid="4648206845228970803">"Kasi sana"</item>
-    <item msgid="4977949754169483251">"Haraka"</item>
-    <item msgid="6106302964845503577">"Haraka sana"</item>
-    <item msgid="6800277205640837264">"Haraka mno"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Chini sana"</item>
-    <item msgid="2692137425242433765">"Chini"</item>
-    <item msgid="3332408460740717754">"Kawaida"</item>
-    <item msgid="4907380534957572531">"Juu"</item>
-    <item msgid="4699640516390840297">"Juu sana"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Inasafisha..."</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f2c9cd8..d456fdf 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Manenosiri"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Msimamizi amezima mapendeleo ya mipangilio"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kitambulisho"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Dhibiti vitambulisho"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Tumia kitambulisho kwa"</string>
@@ -815,8 +816,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Usicheze sauti wakati unaingiza au kuondoa kompyuta ndogo kutoka kwa gati"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Usichezeshe sauti wakati unapoingiza au kuondoa simu kutoka kwa gati"</string>
     <string name="account_settings" msgid="6403589284618783461">"Akaunti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Ya Kibinafsi"</string>
-    <string name="category_work" msgid="8699184680584175622">"Kazini"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Akaunti za wasifu wa kazini - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Akaunti za wasifu wa binafsi"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akaunti ya kazini - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -839,6 +838,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Imezimwa"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Imewashwa kila wakati"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Otomatiki"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Badilisha kuwa usimbaji fiche wa faili"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Badilisha..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Tayari faili imesimbwa kwa njia fiche"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Inabadilisha kuwa usimbaji fiche unaotegemea faili"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Badilisha sehemu za data kuwa usimbaji unaotegemea faili.\n!!Onyo!! Hatua hii itafuta data yako yote.\nKipengele hiki ni cha alpha, na huenda kisifanye kazi vizuri.\nBonyeza \'Futa na ubadilishe...\'  ili uendelee."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Futa na uibadilishe..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -1703,8 +1708,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
     <string name="print_settings" msgid="4742428530112487843">"Kuchapisha"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Huduma za uchapishaji"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Huenda hati yako ikapitia seva moja au zaidi ikielekea kwenye printa."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hakuna huduma zilizosakinishwa"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Hakuna printa zilizopatikana"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Mipangilio"</string>
@@ -1885,54 +1888,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Neno tekelezi na mwingiliano kamilifu"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Huduma rahisi ya semi kwenda maandishi"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Huduma hii ya kuweka data kwa kutamka itakuwa na uwezo wa kutekeleza ufuatiliaji wa hali ya kuwashwa muda wote na kudhibiti programu zinazowashwa kwa sauti kwa niaba yako. Inatoka katika programu ya <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Ungependa kuwasha huduma hii kwa matumizi?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Mipangilio ya maandishi kwa hotuba"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Kubadilisha maandishi hadi usemi"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tumia mipangilio yangu kila wakati"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Mipangilio mbadala ya hapa chini inafuta mipangilio ya programu"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Mipangilio ya chaguo-msingi"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Injini mbadala"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Weka injini ya usanisi wa usemi itumike kwa maandishi yanayotamkwa"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Kiwango cha usemaji"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maneno"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Huadhiri hali ya maandishi yaliyosemwa"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Lugha"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Tumia lugha ya mfumo"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lugha haijachaguliwa"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha inayolingana na yanayozungumzwa"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Sikiliza mfano"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Cheza onyesho fupi la usanisi usemaji"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Sakinisha data ya sauti"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sakinisha data ya sauti inayohitajika kuunganisha usemi"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Sauti zinazohitajika kwa usanisi wa usemaji tayari zimesakinishwa vizuri"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Mipangilio yako imebadilika. Huu ni mfano wa jinsi inavyosikika."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Injini uliyochagua haiwezi kuendeshwa."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Sanidi"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chagua injini nyingine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hotuba hii inawezesha injini huenda ikaweza kukusanya maandishi ambayo yatazungumziwa, ikijumlisha data ya kibinafsi ya nenosiri na namba ya kaddi ya mkopo. Inatoka kwa injini ya <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Wezesha matumizi ya hotuba hii iliyowezeshwa ya injini?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Lugha hii inahitaji muunganisho wa mtandao unaofanya kazi kwa towe ya maandishi hadi sauti."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Huu ni mfano wa usanisi usemaji"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Hali ya lugha chaguo-msingi"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> inaweza kutumiwa kikamilifu"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> inahitaji muunganisho wa mtandao"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> haiwezi kutumiwa"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Tunakagua..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Injini"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mipangilio"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> imewezeshwa"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Imelemazwa <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Mipangilio ya Injini"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Mipangilio ya <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Lugha na sauti"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Imesakinishwa"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Haija sakinishwa"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Mwanamke"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mwanamume"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Hotuba kiwezeshi cha injini imesakinishwa"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Wezesha injini mpya kabla ya kutumia."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Zindua mipangilio ya injini"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Injini inayofaa"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Kwa ujumla"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kidhibiti nishati"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Inasasisha mpangilio wa Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Inasasisha mpangilio wa Bluetooth"</string>
@@ -2173,10 +2128,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Onyesha kisanduku kidadisi cha Programu Haiitikii kwa programu za usuli"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Lazima uruhusu programu kwenye hifadhi ya nje"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Huweka programu kwenye hifadhi ya nje, bila kujali maelezo"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Lazimisha shughuli ziweze kubadilishwa ukubwa"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Fanya shughuli zote ziweze kubadilishwa ukubwa kwa ajili ya dirisha nyingi, bila kujali thamani za faili ya maelezo."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Matumizi data ya programu"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na inayofanyika katika kifaa chako."</string>
@@ -2568,6 +2521,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Kengele pekee"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Kimya kabisa"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Ukatizaji unaoonekana"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Mlio chaguo-msingi wa arifa"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Tetema pia simu zinapoingia"</string>
@@ -2581,6 +2535,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Je, ungependa arifa vipi zionyeshwe wakati kifaa kimefungwa?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Arifa"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Arifa za mada"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Sauti nyingine"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Sauti za vitufe vya kupiga simu"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sauti za kufunga skrini"</string>
@@ -2608,12 +2563,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Usionyeshe arifa kutoka programu hii kabisa"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Weka kama kipaumbele"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Ruhusu arifa za programu hii zitamkwe wakati hali ya Usinisumbue imewekwa kama Kipaumbele pekee"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Ruhusu mwonekano wa kuchungulia"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Ruhusu programu hii iangazie arifa fulani kwa kuzitelezesha kidogo ili zionekane kwenye skrini ya sasa"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batilisha Usinisumbue"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kukatiza wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ficha maudhui nyeti"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Wakati kifaa kimefungwa, ficha maudhui katika arifa za programu hii ambayo yanaweza kutambua maelezo ya faragha"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kifaa kikiwa kimefungwa, ficha maudhui yanayoweza kufichua maelezo ya faragha katika arifa hizi"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Imezuiwa"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Kipaumbele"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nyeti"</string>
@@ -2684,6 +2637,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Badilisha utumie kengele pekee hadi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Hakuna ukatizaji wa skrini"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Zuia arifa zilizozimwa sauti kwa Usinisumbue zisichungulie au kuonekana kwenye skrini ya sasa"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Hakuna mwangaza wa arifa"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Zuia arifa zilizozimwa sauti kwa Usinisumbue zisisababishe mwangaza uonekane"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
@@ -2696,7 +2653,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Omba PIN kabla hujabandua"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Omba nenosiri kabla hujabandua"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Funga kifaa wakati wa kubandua"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Wasifu wa kazi"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Wasifu huu wa kazini unasimamiwa na:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Inasimamiwa na <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Majaribio)"</string>
@@ -2749,9 +2705,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Arifa"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Kawaida"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Zuia"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Maudhui nyeti yamefichwa"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Kipaumbele"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Hakuna kuchungulia"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2773,15 +2726,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Binafsi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kazini"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Imezuiwa"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Kipaumbele"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Maudhui nyeti yamefichwa"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Hakuna kuchungulia"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Zenye URL za kikoa"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Imezimwa na msimamizi"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Vipengele vya kina"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Weka mipangilio ya programu"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Chagua Wasifu"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Idhini ya ufikiaji wa ziada imetolewa kwa programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Inaruhusu programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2938,4 +2887,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Hali ya rangi ya picha"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Tumia sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Kipimo cha mwonekano"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"mwonekano kipimo kukuza uzito nafasi"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Ndogo"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Kawaida"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Kubwa"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Kubwa kiasi"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Kubwa zaidi"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Kipimo maalum cha mwonekano (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Angalia zote"</string>
+    <string name="see_less" msgid="1250265310929558370">"Angalia chache"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Imeondolewa"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ya data imetumika"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Programu <xliff:g id="COUNT">%1$d</xliff:g> zimesakinishwa"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> kati ya <xliff:g id="SIZE2">%2$s</xliff:g> imetumika"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Unga\'avu unaonyumbulika UMEWASHWA"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Unga\'avu unaonyumbulika UMEZIMWA"</string>
 </resources>
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index 1e1aec6..2b04873 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"பெரியது"</item>
     <item msgid="7786168277516233536">"மிகப் பெரியது"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"மிகவும் மெதுவாக"</item>
-    <item msgid="2361722960903353554">"மெதுவாக"</item>
-    <item msgid="1145554631248513562">"இயல்பாக"</item>
-    <item msgid="7553665153391107454">"விரைவாக"</item>
-    <item msgid="1370673569131070146">"விரைவானது"</item>
-    <item msgid="4648206845228970803">"மிகவும் வேகமானது"</item>
-    <item msgid="4977949754169483251">"வேகமானது"</item>
-    <item msgid="6106302964845503577">"மிகவும் வேகமானது"</item>
-    <item msgid="6800277205640837264">"அதிவிரைவானது"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"மிகவும் குறைவு"</item>
-    <item msgid="2692137425242433765">"குறைவு"</item>
-    <item msgid="3332408460740717754">"இயல்பு"</item>
-    <item msgid="4907380534957572531">"அதிகமாக"</item>
-    <item msgid="4699640516390840297">"மிகவும் அதிகமாக"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"ஸ்கேன் செய்கிறது…"</item>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 17cc319..c66b7f1 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"கடவுச்சொற்கள்"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"கைரேகை"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"கைரேகைகளை நிர்வகிக்கவும்"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"இதற்குப் பயன்படுத்து:"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"டாக்கிலிருந்து டேப்லெட்டைச் செருகும்போது அல்லது அகற்றும்போது ஒலியை இயக்க வேண்டாம்"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"மொபைல் வைக்கும் கருவியில் மொபைலைச் செருகும்போது அல்லது அதிலிருந்து அகற்றும்போது ஒலி எழுப்பாதே"</string>
     <string name="account_settings" msgid="6403589284618783461">"கணக்குகள்"</string>
-    <string name="category_personal" msgid="1299663247844969448">"தனிப்பட்டவை"</string>
-    <string name="category_work" msgid="8699184680584175622">"பணியிடம்"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"பணி சுயவிவரக் கணக்குகள் - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"தனிப்பட்ட சுயவிவரக் கணக்குகள்"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"பணி கணக்கு - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"முடக்கப்பட்டது"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"எப்போதும் இயக்கத்தில் வை"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"தானியங்கு"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"கோப்பு முறைமையாக்கத்திற்கு மாற்று"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"மாற்று…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ஏற்கனவே கோப்பு முறைமையாக்கப்பட்டது"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"கோப்பு சார்ந்த முறைமையாக்கத்திற்கு மாற்றுதல்"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"தரவுப் பகிர்வை, கோப்பு சார்ந்த முறைமையாக்கத்திற்கு மாற்றவும்.\n !!எச்சரிக்கை!! இது எல்லா தரவையும் அழிக்கும்.\n இது ஆல்பா நிலை அம்சமாக இருப்பதால் சரியாகச் செயல்படாமல் போகக்கூடும்.\n தொடர, \'அழித்து, மாற்று…\' என்பதை அழுத்தவும்."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"அழித்து மாற்று…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"உறக்கநிலையிலிரு"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"திரை முடக்கப்படும்"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> செயல்படாமல் இருப்பின்"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"அமைப்பு"</string>
     <string name="print_settings" msgid="4742428530112487843">"அச்சிடுதல்"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"அச்சுப் பொறிகள்"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ஐப் பயன்படுத்தவா?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"உங்கள் ஆவணம் அச்சுப்பொறிக்குச் செல்லும் வழியில் ஒன்று அல்லது அதற்கு மேற்பட்ட சேவையகங்களைக் கடந்து செல்லலாம்."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"சேவைகள் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"அச்சுப்பொறிகள் எதுவுமில்லை"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"அமைப்பு"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"முழுக் குறிப்பிட்ட சொல்லும் ஊடாடுதலும்"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"எளிய பேச்சிலிருந்து உரை"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"குரல் உள்ளீட்டு சேவையால் தொடர்ச்சியாக குரலைக் கண்காணிக்க முடியும், உங்கள் சார்பாக குரல் வசதி இயக்கப்பட்ட பயன்பாடுகளை உங்கள் சார்பாக கட்டுப்படுத்தவும் முடியும். <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> பயன்பாடு வழங்குகிறது. இந்தச் சேவையை இயக்கி, பயன்படுத்தவா?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"உரை வடிவத்திலிருந்து பேச்சுக்கான அமைப்பு"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"உரையிலிருந்து பேச்சாக மாற்றுதல்"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"எனது அமைப்புகளை எப்போதும் பயன்படுத்து"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"கீழுள்ள இயல்புநிலை அமைப்பு பயன்பாட்டின் அமைப்புகளை மேலெழுதும்"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"இயல்புநிலை அமைப்பு"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"இயல்புநிலை இன்ஜின்"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"பேசும் உரைக்குப் பயன்படுத்த, பேச்சு இணைப்பாக்கல் இன்ஜினை அமைக்கவும்"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"பேச்சு வீதம்"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"பேசப்படும் உரையின் வேகம்"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ஒலித்திறன்"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"பேசப்படும் உரையின் ஒலிப்பைப் பாதிக்கும்"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"மொழி"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"முறைமையின் மொழியைப் பயன்படுத்து"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"மொழி தேர்ந்தெடுக்கப்படவில்லை"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"பேசப்படும் உரைக்கு மொழி சார்ந்த குரலை அமைக்கிறது"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"எடுத்துக்காட்டைக் கவனிக்கவும்"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"பேச்சு இணைப்பாக்கத்தின் சிறிய செயல்விளக்கத்தை இயக்கு"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"குரல் தரவை நிறுவு"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"பேச்சு இணைப்பாக்கத்திற்குத் தேவையான குரல் தரவை நிறுவவும்"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ஏற்கனவே முறையாக நிறுவப்பட்ட பேச்சு இணைப்பாக்கத்திற்கு குரல்கள் அவசியம்"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"உங்கள் அமைப்பு மாற்றப்பட்டன. இது, அவை எப்படி ஒலிக்கின்றன என்பதற்கான எடுத்துக்காட்டாகும்."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"நீங்கள் தேர்வுசெய்த இன்ஜின் இயங்காது."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"உள்ளமை"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"மற்றொரு இன்ஜினைத் தேர்வுசெய்"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"இந்தப் பேச்சு இணைப்பாக்கல் இன்ஜின் ஆனது, கடவுச்சொற்கள் மற்றும் கிரெடிட் கார்டு எண்கள் போன்ற தனிப்பட்ட தகவல் உள்பட பேசப்படும் எல்லா உரையையும் சேகரிக்கலாம். இது <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> இன்ஜினிலிருந்து வந்துள்ளது. இந்தப் பேச்சு இணைப்பாக்கல் இன்ஜினை இயக்கவா?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"உரை வடிவத்திலிருந்து பேச்சு வெளியீட்டிற்காக, இந்த மொழிக்கு செயலில் உள்ள நெட்வொர்க் இணைப்பு தேவை."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"இது பேச்சு இணைப்பாக்கத்திற்கான எடுத்துக்காட்டாகும்"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"இயல்பு மொழியின் நிலை"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> முழுமையாக ஆதரிக்கப்படுகிறது"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> க்கு நெட்வொர்க் இணைப்பு அவசியமாகும்"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> ஆதரிக்கப்படவில்லை"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"சரிபார்க்கிறது..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"இன்ஜின்கள்"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> அமைப்பு"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> இயக்கப்பட்டது"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> முடக்கப்பட்டது"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"இன்ஜின் அமைப்பு"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> க்கான அமைப்பு"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"மொழிகள் மற்றும் குரல்கள்"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"நிறுவப்பட்டது"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"நிறுவப்படவில்லை"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"பெண்"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ஆண்"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"பேச்சு இணைப்பாக்கல் இன்ஜின் நிறுவப்பட்டது"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"பயன்படுத்துவதற்கு முன்பு புதிய இன்ஜினை இயக்கவும்."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"இன்ஜின் அமைப்புகளைத் தொடங்கு"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"விருப்பத்தேர்வு"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"பொதுவானவை"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ஆற்றல் கட்டுப்பாடு"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"வைஃபை அமைப்பைப் புதுப்பிக்கிறது"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"புளூடூத் அமைப்புகளைப் புதுப்பிக்கிறது"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"பின்புலப் பயன்பாடுகளுக்குப் பயன்பாடு பதிலளிக்கவில்லை என்ற உரையாடலைக் காட்டு"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"பயன்பாடுகளை வெளிப்புறச் சேமிப்பிடத்தில் அனுமதி"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"மேனிஃபெஸ்ட் மதிப்புகளை பொருட்படுத்தாமல், எந்தப் பயன்பாட்டையும் வெளிப்புற சேமிப்பிடத்தில் எழுத அனுமதிக்கும்"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"செயல்பாடுகளை அளவுமாறக்கூடியதாக அமை"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"மேனிஃபெஸ்ட் மதிப்புகளைப் பொருட்படுத்தாமல், பல சாளரத்திற்கு எல்லா செயல்பாடுகளையும் அளவுமாறக்கூடியதாக அமைக்கும்."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"தரவுப் பயன்பாடு"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"பயன்பாட்டின் தரவுப் பயன்பாடு"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"மொபைல் நிறுவனத்தின் தரவு கணக்கிடலும் சாதனத்தின் கணக்கிடலும் வேறுபடலாம்."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"அலாரங்கள் மட்டும்"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"அறிவிப்புகள் வேண்டாம்"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"விஷூவல் குறுக்கீடுகள்"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"மொபைலின் ரிங்டோன்"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"இயல்புநிலை அறிவிப்பு ரிங்டோன்"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்புகளுக்கும் அதிர்வுறு"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"சாதனம் பூட்டப்பட்டிருக்கும் போது, எப்படி அறிவிப்புகளைக் காட்ட வேண்டும்?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"அறிவிப்புகள்"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"பயன்பாடு அறிவிப்புகள்"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"தலைப்பு அறிவிப்புகள்"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"பிற ஒலிகள்"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"டயல்பேடு டோன்கள்"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"திரையைப் பூட்டும் போது"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"இந்தப் பயன்பாட்டிலிருந்து எப்போதும் அறிவிப்புகளைக் காட்டாதே"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"முன்னுரிமையாகக் கருது"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"தொந்தரவு செய்யாதே என்பதில் முன்னுரிமை மட்டும் என அமைக்கப்பட்டிருக்கும் போது, இந்தப் பயன்பாட்டின் அறிவிப்புகள் கேட்கப்படும்"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"பார்க்க அனுமதி"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"சில அறிவிப்புகளை நடப்பு திரையில் சற்று இழுத்துவிடுவதன் மூலம், இந்தப் பயன்பாடு அவற்றைத் தனிப்படுத்தும்"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"முக்கியமான உள்ளடக்கத்தை மறை"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"இந்தச் சாதனம் பூட்டப்பட்டிருக்கும்போது, தனிப்பட்ட தகவலை வெளிப்படுத்தக்கூடிய இந்தப் பயன்பாட்டின் அறிவிப்புகளின் உள்ளடக்கத்தை மறைக்கும்."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"இந்தச் சாதனத்தைப் பூட்டியிருக்கும் போது, தனிப்பட்ட தகவல்களைக் காட்டக்கூடிய இந்த அறிவிப்புகளின் உள்ளடக்கத்தை மறைக்கவும்"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"தடுக்கப்பட்டது"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"முன்னுரிமை"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"முக்கியமானவை"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"திரைக் குறுக்கீடுகள் வேண்டாம்"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"தொந்தரவு செய்ய வேண்டாம் என்பதை அமைக்கும் போது, அறிவிப்புகள் தற்போதைய திரையில் குறுக்கிடுவது அல்லது தோன்றுவது முடக்கப்படும்."</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"அறிவிப்பு லைட் வேண்டாம்"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"தொந்தரவு செய்ய வேண்டாம் என்பதை அமைக்கும் போது, அறிவிப்புகள் வரும் போது ஒளிர்வது முடக்கப்படும்."</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"பயன்பாட்டு அறிவிப்புகள்"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"அகற்றும் முன் பின்னைக் கேள்"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"அகற்றும் முன் கடவுச்சொல்லைக் கேள்"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"திரையை விலக்கும்போது சாதனத்தைப் பூட்டு"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"பணி சுயவிவரம்"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"இந்தப் பணி சுயவிவரத்தை நிர்வகிப்பது:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"நிர்வகிப்பது: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(சோதனை முயற்சி)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"அறிவிப்புகள்"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"இயல்பு"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"தடைசெய்"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"முக்கிய உள்ளடக்கம் மறைக்கப்பட்டது"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"முன்னுரிமை"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"கண்காணிக்காதவை"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"தடுக்கப்பட்டவை"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"முன்னுரிமை"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"முக்கிய உள்ளடக்கம் மறைக்கப்பட்டது"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"கண்காணிக்காதவை"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"டொமைன் URLகளுடன்"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"நிர்வாகியால் முடக்கப்பட்டது"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
     <string name="configure_apps" msgid="6685680790825882528">"பயன்பாடுகளை உள்ளமை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"சுயவிவரத்தைத் தேர்வுசெய்யவும்"</string>
     <string name="app_permissions" msgid="4148222031991883874">"பயன்பாட்டு அனுமதிகள்"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"கூடுதல் அனுமதிகள் வழங்கப்பட்ட பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"அனுமதிக்கப்படும் பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"படத்தின் வண்ணப் பயன்முறை"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGBஐப் பயன்படுத்தும்"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"திரை அளவு"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"திரை அடர்த்தி ஜூம் அளவு அளவிடல்"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"சிறியது"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"இயல்பு"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"பெரியது"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"கொஞ்சம் பெரியது"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"மிகப் பெரியது"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"தனிப்பயன் (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"எல்லாம் காட்டு"</string>
+    <string name="see_less" msgid="1250265310929558370">"குறைவாகக் காட்டு"</string>
+    <string name="disconnected" msgid="5787956818111197212">"துண்டிக்கப்பட்டது"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> தரவு பயன்படுத்தப்பட்டுள்ளது"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டுள்ளன"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> / <xliff:g id="SIZE2">%2$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"சூழல்சார் ஒளிர்வு இயக்கப்பட்டுள்ளது"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"சூழல்சார் ஒளிர்வு முடக்கப்பட்டுள்ளது"</string>
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index 36f5c89..de9e09b 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"పెద్దది"</item>
     <item msgid="7786168277516233536">"భారీ పరిమాణం"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"చాలా నెమ్మది"</item>
-    <item msgid="2361722960903353554">"నెమ్మది"</item>
-    <item msgid="1145554631248513562">"సాధారణం"</item>
-    <item msgid="7553665153391107454">"వేగవంతం"</item>
-    <item msgid="1370673569131070146">"వేగం"</item>
-    <item msgid="4648206845228970803">"చాలా వేగవంతం"</item>
-    <item msgid="4977949754169483251">"అధిక వేగం"</item>
-    <item msgid="6106302964845503577">"అత్యంత వేగం"</item>
-    <item msgid="6800277205640837264">"అత్యంత వేగవంతం"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"చాలా తక్కువ"</item>
-    <item msgid="2692137425242433765">"తక్కువ"</item>
-    <item msgid="3332408460740717754">"సాధారణం"</item>
-    <item msgid="4907380534957572531">"అధికం"</item>
-    <item msgid="4699640516390840297">"అత్యధికం"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"స్కాన్ చేస్తోంది…"</item>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index e277e16..bd213bb 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"పాస్‌వర్డ్‌లు"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"నిర్వాహకుడు నిలిపివేసారు"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"వేలిముద్ర"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"వేలిముద్రలు నిర్వహిం."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"దీనికి వేలిముద్రను ఉప."</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"టాబ్లెట్‌ను డాక్‌లో చొప్పించినప్పుడు లేదా దాని నుండి తీసివేసినప్పుడు ధ్వనిని ప్లే చేయవద్దు"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ఫోన్‌ను డాక్‌లో చొప్పించినప్పుడు లేదా దాని నుండి తీసివేసినప్పుడు ధ్వనిని ప్లే చేయవద్దు"</string>
     <string name="account_settings" msgid="6403589284618783461">"ఖాతాలు"</string>
-    <string name="category_personal" msgid="1299663247844969448">"వ్యక్తిగతం"</string>
-    <string name="category_work" msgid="8699184680584175622">"కార్యాలయం"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"కార్యాలయ ప్రొఫైల్ ఖాతాలు - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"వ్యక్తిగత ప్రొఫైల్ ఖాతాలు"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"కార్యాలయ ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"నిలిపివేయబడింది"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"స్వయంచాలకం"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ఫైల్ గుప్తీకరణకు మార్చు"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"మార్చండి…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ఫైల్ ఇప్పటికే గుప్తీకరించబడింది"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"ఫైల్ ఆధారిత గుప్తీకరణకు మార్చడం"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"డేటా భాగాన్ని ఫైల్ ఆధారిత గుప్తీకరణకు మార్చండి.\n !!హెచ్చరిక!! దీని వలన మీ డేటా మొత్తం తీసివేయబడుతుంది.\n ఈ లక్షణం ఆల్ఫా, కనుక సరిగ్గా పని చేయకపోవచ్చు.\n కొనసాగించడానికి \'తొలగించి, మార్చు...\' నొక్కండి."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"తొలగించి, మార్చు…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"నిద్రావస్థ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"స్క్రీన్‌ను ఆఫ్ చేయాల్సిన సమయం"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"నిష్క్రియంగా ఉన్న <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> తర్వాత"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"సెట్టింగ్‌లు"</string>
     <string name="print_settings" msgid="4742428530112487843">"ముద్రణ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ముద్రణ సేవలు"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"మీ పత్రం ప్రింటర్‌కు వెళ్లే మార్గంలో ఒకటి లేదా అంతకంటే ఎక్కువ సర్వర్‌ల గుండా వెళ్లవచ్చు."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"సేవలు ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ప్రింటర్‌లు కనుగొనబడలేదు"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"సెట్టింగ్‌లు"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"పూర్తి హాట్‌వర్డ్ మరియు పరస్పర చర్య"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"సరళ ప్రసంగ-వచన రూపం"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ఈ వాయిస్ ఇన్‌పుట్ సేవ ఎల్లప్పుడూ ఆన్‌లో ఉండే వాయిస్ పర్యవేక్షణని అమలు చేయగలదు మరియు మీ తరపున వాయిస్ ప్రారంభిత అనువర్తనాలను నియంత్రించగలదు. ఇది <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> అనువర్తనం నుండి అందించబడుతుంది. ఈ సేవ వినియోగాన్ని ప్రారంభించాలా?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"వచనం నుండి ప్రసంగం సెట్టింగ్‌లు"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"వచనం నుండి ప్రసంగం అవుట్‌పుట్"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ఎల్లప్పుడూ నా సెట్టింగ్‌లను ఉపయోగించు"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"దిగువ డిఫాల్ట్ సెట్టింగ్‌లు అనువర్తన సెట్టింగ్‌లను భర్తీ చేస్తాయి"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"డిఫాల్ట్ సెట్టింగ్‌లు"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"డిఫాల్ట్ ఇంజిన్"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ప్రసంగ రూప వచనం కోసం ఉపయోగించడానికి ప్రసంగ సమన్వయ ఇంజిన్‌ను సెట్ చేయండి"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"ప్రసంగం రేట్"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"వచనాన్ని చదివి వినిపించాల్సిన వేగం"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"పిచ్"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"చదవి వినిపించబడే వచనం యొక్క టోన్‌ను ప్రభావితం చేస్తుంది"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"భాష"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"సిస్టమ్ భాషను ఉపయోగించు"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"భాష ఎంచుకోబడలేదు"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"చదవి వినిపించబడే వచనం కోసం భాష-నిర్దిష్ట వాయిస్‌ను సెట్ చేస్తుంది"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ఒక ఉదాహరణ వినండి"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"ప్రసంగ సమన్వయం గురించి సంక్షిప్త ప్రదర్శనను ప్లే చేయి"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"వాయిస్ డేటాను ఇన్‌స్టాల్ చేయి"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ప్రసంగ సమన్వయం కోసం అవసరమైన వాయిస్ డేటాను ఇన్‌స్టాల్ చేయండి"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ప్రసంగ సమన్వయం కోసం అవసరమైన వాయిస్‌లు ఇది వరకే సక్రమంగా ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"మీ సెట్టింగ్‌లు మార్చబడ్డాయి. అవి చూపే ప్రభావానికి ఇది ఒక ఉదాహరణ."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"మీరు ఎంచుకున్న ఇంజిన్‌ను అమలు చేయడం సాధ్యపడదు."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"కాన్ఫిగర్ చేయి"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"మరో ఇంజిన్‌ను ఎంచుకోండి"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ఈ ప్రసంగ సమన్వయ ఇంజిన్ చదివి వినిపించబడే మొత్తం వచనాన్ని అలాగే పాస్‌వర్డ‌లు మరియు క్రెడిట్ కార్డు నంబర్‌ల వంటి వ్యక్తిగత డేటాను సేకరించగలదు. ఇది <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ఇంజిన్‌లో అందించబడుతుంది. ఈ ప్రసంగ సమన్వయ ఇంజిన్ యొక్క వినియోగాన్ని ప్రారంభించాలా?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"వచనం నుండి ప్రసంగం అవుట్‌పుట్ కోసం ఈ భాషకు పని చేస్తున్న నెట్‌వర్క్ కనెక్షన్ కావాలి."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"ఇది ప్రసంగ సమన్వయానికి ఉదాహరణ"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"డిఫాల్ట్ భాష స్థితి"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>కి పూర్తి మద్దతు ఉంది"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>కి నెట్‌వర్క్ కనెక్షన్ అవసరం"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>కు మద్దతు లేదు"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"తనిఖీ చేస్తోంది..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"ఇంజిన్‌లు"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> సెట్టింగ్‌లు"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ప్రారంభించబడింది"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> నిలిపివేయబడింది"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"ఇంజిన్ సెట్టింగ్‌లు"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> కోసం సెట్టింగ్‌లు"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"భాషలు మరియు వాయిస్‌లు"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ఇన్‌స్టాల్ చేయబడింది"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ఇన్‌స్టాల్ చేయబడలేదు"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"స్త్రీ"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"పురుషుడు"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"ప్రసంగ సమన్వయ ఇంజిన్ ఇన్‌స్టాల్ చేయబడింది"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"ఉపయోగించడానికి ముందు కొత్త ఇంజిన్‌ను ప్రారంభించండి."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ఇంజిన్ సెట్టింగ్‌లను ప్రారంభించండి"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ప్రాధాన్య ఇంజిన్"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"సాధారణం"</string>
     <string name="gadget_title" msgid="5519037532720577836">"విద్యుత్ శక్తి నియంత్రణ"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi సెట్టింగ్‌ను నవీకరిస్తోంది"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"బ్లూటూత్ సెట్టింగ్‌ను నవీకరించడం"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"నేపథ్య అనువర్తనాల కోసం అనువర్తనం ప్రతిస్పందించడం లేదు డైలాగ్‌ను చూపు"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"అనువర్తనాలను బాహ్య నిల్వలో నిర్బంధంగా అనుమతించు"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ఏ అనువర్తనాన్ని అయినా మానిఫెస్ట్ విలువలతో సంబంధం లేకుండా బాహ్య నిల్వలో వ్రాయగలిగేలా అనుమతిస్తుంది"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"కార్యాచరణలను పరిమాణం మార్చగలిగేలా నిర్బంధించు"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"మానిఫెస్ట్ విలువలతో సంబంధం లేకుండా అన్ని కార్యాచరణలను బహుళ విండోల్లో సరిపోయేటట్లు పరిమాణం మార్చగలిగేలా చేస్తుంది."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"డేటా వినియోగం"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"అనువర్తన డేటా వినియోగం"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"క్యారియర్ డేటా అకౌంటింగ్ మీ పరికరాన్ని బట్టి మారుతుంది."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"అలారాలు మాత్రమే"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"మొత్తం నిశ్శబ్దం"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"దృశ్య అంతరాయాలు"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ఫోన్ రింగ్‌టోన్"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"డిఫాల్ట్ నోటిఫికేషన్ రింగ్‌టోన్"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"మీరు మీ పరికరాన్ని లాక్ చేసినప్పుడు, నోటిఫికేషన్‌లు ఎలా కనిపించాలనుకుంటున్నారు?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"నోటిఫికేషన్‌లు"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"అనువర్తన నోటిఫికేషన్‌లు"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"అంశం నోటిఫికేషన్‌లు"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ఇతర ధ్వనులు"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"డయల్ ప్యాడ్ టోన్‌లు"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"స్క్రీన్ లాకింగ్ ధ్వనులు"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"అన్నింటినీ బ్లాక్ చేయండి"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ఈ అనువర్తనం నుండి నోటిఫికేషన్‌లను ఎప్పుడూ చూపవద్దు"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ప్రాధాన్యంగా పరిగణించండి"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"అంతరాయం కలిగించవద్దుని ప్రాధాన్యం మాత్రమేకి సెట్ చేసినప్పుడు ఈ అనువర్తన నోటిఫికేషన్‌ల కోసం శబ్దం వినిపించేలా చేస్తుంది"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"నోటిఫికేషన్ కనిపించడాన్ని అనుమతించండి"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"నిర్దిష్ట నోటిఫికేషన్‌లను ప్రస్తుత స్క్రీన్‌‌లోని వీక్షణకి సంక్షేపంగా స్లైడ్ చేయడం ద్వారా వాటిని ప్రాధాన్యంగా చూపడానికి ఈ అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"అంతరాయం కలిగించవద్దు లక్షణం ఎంపికను భర్తీ చేయండి"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"అంతరాయం కలిగించవద్దు లక్షణాన్ని ప్రాధాన్యత మాత్రమేకి సెట్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"అతి ముఖ్యమైన కంటెంట్‌ను దాచండి"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"పరికరం లాక్ చేయబడినప్పుడు, ఈ అనువర్తన నోటిఫికేషన్‌ల్లో ప్రైవేట్ సమాచారాన్ని బహిర్గతం చేసే కంటెంట్‌ను దాస్తుంది"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"పరికరం లాక్ చేసి ఉన్నప్పుడు, ఈ నోటిఫికేషన్‌ల్లో గోప్య సమాచారాన్ని బహిరంగపరిచే అవకాశం ఉన్న కంటెంట్‌ను దాస్తుంది"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"బ్లాక్ చేయబడింది"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ప్రాధాన్యత"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"అత్యంత గోప్యమైన"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ఎల్లప్పుడూ అంతరాయం కలిగించు ఎంపికకు మార్చుతుంది"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"స్క్రీన్ అంతరాయాలు వద్దు"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"అంతరాయం కలిగించవద్దు సేవ ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లు ప్రస్తుత స్క్రీన్‌పై చూపకుండా లేదా కనిపించకుండా నిరోధిస్తుంది"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"నోటిఫికేషన్ లైట్ వద్దు"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"అంతరాయం కలిగించవద్దు సేవ ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌ల కోసం లైట్ వెలగకుండా నిరోధిస్తుంది"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"అనువర్తన నోటిఫికేషన్‌లు"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"అన్‌పిన్ చేయడానికి PINను అడుగు"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"అన్‌పిన్ చేయడానికి ముందు పాస్‌వర్డ్ కోసం అడుగు"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"అన్‌పిన్ చేస్తున్నప్పుడు పరికరాన్ని లాక్ చేయి"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"కార్యాలయ ప్రొఫైల్‌"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ఈ కార్యాలయ ప్రొఫైల్ వీరి నిర్వహణలో ఉంది:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"నిర్వహిస్తున్నది <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ప్రయోగాత్మకం)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"నోటిఫికేషన్‌లు"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"సాధారణం"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"బ్లాక్ చేయబడి ఉన్నాయి"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"అతి ముఖ్యమైన కంటెంట్ దాచబడింది"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ప్రాధాన్యత"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"త్వరిత వీక్షణ సదుపాయం లేదు"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"బ్లాక్ చేయబడినవి"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ప్రాధాన్యత"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"అతి ముఖ్యమైన కంటెంట్ దాచబడింది"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"త్వరిత వీక్షణ సదుపాయం లేదు"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"డొమైన్ URLలు కలిగి ఉన్నవి"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"నిర్వాహకుని ద్వారా నిలిపివేయబడింది"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="configure_apps" msgid="6685680790825882528">"అనువర్తనాలను కాన్ఫిగర్ చేయండి"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ప్రొఫైల్‌ను ఎంచుకోండి"</string>
     <string name="app_permissions" msgid="4148222031991883874">"అనువర్తన అనుమతులు"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలకు అదన. ప్రాప్యత అనుమతించబడింది"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలు అనుమతించబడ్డాయి"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"చిత్రం రంగు మోడ్"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ఉపయోగిస్తుంది"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ప్రదర్శన ప్రమాణం"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ప్రదర్శన సాంద్రత జూమ్ కొలత కొలిచే ప్రమాణం"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"చిన్నగా"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"సాధారణం"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"పెద్దగా"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"చాలా పెద్దగా"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"అతి పెద్దగా"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"అనుకూలం (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"అన్నీ చూడండి"</string>
+    <string name="see_less" msgid="1250265310929558370">"తక్కువ చూడండి"</string>
+    <string name="disconnected" msgid="5787956818111197212">"డిస్‌కనెక్ట్ చేయబడింది"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> డేటా ఉపయోగించబడింది"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g>లో <xliff:g id="SIZE1">%1$s</xliff:g> ఉపయోగించబడింది"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"అనుకూల ప్రకాశం ఆన్ చేయబడింది"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"అనుకూల ప్రకాశం ఆఫ్ చేయబడింది"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 0841747..0494f28 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"ใหญ่"</item>
     <item msgid="7786168277516233536">"ใหญ่มาก"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"ช้ามาก"</item>
-    <item msgid="2361722960903353554">"ช้า"</item>
-    <item msgid="1145554631248513562">"ปกติ"</item>
-    <item msgid="7553665153391107454">"เร็ว"</item>
-    <item msgid="1370673569131070146">"เร็วขึ้น"</item>
-    <item msgid="4648206845228970803">"เร็วมาก"</item>
-    <item msgid="4977949754169483251">"เร็ว"</item>
-    <item msgid="6106302964845503577">"เร็วมาก"</item>
-    <item msgid="6800277205640837264">"เร็วที่สุด"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ต่ำมาก"</item>
-    <item msgid="2692137425242433765">"ต่ำ"</item>
-    <item msgid="3332408460740717754">"ปกติ"</item>
-    <item msgid="4907380534957572531">"สูง"</item>
-    <item msgid="4699640516390840297">"สูงมาก"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"กำลังสแกน..."</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ce78e01..b2cec82 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -116,8 +116,8 @@
     <string name="bluetooth_device" msgid="5291950341750186887">"อุปกรณ์บลูทูธที่ไม่มีชื่อ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"กำลังค้นหา"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ไม่พบอุปกรณ์บลูทูธในบริเวณใกล้เคียง"</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอจับคู่อุปกรณ์ผ่านบลูทูธ"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอจับคู่อุปกรณ์"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"แตะเพื่อจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="4978696506172252813">"เลือกอุปกรณ์บลูทูธ"</string>
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ลายนิ้วมือ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"จัดการลายนิ้วมือ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ใช้ลายนิ้วมือเพื่อ"</string>
@@ -532,9 +533,9 @@
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ไม่พบอุปกรณ์"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"เชื่อมต่อ"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"ตัดการเชื่อมต่อ"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"กำหนดค่าอุปกรณ์ให้ตรงกันและเชื่อมต่อ"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"ยกเลิกการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ตัดการเชื่อมต่อและยกเลิกการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"จับคู่อุปกรณ์และเชื่อมต่อ"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"เลิกจับคู่อุปกรณ์"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ตัดการเชื่อมต่อและเลิกจับคู่อุปกรณ์"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ตัวเลือก…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ขั้นสูง"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ไม่ต้องเล่นเสียงเมื่อใส่หรือนำแท็บเล็ตออกจากฐานรอง"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ไม่เล่นเสียงเมื่อใส่หรือถอดโทรศัพท์ออกจากแท่นชาร์จ"</string>
     <string name="account_settings" msgid="6403589284618783461">"บัญชี"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ส่วนตัว"</string>
-    <string name="category_work" msgid="8699184680584175622">"ที่ทำงาน"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"บัญชีโปรไฟล์งาน - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"บัญชีโปรไฟล์ส่วนตัว"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"บัญชีงาน - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ปิดใช้แล้ว"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"เปิดใช้เสมอ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"อัตโนมัติ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"แปลงเป็นการเข้ารหัสไฟล์"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"แปลง…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"เข้ารหัสไฟล์แล้ว"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"การแปลงเป็นการเข้ารหัสตามไฟล์"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"แปลงพาร์ทิชันข้อมูลเป็นการเข้ารหัสแบบไฟล์\n !!คำเตือน!! การดำเนินการนี้จะลบข้อมูลทั้งหมดของคุณ\n คุณลักษณะนี้เป็นแบบอัลฟา และอาจทำงานไม่เป็นปกติ\n กด \"ลบและแปลง...\" เพื่อดำเนินการต่อ"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"ลบและแปลง…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"สลีป"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"หน้าจอปิด"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</string>
     <string name="print_settings" msgid="4742428530112487843">"การพิมพ์"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"บริการการพิมพ์"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"เอกสารของคุณอาจต้องผ่านมากกว่าหนึ่งเซิร์ฟเวอร์ระหว่างส่งไปยังเครื่องพิมพ์"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"ไม่พบเครื่องพิมพ์"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"การตั้งค่า"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"คำที่นิยมและการโต้ตอบเต็มรูปแบบ"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"เขียนตามคำบอกแบบง่ายๆ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"บริการป้อนข้อมูลด้วยเสียงนี้สามารถคอยตรวจสอบเสียงอยู่ตลอดเวลาและควบคุมแอปพลิเคชันที่สามารถใช้เสียงในนามของคุณได้ บริการนี้มาจากแอปพลิเคชัน <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> เปิดใช้การทำงานของบริการนี้ไหม"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"การตั้งค่าการอ่านออกเสียงข้อความ"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"เอาต์พุตการอ่านออกเสียง"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ใช้การตั้งค่าของฉันทุกครั้ง"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"การตั้งค่าเริ่มต้นด้านล่างนี้จะแทนที่การตั้งค่าแอปพลิเคชัน"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"การตั้งค่าเริ่มต้น"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"เครื่องมือเริ่มต้น"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"ตั้งค่าให้ใช้ระบบการสังเคราะห์เสียงพูดสำหรับข้อความที่พูด"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"ความเร็วของคำพูด"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"ความเร็วในการพูดข้อความ"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ความสูง-ต่ำของเสียง"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"มีผลต่อโทนเสียงของข้อความที่พูด"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"ภาษา"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"ใช้ภาษาของระบบ"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ไม่ได้เลือกภาษา"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ตั้งค่าเสียงในภาษาที่ระบุสำหรับข้อความที่ได้ยิน"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ฟังตัวอย่าง"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"เล่นการสาธิตสั้นๆ เกี่ยวกับการสังเคราะห์เสียง"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"ติดตั้งข้อมูลเสียง"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"ติดตั้งข้อมูลเสียงที่ต้องใช้สำหรับการสังเคราะห์เสียง"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ติดตั้งเสียงที่จำเป็นต้องใช้ในการสังเคราะห์เสียงอย่างถูกต้องแล้ว"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"การตั้งค่าของคุณเปลี่ยนไป นี่คือตัวอย่างเสียงที่คุณจะได้ยิน"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"ไม่สามารถเรียกใช้เครื่องมือที่คุณเลือก"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"กำหนดค่า"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"เลือกเครื่องมืออื่น"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"โปรแกรมสังเคราะห์เสียงนี้อาจเก็บข้อความทั้งหมดที่ได้ยิน รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โปรแกรมนี้มาจากโปรแกรม <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> คุณต้องการเปิดใช้งานโปรแกรมสังเคราะห์เสียงนี้หรือไม่"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"ภาษานี้ต้องใช้การเชื่อมต่อเครือข่ายซึ่งใช้การได้สำหรับการแปลงข้อความเป็นเสียงพูด"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"นี่เป็นตัวอย่างการสังเคราะห์เสียง"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"สถานะของภาษาเริ่มต้น"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"สนับสนุน<xliff:g id="LOCALE">%1$s</xliff:g>อย่างสมบูรณ์"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"ต้องมีการเชื่อมต่อเครือข่ายสำหรับ<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"ไม่สนับสนุน<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"กำลังตรวจสอบ..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"โปรแกรม"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"การตั้งค่า <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"เปิดใช้งาน <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> แล้ว"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"ปิดใช้งาน <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> แล้ว"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"การตั้งค่าเครื่องมือ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"การตั้งค่าสำหรับ <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ภาษาและเสียง"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"ติดตั้งแล้ว"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"ไม่ได้ติดตั้ง"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"หญิง"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ชาย"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"ติดตั้งโปรแกรมสังเคราะห์เสียงแล้ว"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"เปิดใช้เครื่องมือใหม่ก่อนใช้"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"เปิดการตั้งค่าเครื่องมือ"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"เครื่องมือที่ต้องการ"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"ทั่วไป"</string>
     <string name="gadget_title" msgid="5519037532720577836">"การควบคุมพลังงาน"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"กำลังอัปเดตการตั้งค่า WiFi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"กำลังอัปเดตการตั้งค่าบลูทูธ"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"แสดงหน้าต่างแอปไม่ตอบสนอง สำหรับแอปพื้นหลัง"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"บังคับให้แอปสามารถใช้ที่เก็บภายนอก"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"ให้สามารถเขียนแอปต่างๆ ไปยังที่เก็บภายนอกได้ โดยไม่คำนึงถึงค่าในไฟล์ Manifest"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"บังคับให้กิจกรรมปรับขนาดได้"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"ทำให้กิจกรรมทั้งหมดปรับขนาดได้สำหรับหน้าต่างหลายบาน โดยไม่คำนึงถึงค่าในไฟล์ Manifest"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้อินเทอร์เน็ต"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"การใช้ข้อมูลแอป"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"การทำบัญชีข้อมูลผู้ให้บริการอาจแตกต่างจากอุปกรณ์ของคุณ"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"เฉพาะปลุกเท่านั้น"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ปิดเสียงทั้งหมด"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"การรบกวนทางสายตา"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"เสียงเรียกเข้าเริ่มต้นสำหรับการแจ้งเตือน"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"สั่นเมื่อมีสายเรียกเข้าด้วย"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"เมื่ออุปกรณ์ล็อกอยู่ คุณต้องการให้แสดงการแจ้งเตือนอย่างไร"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"การแจ้งเตือน"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"การแจ้งเตือนตามหัวข้อ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"เสียงอื่นๆ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"เสียงแป้นหมายเลข"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"เสียงล็อกหน้าจอ"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ไม่ต้องแสดงการแจ้งเตือนจากแอปนี้"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"จัดให้เป็น \"เรื่องสำคัญ\""</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"ให้การแจ้งเตือนของแอปนี้ส่งเสียง เมื่อตั้งค่า \"ห้ามรบกวน\" เป็น \"เฉพาะเรื่องสำคัญเท่านั้น\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"อนุญาตให้ดูข้อมูลโดยย่อ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"ให้แอปนี้เน้นการแจ้งเตือนบางอย่างโดยแสดงการแจ้งเตือนโดยย่อในมุมมองบนหน้าจอปัจจุบัน"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ลบล้างห้ามรบกวน"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"อนุญาตให้แสดงการแจ้งเตือนเหล่านี้ต่อไปเมื่อตั้งค่าห้ามรบกวนเป็นเฉพาะเรื่องสำคัญเท่านั้น"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"ซ่อนเนื้อหาที่ละเอียดอ่อน"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"เมื่ออุปกรณ์ล็อกอยู่ ให้ซ่อนเนื้อหาในการแจ้งเตือนของแอปนี้ที่อาจแสดงข้อมูลส่วนตัว"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"เมื่ออุปกรณ์ล็อกอยู่ ให้ซ่อนเนื้อหาในการแจ้งเตือนเหล่านี้ซึ่งอาจเปิดเผยข้อมูลส่วนตัว"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ถูกบล็อก"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"สำคัญ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ละเอียดอ่อน"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"เปลี่ยนเป็นเฉพาะปลุกเท่านั้นจนถึง <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"เปลี่ยนเป็นรบกวนได้เสมอ"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"ไม่ให้รบกวนบนหน้าจอ"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"ป้องกันการแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ไม่ให้แจ้งหรือแสดงบนหน้าจอปัจจุบัน"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"ไม่มีไฟแจ้งเตือน"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"ป้องกันการแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ไม่ให้กะพริบไฟ"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ขอ PIN ก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ขอรหัสผ่านก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ล็อกอุปกรณ์เมื่อเลิกตรึง"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"โปรไฟล์งาน"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"โปรไฟล์งานนี้ได้รับการจัดการโดย:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"จัดการโดย <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ทดลอง)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"การแจ้งเตือน"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"ปกติ"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"บล็อก"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"เนื้อหาที่ละเอียดอ่อนซ่อนอยู่"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ลำดับความสำคัญ"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"ห้ามแอบดู"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ส่วนตัว"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"งาน"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"ถูกบล็อก"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ความสำคัญสูง"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"เนื้อหาที่ละเอียดอ่อนซ่อนอยู่"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"ห้ามแอบดู"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"ที่มี URL โดเมน"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
     <string name="configure_apps" msgid="6685680790825882528">"กำหนดค่าแอป"</string>
     <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
     <string name="app_permissions" msgid="4148222031991883874">"สิทธิ์ของแอป"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"อนุญาตการเข้าถึงเพิ่มเติมให้แอป <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> แอปแล้ว"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"อนุญาต <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> แอปแล้ว"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"โหมดสีของรูปภาพ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"ใช้ sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ระดับการแสดงผล"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"การแสดงผล ความหนาแน่น ซูม ระดับ การปรับระดับ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"เล็ก"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ปกติ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ใหญ่"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ใหญ่ขึ้น"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ใหญ่ที่สุด"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"กำหนดเอง (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"ดูทั้งหมด"</string>
+    <string name="see_less" msgid="1250265310929558370">"ดูน้อยลง"</string>
+    <string name="disconnected" msgid="5787956818111197212">"ยกเลิกการเชื่อมต่อแล้ว"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"ใช้อินเทอร์เน็ตไป <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"ติดตั้งแล้ว <xliff:g id="COUNT">%1$d</xliff:g> แอป"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"ใช้ไป <xliff:g id="SIZE1">%1$s</xliff:g> จาก <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"ปรับความสว่างอัตโนมัติเปิดอยู่"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"ปรับความสว่างอัตโนมัติปิดอยู่"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 7b7b0a2..a8a2b61 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Malaki"</item>
     <item msgid="7786168277516233536">"Napakalaki"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Napakabagal"</item>
-    <item msgid="2361722960903353554">"Mabagal"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Mabilis"</item>
-    <item msgid="1370673569131070146">"Mas Mabilis"</item>
-    <item msgid="4648206845228970803">"Napakabilis"</item>
-    <item msgid="4977949754169483251">"Matulin"</item>
-    <item msgid="6106302964845503577">"Napakatulin"</item>
-    <item msgid="6800277205640837264">"Pinakamabilis"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Napakababa"</item>
-    <item msgid="2692137425242433765">"Mababa"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Mataas"</item>
-    <item msgid="4699640516390840297">"Napakataas"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Nag-i-scan…"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index abe5d7d..4b3f479 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Na-disable ng administrator"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Pamahalaan fingerprint"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gamit fingerprint para"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Huwag mag-play ng tunog kapag ipinapasok o inaalis ang tablet mula sa dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Huwag mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Mga Account"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabaho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Mga account ng profile sa trabaho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Mga account ng personal na profile"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Account sa trabaho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Naka-disable"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Palaging naka-on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Awtomatiko"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"I-convert at gawing pag-encrypt ng file"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"I-convert..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Na-encrypt na ang file"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Kino-convert sa pag-encrypt na batay sa file"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"I-convert ang partition ng data at gawing pag-encrypt na batay sa file.\n !!Babala!! Kapag isinagawa mo ito, mabubura ang lahat ng iyong data.\n Maituturing na alpha ang feature na ito at maaaring hindi ito gumana nang maayos.\n Pindutin ang \'I-wipe at i-convert...\' upang makapagpatuloy."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"I-wipe at i-convert…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pagpi-print"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Mga serbisyo ng pag-print"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Maaaring dumaan ang iyong dokumento sa isa o higit pang mga server sa pagpunta nito sa printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Walang mga natagpuang printer"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Mga Setting"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ganap na hotword at pakikipag-ugnay"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Simpleng speech to text"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Magagawa ng serbisyo ng input na boses na ito na magsagawa ng palaging naka-on na pagsubaybay sa boses at kontrolin ang mga application na ine-enable ng boses para sa iyo. Mula ito sa application na <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Ie-enable ba ang paggamit ng serbisyong ito?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Mga setting ng text-to-speech"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Output ng text-to-speech"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Palaging gamitin ang aking mga setting"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Pinapatungan ng default na mga setting sa ibaba ang mga setting ng app"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Mga default na setting"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Default na engine"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Itakda ang speech synthesis engine upang gamitin para sa sinasalitang text"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Rate ng pagsasalita"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Bilis ng pagsambit sa teksto"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Naaapektuhan ang tono ng tekstong sinasabi"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Wika"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gamitin ang wika ng system"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Walang napiling wika"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Itinatakda ang boses na partikular sa wika para sa sinasambit na teksto"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Makinig sa isang halimbawa"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Mag-play ng maikling pagpapakita ng speech synthesis"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"I-install ang data ng boses"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"I-install ang data ng boses na kinakailangan para sa speech synthesis"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Ang mga boses na kinakailangan para sa speech synthesis ay naka-install na nang maayos"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Nabago ang iyong mga setting. Ito ang halimbawa ng kung ano ang kanilang tunog."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Hindi maaaring tumakbo ang engine na iyong pinili."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"I-configure"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pumili ng isa pang engine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Maaaring makolekta ng speech synthesis engine na ito ang lahat ng teksto na sasabihin, kabilang ang personal na data tulad ng mga password at mga numero ng credit card. Nanggagaling ito mula sa <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Paganahin ang paggamit ng speech synthesis engine na ito?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Nangangailangan ang wikang ito ng gumaganang koneksyon sa network para sa text-to-speech na output."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Isa itong halimbawa ng speech synthesis"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Status ng default na wika"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"Ganap na sinusuportahan ang <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"Kailangan ng <xliff:g id="LOCALE">%1$s</xliff:g> ng koneksyon sa network"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"Hindi sinusuportahan ang <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Tinitingnan..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mga Engine"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> (na) setting"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Pinagana ang <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Hindi pinagana ang <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Mga setting ng engine"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Mga setting para sa <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Mga wika at boses"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Naka-install"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Hindi naka-install"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Babae"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Lalaki"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"N-install speech synthesis engine"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Pgnahin bago engine bago gmit."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Ilunsad ang mga setting ng engine"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ginustong engine"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Pangkalahatan"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrol ng power"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ina-update ang setting ng Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Pag-update ng setting ng Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"App Not Responding dialog para sa background apps"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Pwersahang payagan ang mga app sa external"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Mara-write na sa external storage ang anumang app, anuman ang manifest value"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Sapilitang gawing resizable ang mga aktibidad"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Gawing resizable para sa multi-window ang lahat ng aktibidad, anuman ang mga manifest value."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Paggamit ng data ng app"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Mga alarm lang"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Ganap na katahimikan"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Mga visual na pagkaantala"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Default na ringtone sa notification"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Mag-vibrate din para sa tawag"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kapag naka-lock ang device, paano mo gustong maipakita ang mga notification?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Mga Notification"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notification sa app"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Mga notification sa paksa"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Iba pang mga tunog"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Mga tono ng dial pad"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Tunog sa pag-lock ng screen"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Huwag kailanman magpakita ng mga notification mula sa app na ito"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Ituring na priyoridad"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Marinig ang mga notification ng app na ito kapag nakatakda sa May priyoridad lang ang Huwag istorbohin"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Payagan ang pagpi-peek"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Hayaan ang app na ito na bigyang-diin ang ilang notification sa pamamagitan ng pag-slide sa mga ito nang panandalian sa view sa kasalukuyang screen"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"I-override ang Huwag Istorbohin"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Pahintulutan ang mga notification na ito na lumabas kapag nakatakda sa Priyoridad Lang ang Huwag Istorbohin"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Itago ang sensitibong content"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Kapag naka-lock ang device, itago ang content sa mga notification ng app na ito na maaaring magsiwalat ng pribadong impormasyon"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Kapag naka-lock ang device, itago ang content sa mga notification na ito na maaaring magpakita ng pribadong impormasyon"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Naka-block"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priyoridad"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitibo"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Gawing mag-a-alarm lang hanggang <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Gawing palaging mang-abala"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Walang pagkaantala sa screen"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Pigilang sumilip o lumabas sa kasalukuyang screen ang notification na pinatahimik sa pamamagitan ng Huwag Istorbohin"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Walang notification light"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Pigilang mapatay-sindi ng notification na pinatahimik sa pamamagitan ng Huwag Istorbohin ang ilaw"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback tungkol sa device"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Humingi ng PIN bago mag-unpin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Humingi ng password bago mag-unpin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"I-lock ang device kapag nag-a-unpin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profile sa trabaho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ang profile sa trabahong ito ay pinapamahalaan ng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pinapamahalaan ng <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Mga Notification"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"I-block"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Natago ang sensitibong content"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Priyoridad"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Hindi pinapayagan ang pagsilip"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Trabaho"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Na-block"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Priyoridad"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Natago ang sensitibong content"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Hindi pinapayagan ang pagsilip"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"May mga URL ng domain"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Na-disable ng administrator"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Mag-configure ng mga app"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Pumili ng Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Mga pahintulot sa app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Pinapayagan ang karagdagang access sa <xliff:g id="COUNT_0">%d</xliff:g> sa <xliff:g id="COUNT_1">%d</xliff:g> app"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Pinapayagan ang <xliff:g id="COUNT_0">%d</xliff:g> sa <xliff:g id="COUNT_1">%d</xliff:g> (na) app"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode ng kulay ng larawan"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gamitin ang sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Scale ng display"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale pag-ii-scale"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Maliit"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Malaki"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Mas malaki"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Pinakamalaki"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Tingnan lahat"</string>
+    <string name="see_less" msgid="1250265310929558370">"Tumingin nang kaunti"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Naputol ang Koneksyon"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ng data ang ginamit"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> (na) app ang naka-install"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> ng <xliff:g id="SIZE2">%2$s</xliff:g> ang ginamit"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"NAKA-ON ang adaptive brightness"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"NAKA-OFF ang adaptive brightness"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 1cdaa11..b13d377 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Büyük"</item>
     <item msgid="7786168277516233536">"Çok Büyük"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Çok yavaş"</item>
-    <item msgid="2361722960903353554">"Yavaş"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Hızlı"</item>
-    <item msgid="1370673569131070146">"Daha hızlı"</item>
-    <item msgid="4648206845228970803">"Çok hızlı"</item>
-    <item msgid="4977949754169483251">"Seri"</item>
-    <item msgid="6106302964845503577">"Çok seri"</item>
-    <item msgid="6800277205640837264">"En hızlı"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Çok düşük"</item>
-    <item msgid="2692137425242433765">"Düşük"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Yüksek"</item>
-    <item msgid="4699640516390840297">"Çok yüksek"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Taranıyor…"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c5362d0..5bc31c8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Yönetici tarafından devre dışı bırakıldı"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Parmak izi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Parmak izi yönetimi"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Parmak izi kullanımı:"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Tablet yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
     <string name="account_settings" msgid="6403589284618783461">"Hesaplar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Kişisel"</string>
-    <string name="category_work" msgid="8699184680584175622">"İş"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"İş profili hesapları - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Kişisel profil hesapları"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"İş hesabı - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Devre dışı"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Her zaman açık"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Otomatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Dosya şifrelemeye dönüştür"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Dönüştür…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dosya şifreleme zaten uygulandı"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Dosya tabanlı şifrelemeye dönüştürme"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Veri bölmesini dosya tabanlı şifrelemeye dönüştür.\n !!Dikkat!! Bu işlem tüm verilerinizi siler\n Bu özellik henüz alfa aşamasındadır ve düzgün çalışmayabilir.\n Devam etmek için \"Sil ve dönüştür…\" seçeneğine basın."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Sil ve dönüştür…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Yazdırma"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Yazdırma hizmetleri"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokümanınız yazıcıya giderken bir veya daha fazla sunucudan geçebilir."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hiçbir hizmet yüklenmedi"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Yazıcı bulunamadı"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ayarlar"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Tam özel kelime ve etkileşim"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Basit konuşma-metin"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Bu ses girişi hizmeti, her zaman açık olacak şekilde ses izleme işlemi gerçekleştirebilecek ve ses kullanan uygulamaları sizin adınıza kontrol edebilecektir. Bu hizmet <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> uygulamasına aittir. Hizmetin kullanımı etkinleştirilsin mi?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Metin-konuşma ayarları"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Metin-konuşma çıktısı"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Her zaman benim ayarlarımı kullan"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Aşağıdaki varsayılan ayarlar, uygulama ayarlarını geçersiz kılıyor"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Varsayılan ayarlar"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Varsayılan motor"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Konuşularak metin girmede kullanılacak konuşma sentezi motorunu ayarlayın"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Konuşma hızı"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Metnin konuşulduğu hız"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Konuşulan metnin sesini etkiler"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Sistemin dilini kullan"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Dil seçilmedi"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil için tanımlı sesi, konuşulan metin için ayarlar"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu çal"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Ses verilerini yükle"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Konuşma sentezi için gereken ses verilerini yükle"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Konuşma sentezi için gereken sesler zaten düzgün bir şekilde yüklendi"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ayarlarınız değişti. Bu nasıl duyulacakları ile ilgili bir örnektir."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Seçtiğiniz motor çalışmıyor."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Yapılandır"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Başka bir motor seç"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Bu konuşma sentezi motoru, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil konuşulan tüm metni toplayabilir. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motorundan gelmektedir. Bu konuşma sentezi motorunun kullanımı etkinleştirilsin mi?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bu dil, metin-konuşma çıktısı için bir ağ bağlantısı gerektirir."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Bu bir konuşma sentezi örneğidir"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Varsayılan dil durumu"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> tamamen destekleniyor"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ağ bağlantısı gerektiriyor"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> desteklenmiyor"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Denetleniyor..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Motorlar"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ayarları"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> etkinleştirildi"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> devre dışı bırakıldı"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Motor ayarları"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> ayarları"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Diller ve sesler"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Yüklendi"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Yüklü değil"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Bayan"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Bay"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Konuşma sentezi motoru yüklendi"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Kullanmadan önce yeni motoru etkinleştirin."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Motor ayarlarını başlat"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Tercih edilen motor"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Genel"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Güç denetimi"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Kablosuz ayarı güncelleniyor"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarları güncelleniyor"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Arka plan uygulamalar için Uygulama Yanıt Vermiyor mesajını göster"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Harici birimdeki uygulamalara izin vermeye zorla"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Bildirilen değerlerden bağımsız olarak uygulamaları harici depolamaya yazmak için uygun hale getirir"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Etkinlikleri yeniden boyutlandırılabilmeye zorla"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Manifest değerlerinden bağımsız olarak, tüm etkinlikleri birden fazla pencerede yeniden boyutlandırılabilir hale getirir."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uygulama veri kullanımı"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Yalnızca alarmlar"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Tamamen sessiz"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Görsel kesilmeler"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Varsayılan bildirim zil sesi"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Çağrılarda ayrıca titret"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Cihazınız kilitliyken bildirimlerin nasıl gösterilmesini istersiniz?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Bildirimler"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Konu bildirimleri"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Diğer sesler"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tuş takımı sesleri"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekran kilitleme sesleri"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Bu uygulamadan gelen bildirimleri asla gösterme"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Öncelikli olarak ele al"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Rahatsız etmeyin seçeneği yalnızca Öncelikli olarak ayarlandığında, bu uygulamanın bildirimlerinin duyulmasına izin ver"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Kısaca göz atmaya izin ver"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Bu uygulamanın, belirli bildirimleri, mevcut ekranın görünümüne kısa süre için kaydırarak vurgulamasına izin ver"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Rahatsız Etmeyin ayarını geçersiz kıl"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Rahatsız Etmeyin seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken, bu bildirimlerin kesmeye devam etmesine izin ver"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Hassas içeriği gizle"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Cihaz kilitlendiğinde, bu uygulamanın bildirimlerindeki gizli bilgileri görüntüleyebilecek içeriği gizleyin"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Cihaz kilitlendiğinde, bu bildirimlerdeki gizli bilgileri görüntüleyebilecek içeriği gizleyin"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Engellendi"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Öncelik"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Hassas"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Yalnızca şu saate kadar alarmlara geç: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Her zaman kes seçeneğine değiştir"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ekran kesintisi yok"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Rahatsız Etmeyin ayarıyla sessize alınan bildirimlerin ekranda gizlice belirmesini veya görünmesini engelle"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Bildirim ışığı yok"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Rahatsız Etmeyin ayarıyla sessize alınan bildirimlerin yanıp sönen ışık göstermesini engelle"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Sab. kald. önce PIN\'i sor"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Sabitlemeyi kaldırmadan önce şifre sor"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Sabitlemeyi kaldırırken cihazı kilitle"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"İş profili"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu iş profili şunun tarafından yönetiliyor:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tarafından yönetiliyor"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Deneysel)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Bildirimler"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Normal"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Devre dışı"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Hassas içerik gizli"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Öncelikliler"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Gözetleme yok"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Kişisel uygulamalar"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"İş uygulamaları"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Engellenenler"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Öncelikli olanlar"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Hassas içerik gizli"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Gözetleme yok"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Alan URL\'leri ile"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Yönetici tarafından devre dışı bırakıldı"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Uygulamaları yapılandır"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Uygulama izinleri"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> uygulamaya ek erişim izni veriliyor"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> uygulamaya izin veriliyor"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Resim renk modu"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB\'yi kullan"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Görüntüyü ölçekle"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekran yoğunluk yakınlaştırma ölçek ölçekleme"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Küçük"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Büyük"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Daha büyük"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"En büyük"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Özel (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Tümünü göster"</string>
+    <string name="see_less" msgid="1250265310929558370">"Daha az göster"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Bağlantı kesildi"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> veri kullanıldı"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> uygulama yüklü"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> / <xliff:g id="SIZE2">%2$s</xliff:g> kullanılıyor"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Uyarlanan parlaklık AÇIK"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Uyarlanan parlaklık KAPALI"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 1d3a941..e96ac63 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Великий"</item>
     <item msgid="7786168277516233536">"Дуже великий"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Дуже повільний"</item>
-    <item msgid="2361722960903353554">"Повільний"</item>
-    <item msgid="1145554631248513562">"Звичайний"</item>
-    <item msgid="7553665153391107454">"Швидкий"</item>
-    <item msgid="1370673569131070146">"Швидша"</item>
-    <item msgid="4648206845228970803">"Дуже швидка"</item>
-    <item msgid="4977949754169483251">"Висока"</item>
-    <item msgid="6106302964845503577">"Дуже висока"</item>
-    <item msgid="6800277205640837264">"Найшвидша"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Дуже низька"</item>
-    <item msgid="2692137425242433765">"Низька"</item>
-    <item msgid="3332408460740717754">"Звичайна"</item>
-    <item msgid="4907380534957572531">"Висока"</item>
-    <item msgid="4699640516390840297">"Дуже висока"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Сканув-ня..."</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index a1b5702..b684ec4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -315,6 +315,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Вимкнено адміністратором"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Цифровий відбиток"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Керування відбитками"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Використ. відбиток для"</string>
@@ -827,8 +828,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не грати звук під час вставл. чи виймання пристрою зі станції"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не грати звук під час вставл. чи виймання тел. зі станції"</string>
     <string name="account_settings" msgid="6403589284618783461">"Облікові записи"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Особисте"</string>
-    <string name="category_work" msgid="8699184680584175622">"Робота"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Робочі облікові записи (керує <xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Особисті облікові записи"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Робочий обліковий запис (керує <xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -851,6 +850,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Вимкнено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Завжди ввімкнено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматично"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертувати в зашифрований файл"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Конвертація…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Уже конвертовано в зашифрований файл"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Конвертація в зашифрований файл"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Конвертувати розділ даних у зашифрований файл.\n Застереження. Усі дані буде стерто.\n Це альфа-версія функції. Вона може працювати неналежним чином.\n Щоб продовжити, натисніть \"Стерти та конвертувати…\"."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Стерти та конвертувати…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Вимикати екран"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
@@ -1725,8 +1730,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
     <string name="print_settings" msgid="4742428530112487843">"Друк"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Налаштування друку"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"На шляху до принтера документ може проходити через декілька серверів."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Не встановлено жодну службу"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Принтери не знайдено"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Налаштування"</string>
@@ -1907,54 +1910,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Підтримка команд швидкого запуску та взаємодії"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Просте перетворення мовлення на текст"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ця служба голосового вводу зможе постійно відстежувати голос і контролювати додатки, у яких увімкнено голосовий ввід, від вашого імені. Вона походить із додатка <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Увімкнути цю службу?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Налашт. синтезу мовлення"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Вивід синтезу мовлення з тексту"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Завжди викор. мої налашт."</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Налаштування за умовчанням нижче замінюють налаштування програми"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Налашт-ня за умовч."</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Система за умовчанням"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Налаштуйте систему синтезу мовлення"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Темп мовлення"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Швидкість відтворення тексту"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Вис. зв."</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Впливає на тон відтворюваного тексту"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Використовувати мову системи"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мову не вибрано"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Устан. голос для відтворюваного тексту залежно від мови"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Прослухайте приклад"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Відтворити коротку демонстрацію синтезу мови"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Встановлення голосових даних"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Установіть потрібні голосові дані для синтезу мовлення"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Потрібні для синтезу мовлення голоси вже належно встановлено"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ваші налаштування змінено. Ось приклад їх звучання."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Неможливо запустити вибрану вами систему."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Налаштувати"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Вибрати іншу систему"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ця система синтезу мовлення може збирати всі відтворювані тексти, зокрема особисті дані, такі як паролі та номери кредитних карток. Вона походить від системи <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Увімкнути використання цієї системи синтезу мовлення?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Для виходу синтезу мовлення цією мовою потрібно мати з’єднання з Інтернетом."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Це приклад синтезу мовлення"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Статус мови за умовчанням"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>: підтримується повністю"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>: потрібне з’єднання з мережею"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>: не підтримується"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Перевірка…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Системи"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Налашт-ня <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> увімкнено"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> вимкнено"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Налаштування пошукової системи"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Мови та голоси"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Установлено"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Не встановл."</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Жіночий"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Чолов."</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Систему синтезу мовл. встановлено"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Перед викор. увімк. нову сист."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Запускати налаштування системи"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Бажана система"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Загальні"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контроль живлення"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Оновлення налаштувань Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Оновлення налашт. Bluetooth"</string>
@@ -2195,10 +2150,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Сповіщати, коли додаток не відповідає"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Примусово записувати додатки в зовнішню пам’ять"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Додатки можна записувати на зовнішню пам’ять незалежно від значень маніфесту"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Примусово масштабувати активність"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Активність масштабуватиметься на кілька вікон, незалежно від значень у файлі маніфесту."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Використ. даних додатком"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ваш оператор може по-іншому облікувати дані."</string>
@@ -2590,6 +2543,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Лише будильник"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Без сигналів"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Візуальні сповіщення"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефона"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Сигнал сповіщень за умовчанням"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Також вібросигнал для дзвінків"</string>
@@ -2603,6 +2557,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Як показувати сповіщення, коли пристрій заблоковано?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Сповіщення"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Сповіщення за темами"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Інші звуки"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Звуки цифрової клавіатури"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звуки блокування екрана"</string>
@@ -2632,12 +2587,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокувати всі"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ніколи не показувати сповіщення з цього додатка"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Вважати пріоритетними"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Дозволити сигнал для сповіщень цього додатка, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволити короткий показ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволити цьому додатку ненадовго виводити важливі сповіщення на поточний екран"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Заміна режиму \"Не турбувати\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Показувати ці сповіщення, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ховати конфіденційний вміст"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Коли пристрій заблоковано, ховати конфіденційний вміст сповіщень цього додатка"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Коли пристрій заблоковано, ховати конфіденційний вміст цих сповіщень"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблоковано"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Пріоритетні"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфіденційно"</string>
@@ -2712,6 +2665,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активувати режим \"Лише будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Вибрати опцію \"Завжди надсилати\""</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Не виводити на екран"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Не виводити на поточний екран сповіщення, для яких вибрано режим \"Не турбувати\""</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Без індикатора"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Не вмикати індикатор сповіщень, для яких вибрано режим \"Не турбувати\""</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
@@ -2724,7 +2681,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-код для відкріплення"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запитувати пароль перед відкріпленням"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокувати пристрій після відкріплення"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Робочий профіль"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Цим робочим профілем керує додаток"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Керує додаток <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментальна функція)"</string>
@@ -2777,9 +2733,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Сповіщення"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Звичайні"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Заблокувати"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Конфіденційний вміст сховано"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Пріоритетні"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Коротке сповіщення вимкнено"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2807,15 +2760,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Особисті"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Робочі"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблоковані"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Пріоритетні"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Конфіденційний вміст сховано"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Коротке сповіщення вимкнено"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"З URL-адресами домену"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Вимкнено адміністратором"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Налаштування додатків"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Вибрати профіль"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Дозволи додатків"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Додатковий доступ мають стільки додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволено додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2978,4 +2927,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Режим кольору"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Використовувати sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Масштаб дисплея"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"дисплей щільність масштаб масштабування"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Малі елементи"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Звичайні елементи"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Великі елементи"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Більші елементи"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Найбільші елементи"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Спеціальний масштаб (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Показати все"</string>
+    <string name="see_less" msgid="1250265310929558370">"Показати менше"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Від’єднано"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Використовується трафіку: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Установлено додатків: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Використано <xliff:g id="SIZE1">%1$s</xliff:g> з <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Регульовану яскравість УВІМКНЕНО"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Регульовану яскравість ВИМКНЕНО"</string>
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index 3eb6ae0..5188b46 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"بڑا"</item>
     <item msgid="7786168277516233536">"بہت بڑا"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"بہت سست"</item>
-    <item msgid="2361722960903353554">"سست"</item>
-    <item msgid="1145554631248513562">"عام"</item>
-    <item msgid="7553665153391107454">"تیز"</item>
-    <item msgid="1370673569131070146">"تیز تر"</item>
-    <item msgid="4648206845228970803">"بہت تیز"</item>
-    <item msgid="4977949754169483251">"تیز"</item>
-    <item msgid="6106302964845503577">"کافی تیز"</item>
-    <item msgid="6800277205640837264">"سب سے تیز"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"بہت کم"</item>
-    <item msgid="2692137425242433765">"کم"</item>
-    <item msgid="3332408460740717754">"عام"</item>
-    <item msgid="4907380534957572531">"اعلی"</item>
-    <item msgid="4699640516390840297">"بہت زيادہ"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"اسکین کر رہا ہے…"</item>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 9431e64..c9c485d 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"پاس ورڈز"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"منتظم نے غیر فعال کی"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"فنگر پرنٹ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"فنگر پرنٹس کا نظم کریں"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"فنگر پرنٹ استعمال کریں برائے"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ڈاک میں ٹیبلٹ داخل کرنے یا اس سے ہٹاتے وقت آواز نہ چلائیں"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ڈاک میں فون داخل کرنے یا اس سے ہٹانے وقت آواز نہ چلائیں"</string>
     <string name="account_settings" msgid="6403589284618783461">"اکاؤنٹس"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ذاتی"</string>
-    <string name="category_work" msgid="8699184680584175622">"دفتر"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"دفتری پروفائل اکاؤنٹس - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ذاتی پروفائل اکاؤنٹس"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"دفتری اکاؤنٹ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"غیر فعال"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ہمیشہ آن"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"فائل مرموز کاری میں بدلیں"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"بدلیں…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"فائل پہلے ہی مرموز شدہ ہے"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"فائل پر مبنی مرموز کاری میں بدلا جا رہا ہے"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ڈیٹا پارٹیشن کو فائل پر مبنی مرموز کاری میں بدلیں۔\n !!تنبیہ!! اس سے آپ کا سارا ڈیٹا مٹ جائے گا۔\n یہ خصوصیت الفا ہے اور شاید ٹھیک طرح سے کام نہ کرے۔\n جاری رکھنے کیلئے \'صاف کریں اور بدلیں…\' دبائیں۔"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"صاف کریں اور بدلیں…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"سلیپ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"اسکرین آف ہوجاتی ہے"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"ترتیبات"</string>
     <string name="print_settings" msgid="4742428530112487843">"پرنٹنگ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"پرنٹ سروسز"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> کا استعمال کریں؟"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"آپ کی دستاویز پرنٹر تک جاتے ہوئے ایک یا زیادہ سرورز سے ہوکر گزر سکتی ہے۔"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"کوئی سروسز انسٹال نہیں ہے"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"کوئی پرنٹرز نہیں ملے"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ترتیبات"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"مکمل ہاٹ ورڈ اور تعامل"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"آسان اسپیچ ٹو ٹیکسٹ"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"یہ صوتی ان پٹ سروس ہمیشہ آن رہنے والی صوتی مانیٹرنگ کو انجام دے سکے گی اور آپ کی جانب سے آواز فعال کردہ ایپلیکیشنز کو کنٹرول کر سکے گی۔ یہ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ایپلیکیشن سے آتی ہے۔ اس سروس کا استعمال فعال کریں؟"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"ٹیکسٹ ٹو اسپیچ کی ترتیبات"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"ٹیکسٹ ٹو اسپیچ آؤٹ پٹ"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ہمیشہ میری ترتیبات استعمال کریں"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ذیل کی ڈیفالٹ ترتیبات ایپ ترتیبات کی جگہ لے لیتی ہیں"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"ڈیفالٹ ترتیبات"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"ڈیفالٹ انجن"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"بولے ہوئے متن کیلئے استعمال کی جانے والی اسپیچ کی ترکیب کا انجن سیٹ کریں"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"اسپیچ کی شرح"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"متن بولے جانے کی رفتار"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"پچ"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"زبانی متن کی ٹون کو متاثر کرتا ہے"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"زبان"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"سسٹم کی زبان استعمال کریں"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"زبان منتخب نہیں کی گئی"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"زبانی متن کیلئے زبان کیلئے مخصوص آواز کو سیٹ کرتا ہے"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"ایک مثال سنیں"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"اسپیچ سنتھیسس کا ایک مختصر مظاہرہ چلائیں"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"صوتی ڈیٹا انسٹال کریں"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"اسپیچ سنتھیسس کیلئے درکار صوتی ڈیٹا انسٹال کریں"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"پہلے ہی ٹھیک سے انسٹال کردہ اسپیچ سنتھیسس کیلئے وائسز درکار ہیں"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"آپ کی ترتیبات تبدیل ہو گئی ہیں۔ یہ اس بات کی ایک مثال ہے کہ وہ کیسے سنائی دیتے ہیں۔"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"آپ نے جو انجن منتخب کیا ہے وہ نہیں چل سکتا ہے۔"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"ترتیب دیں"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"کوئی دوسرا انجن منتخب کریں"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"یہ اسپیچ سنتھیسس انجن آپ کے ٹائپ کردہ سبھی متن کو جمع کر سکتا ہے، بشمول ذاتی ڈیٹا جیسے پاس ورڈز اور کریڈٹ کارڈ نمبرز۔ یہ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> انجن سے آتا ہے۔ اس اسپیچ سنتھیسس انجن کا استعمال فعال کریں؟"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"اس زبان کو ٹیکسٹ ٹو اسپیچ کے آؤٹ پٹ کیلئے ایک کام کرنے والے کنکشن کی ضرورت ہے۔"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"یہ تقریر کی ترکیب کی ایک مثال ہے"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"ڈیفالٹ زبان کا اسٹیٹس"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> مکمل طور پر تعاون یافتہ ہے"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> کو نیٹ ورک کنکشن کی ضرورت ہے"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> تعاون یافتہ نہیں ہے"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"چیک کیا جا رہا ہے…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"انجنز"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ترتیبات"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> فعال ہے"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> غیر فعال ہے"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"انجن کی ترتیبات"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> کیلئے ترتیبات"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"زبانیں اور آوازیں"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"انسٹال کردہ"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"انسٹال نہیں ہے"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"مؤنث"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"مذکر"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"اسپیچ سنتھیسس انجن انسٹال ہے"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"استعمال سے پہلے انجن فعال کریں"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"انجن کی ترتیبات شروع کریں"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"ترجیحی انجن"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"عمومی"</string>
     <string name="gadget_title" msgid="5519037532720577836">"پاور کنٹرول"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"‏Wi‑Fi ترتیب اپ ڈیٹ ہو رہی ہے"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"بلوٹوتھ کی ترتیب کو اپ ڈیٹ کرنا"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"پس منظر کی ایپس کیلئے ایپ جواب نہیں دے رہی ہے ڈائلاگ دکھائیں"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"بیرونی پر ایپس کو زبردستی اجازت دیں"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"‏manifest اقدار سے قطع نظر، کسی بھی ایپ کو بیرونی اسٹوریج پر لکھے جانے کا اہل بناتا ہے"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"سرگرمیوں کو ری سائز ایبل بنائیں"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"‏manifest اقدار سے قطع نظر، ملٹی ونڈو کیلئے تمام سرگرمیوں کو ری سائز ایبل بناتا ہے۔"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ڈیٹا کا استعمال"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ایپ ڈیٹا کا استعمال"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"کیریئر ڈیٹا کا حساب آپ کے آلہ سے مختلف ہو سکتا ہے۔"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"صرف الارمز"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"مکمل خاموشی"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"بصری مداخلتیں"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"فون رنگ ٹون"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"اطلاع کا ڈیفالٹ رنگ ٹون"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"کالز کیلئے وائبریٹ بھی کرے"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"اپنا آلہ مقفل ہونے پر آپ اطلاعات کو کیسے دیکھنا چاہیں گے؟"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"اطلاعات"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ایپ کی اطلاعات"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"موضوعی اطلاعات"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"دیگر آوازیں"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ڈائل پیڈ ٹونز"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"اسکرین کو مقفل کرنے کی آوازیں"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"اس ایپ سے کبھی بھی اطلاعات نہ دکھائیں"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"ترجیح کے بطور خیال کریں"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"جب ڈسٹرب نہ کریں صرف ترجیحی پر سیٹ ہو تو اس ایپ کی اطلاعات کی آواز سنائی دینے دیں"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"جھانکنے کی اجازت دیں"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"موجودہ اسکرین پر کچھ اطلاعات کو تھوڑی دیر کیلئے منظر میں سلائیڈ کرکے اس ایپ کو ان پر توجہ مرکوز کرنے دیں"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ڈسٹرب نہ کریں کو اوور رائیڈ کریں"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"جب \'ڈسٹرب نہ کریں\' صرف ترجیح پر سیٹ ہو تو ان اطلاعات کو مداخلت کرنے دیں"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"حساس مواد چھپائیں"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"جب آلہ مقفل ہو تو اس ایپ کی ان اطلاعات میں مواد چھپائیں جو نجی معلومات ظاہر کر سکتی ہوں"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"جب آلہ مقفل ہو تو ان اطلاعات میں موجود ایسے مواد کو چھپائیں جو نجی معلومات ظاہر کر سکتا ہو"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"مسدود ہے"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ترجیح"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> تک کیلئے صرف الارمز میں تبدیل کریں"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ہمیشہ مداخلت کریں میں تبدیل کریں"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"اسکرین مداخلتیں نہیں"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"\'تنگ مت کریں\' کی جانب سے خاموش کردہ اطلاعات کو موجودہ اسکرین پر جھانکنے یا ظاہر ہونے سے روکیں"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"کوئی اطلاعی روشنی نہیں"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"\'تنگ مت کریں\' کی جانب سے خاموش کردہ اطلاعات کو روشنی جھپکنے سے روکیں"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"ایپ کی اطلاعات"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‏پن ہٹانے سے پہلے PIN طلب کریں"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"پن ہٹانے سے پہلے پاس ورڈ طلب کریں"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"پن ہٹاتے وقت آلہ کو مقفل کریں"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"دفتر کا پروفائل"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"یہ دفتری پروفائل اس کے زیر انتظام ہے:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> کے زیر انتظام ہے"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجرباتی)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"اطلاعات"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"عام"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"مسدود"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"حساس مواد مخفی ہے"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"ترجیح"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"کوئی تاک جھانک نہیں"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ذاتی"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"دفتری"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"مسدود"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ترجیحی"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"حساس مواد مخفی ہے"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"کوئی تاک جھانک نہیں"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"‏ڈومین URLs کے ساتھ"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"منتظم نے غیر فعال کر دیا"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ایپس کنفیگر کریں"</string>
     <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ایپ کی اجازتیں"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> ایپس کو اضافی رسائی کی اجازت دی گئی"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> ایپس کو اجازت دی گئی"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"تصویری رنگ موڈ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏sRGB استعمال کریں"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ڈسپلے اسکیل"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ڈسپلے کثافت کے زوم اسکیل کی اسکیلنگ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"چھوٹا"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"عام"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"بڑا"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"قدرے بڑا"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"سب سے بڑا"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"حسب ضرورت (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"سبھی دیکھیں"</string>
+    <string name="see_less" msgid="1250265310929558370">"کم دیکھیں"</string>
+    <string name="disconnected" msgid="5787956818111197212">"غیر منسلک ہے"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ڈیٹا استعمال ہو گیا"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ایپس انسٹال ہو گئیں"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE2">%2$s</xliff:g> کا <xliff:g id="SIZE1">%1$s</xliff:g> استعمال ہو گیا"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"موافق چمک آن ہے"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"موافق چمک آف ہے"</string>
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 230368a..eb68722 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Katta"</item>
     <item msgid="7786168277516233536">"Juda katta"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Juda sekin"</item>
-    <item msgid="2361722960903353554">"Sekin"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Tez"</item>
-    <item msgid="1370673569131070146">"Tezroq"</item>
-    <item msgid="4648206845228970803">"Juda tez"</item>
-    <item msgid="4977949754169483251">"Tez"</item>
-    <item msgid="6106302964845503577">"Juda tez"</item>
-    <item msgid="6800277205640837264">"Eng tez"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Juda past"</item>
-    <item msgid="2692137425242433765">"Past"</item>
-    <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Baland"</item>
-    <item msgid="4699640516390840297">"Juda baland"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Tekshirib chiqilmoqda…"</item>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index e9bd1ab..1702f1e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -46,7 +46,7 @@
     <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE tomonidan ta’minlangan bayroqchani o‘chirib qo‘yish"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dump‘ni yoqib qo‘yish"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram dump‘ni o‘chirish"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-karta manzillar kitobini ko‘rish"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM karta manzillar kitobini ko‘rish"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ruxsat etilgan raqamlarni ko‘rish"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Terish xizmati raqamlarini ko‘rish"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP ro‘yxatini olish"</string>
@@ -79,7 +79,7 @@
     <string name="large_font" msgid="599055175160971446">"Katta"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB xotira"</string>
-    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-karta"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD karta"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Noma’lum"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Quvvat olmoqda"</string>
     <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Quvvat olmoqda (AC)"</string>
@@ -146,8 +146,8 @@
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Boshqa so‘ralmasin"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Xabarga kirish so‘rovi"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s xabarlaringizni ochmoqchi. %2$s‘ga ruxsat berilsinmi?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-karta ma’lumotlariga kirish so‘rovi"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM-karta ma’lumotlarini ko‘rmoqchi. SIM-karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM karta ma’lumotlariga kirish so‘rovi"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM karta ma’lumotlarini ko‘rmoqchi. SIM karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Ko‘rinishi:"</string>
@@ -241,7 +241,7 @@
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Planshet haqida"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefon haqida"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB xotira"</string>
-    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-karta"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karta"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proksi sozlamalari"</string>
     <string name="cancel" msgid="6859253417269739139">"Bekor qilish"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parollar"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Administrator tomonidan o‘chirib qo‘yilgan"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmoq izi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmoq izlari"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Barmoq izi sozlamalari"</string>
@@ -602,7 +603,7 @@
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tarmoq haqida bildirishnoma"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3716818008370391253">"Hamma uchun ochiq tarmoqlar haqida xabar qilinsin"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Sifatsiz ulanishdan chetlashish"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Sifatli Internet ulanishi mavjud bo‘lmaganicha, Wi‑Fi tarmog‘iga ulanmasin."</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Internet aloqasi yomon bo‘lsa, Wi-Fi tarmog‘iga ulanilmasin"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Faqat kuchli signalga ega tarmoqlardan foydalanilsin"</string>
     <string name="wifi_automatically_connect_title" msgid="7950640291510621742">"Ochiq Wi-Fi tarmog‘iga avtomatik ulanish"</string>
     <string name="wifi_automatically_connect_summary" msgid="6722194413023965902">"Wi-Fi yordamchisiga ochiq tarmoqlar ichidan eng kuchlisiga avtomatik ulanishi uchun ruxsat bering"</string>
@@ -657,7 +658,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"Holati"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Aloqa tezligi"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"Chastota"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"IP-manzil"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP manzil"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"Bu orqali saqlangan"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> hisobi ma’lumotlari"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP usuli"</string>
@@ -710,7 +711,7 @@
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Operatsiya uchun chastotalar oralig‘ini ko‘rsating"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Antena chastotasini sozlashda muammo paydo bo‘ldi."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-manzil"</string>
-    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-manzil"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP manzil"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saqlangan tarmoqlar"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP sozlamalari"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Saqlash"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Planshetni dokga ulash yoki dokdan chiqarish paytida ovoz yangramasin"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Telefonni dokka ulash yoki dokdan uzish paytida ovoz chiqarilmasin"</string>
     <string name="account_settings" msgid="6403589284618783461">"Hisoblar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Shaxsiy"</string>
-    <string name="category_work" msgid="8699184680584175622">"Ish"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Ishchi profil hisoblari – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Shaxsiy profil hisoblari"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Ishchi hisob – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"O‘chiq"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Har doim yoniq tursin"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Avtomatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Faylli shifrga o‘girish"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"O‘girish…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fayl allaqachon shifrlangan"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Faylli shifrga o‘girilmoqda"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Ma’lumotlaringizni faylli shifrga o‘giring.\n !!Diqqat!! Barcha ma’lumotlaringizni o‘chirib tashlanadi.\n Ushbu funksiya hali alfa-versiya va to‘g‘ri ishlamasligi mumkin.\n Davom etish uchun “O‘chirib tashlash va o‘girish…” tugmasini bosing."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"O‘chirib tashlash va o‘girish…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyqu rejimi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan so‘ng"</string>
@@ -855,7 +860,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Tashqi ekran"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Qurilmani qo‘limga olsam yoki bildirishnoma kelsa, ekran uyqu rejimidan chiqarilsin"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-karta qulfi sozlamalari"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kartaga qulf o‘rnatish"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kartani qulflash"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kartani qulflash"</string>
@@ -864,32 +869,32 @@
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Planshetdan foydalanish uchun PIN-kod so‘raladi"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Telefondan foydalanish uchun PIN-kod so‘raladi"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM kartaning PIN kodini o‘zgartirish"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-karta PIN kodi"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM karta PIN kodi"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kartani qulflash"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM-karta qulfini ochish"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"SIM-karta eski PIN kodi"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM karta qulfini ochish"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"SIM karta eski PIN kodi"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"SIM kartaga yangi PIN-kod"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Yangi PIN kodni qayta kiriting"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM-karta PIN kodi"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM karta PIN kodi"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Noto‘g‘ri PIN-kod"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"PIN-kodlar bir-biriga mos kelmadi"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"PIN-kod o‘zgartirilmadi.\nNoto‘g‘ri PIN-kod terildi shekilli."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-karta PIN kodi o‘zgartirildi"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"SIM-karta qulfi holati o‘zgarmadi.\nPIN-kod noto‘g‘ri kiritildi shekilli."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM karta PIN kodi o‘zgartirildi"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"SIM karta qulfi holati o‘zgarmadi.\nPIN-kod noto‘g‘ri kiritildi shekilli."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Bekor qilish"</string>
-    <string name="sim_multi_sims_title" msgid="9159427879911231239">"Bir nechta SIM-karta topildi"</string>
+    <string name="sim_multi_sims_title" msgid="9159427879911231239">"Bir nechta SIM karta topildi"</string>
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Mobil internetdan foydalanish uchun SIM kartani tanlang."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Internet SIM kartasi o‘zg-mi?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Mobil internet uchun <xliff:g id="OLD_SIM">%2$s</xliff:g> o‘rniga <xliff:g id="NEW_SIM">%1$s</xliff:g> ishlatilsinmi?"</string>
-    <string name="sim_preferred_title" msgid="5567909634636045268">"Ma’qul SIM-karta o‘zg-sinmi?"</string>
-    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – qurilmangizdagi yagona SIM-karta. Undan qo‘ng‘iroqlar, mobil internet va SMS xabarlar uchun foydalanmoqchimisiz?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-karta noto‘g‘ri PIN kodi. Endi siz qurilmangiz qulfini ochish uchun operatoringizga murojaat qilishingiz lozim."</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Ma’qul SIM karta o‘zg-sinmi?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – qurilmangizdagi yagona SIM karta. Undan qo‘ng‘iroqlar, mobil internet va SMS xabarlar uchun foydalanmoqchimisiz?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM karta noto‘g‘ri PIN kodi. Endi siz qurilmangiz qulfini ochish uchun operatoringizga murojaat qilishingiz lozim."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="other">SIM kartaning PIN kodi noto‘g‘ri. Sizda yana <xliff:g id="NUMBER_1">%d</xliff:g> ta urinish qoldi.</item>
       <item quantity="one">SIM kartaning PIN kodi noto‘g‘ri. Qurilmani qulfdan chiqarish uchun sizda yana <xliff:g id="NUMBER_0">%d</xliff:g> ta urinish qoldi.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"SIM-karta PIN kodining amaliyoti bajarilmadi!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"SIM karta PIN kodining amaliyoti bajarilmadi!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planshet holati"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon holati"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Tizim yangilanishlari"</string>
@@ -934,7 +939,7 @@
     <string name="status_awake_time" msgid="2393949909051183652">"Uyg‘oqlik vaqti"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ichki xotira"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB xotira"</string>
-    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-karta"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD karta"</string>
     <string name="memory_available" msgid="5052397223077021181">"Bo‘sh"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Mavjud (faqat o‘qish uchun)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jami xotira"</string>
@@ -1009,8 +1014,8 @@
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> formatlandi"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"<xliff:g id="NAME">%1$s</xliff:g> ni formatlab bo‘lmadi"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"Xotira qur-masini qayta nomlash"</string>
-    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"Bu SD-karta (<xliff:g id="NAME_0">^1</xliff:g>) xavfsiz chiqarib olindi, lekin hali undan foydalansa bo‘ladi. \n\nBu SD-kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni tizimga ulang."</string>
-    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"Bu SD-karta (<xliff:g id="NAME_0">^1</xliff:g>) shikastlangan. \n\nBu SD-kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni sozlash lozim."</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"Bu SD karta (<xliff:g id="NAME_0">^1</xliff:g>) xavfsiz chiqarib olindi, lekin hali undan foydalansa bo‘ladi. \n\nBu SD kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni tizimga ulang."</string>
+    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"Bu SD karta (<xliff:g id="NAME_0">^1</xliff:g>) shikastlangan. \n\nBu SD kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni sozlash lozim."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Bu qurilma ushbu SD-kartani (<xliff:g id="NAME_0">^1</xliff:g>) qo‘llab-quvvatlamaydi. \n\nBu SD-kartani (<xliff:g id="NAME_1">^1</xliff:g>) mazkur qurilma bilan ishlatish uchun avval uni sozlang."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Formatlagandan so‘ng, “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini boshqa qurilmalarda foydalanishingiz mumkin. \n\n“<xliff:g id="NAME_1">^1</xliff:g>” kartasidagi barcha ma’lumotlar o‘chirib tashlanadi, shuning uchun uning zaxira nusxasini olib qo‘yishni tavsiya etamiz. \n\n"<b>"Rasm va boshqa fayllarning nusxasini saqlab oling."</b>" \nMedia fayllaringizni ushbu qurilmadagi muqobil xotiraga ko‘chiring yoki USB kabeldan foydalanib ularni kompyuterga o‘tkazing. \n\n"<b>"Ilovalarning zaxira nusxasini saqlab oling."</b>" \n“<xliff:g id="NAME_6">^1</xliff:g>” kartasida joylashgan barcha ilovalar va ularning ma’lumotlari o‘chirib tashlanadi. Ularni xotira qurilmasiga ko‘chirib o‘tkazishni tavsiya etamiz."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Agar “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini chiqarib olsangiz, unda joylashgan ilovalar ishlashdan to‘xtaydi va undagi media fayllar uni qayta kiritmaguningizcha ishlamaydi."</b>" \n\n“<xliff:g id="NAME_1">^1</xliff:g>” kartasi faqat ushbu qurilmada ishlaydigan qilib formatlangan. U boshqa hech qanday qurilma bilan ishlamaydi."</string>
@@ -1024,7 +1029,7 @@
     <string name="storage_detail_cached" msgid="8547136365247818567">"Kesh ma’lumotlari"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Boshqa"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="4894289482062047165">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD-karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
+    <string name="storage_detail_dialog_other" msgid="4894289482062047165">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> rasm, musiqa, film, ilova yoki <xliff:g id="SIZE">^2</xliff:g> xotirani egallagan boshqa ma’lumotlarni saqlagan bo‘lishi mumkin. \n\nTafsilotlarni ko‘rish uchun <xliff:g id="USER_1">^1</xliff:g> profiliga o‘ting."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
@@ -1304,7 +1309,7 @@
     <string name="external_code_size_label" msgid="3459343140355961335">"USB xotira ilovasi"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Ma’lumotlar"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB xotira ma‘lumotlari"</string>
-    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-karta"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD karta"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"O‘chirish"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Ilovani barcha foydalanuvchilar uchun ochirib yuborish"</string>
     <string name="install_text" msgid="884360662922471113">"O‘rnatish"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Sozlamalar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Chop etish"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Chop etish xizmatlari"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Hujjat chop etilishidan oldin u bir yoki bir nechta serverdan o‘tishi mumkin."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Xizmatlar o‘rnatilmagan"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Printer topilmadi"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Sozlamalar"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Takomillashgan rejim: ovozli buyruqlar yordamida boshqarish"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Oddiy rejim: nutqni aniqlash"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ushbu ovoz bilan yozish xizmati sizning nomingizdan ovozli buyruqlarni muntazam kuzatishi va ovozli buyruqlarni ishlatiladigan ilovalarni nazorat qilishi mumkin. Bu amallar <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ilovasi orqali bajariladi. Mazkur xizmatdan foydalanmoqchimisiz?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Nutq sintezi sozlamalari"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Nutq sintezi"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Doim mening sozlamalarimdan foydalanish"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Quyidagi standart sozlamalar ilova sozlamalarini ustidan yoziladi"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Andoza sozlamalar"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"standart mexanizm"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Talaffuz qilinadigan matnda foydalanish uchun nutqni tahlil qilish vositasini ko‘rsating"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Nutq tezligi"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Matnni o‘qish tezligi"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Chimdish"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Og‘zaki matn balandligiga tasir qiladi"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Til"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Tizim tili"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Til tanlanmagan"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Og‘zaki matn uchun tilga moslangan ovoz o‘rnatadi"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Namunani eshitish"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Qisqa nutq sintezi namunasini eshitish"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Ovoz ma’lumotlarini o‘rnatish"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Nutq sintezi uchun kerakli ovoz ma’lumotlarini o‘rnatish"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Nutqni sintezlash to‘g‘ri o‘rnatilishi uchun ovozlar kerak bo‘ladi"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Sozlamalaringiz o‘zgartirildi. Bu ular qanday yangrariga namuna."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Siz tanlagan dastur ishga tushmayapti."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Moslash"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Boshqa mexanizm tanlash"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ushbu nutq sintezi mexanizmi barcha yozgan matnlaringizni to‘plab olishi mumkin, jumladan kredit karta raqamlari va parollar kabi shaxsiy ma‘lumotlarni ham. U <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mexanizmi bilan o‘rnatiladi. Ushbu nutq sintezi mexanizmidan foydalanilsinmi?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bu til matnni nutqga o‘girish uchun faol Internet ulanishini talab qiladi."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Bu nutq sintezining misoli"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Birlamchi til"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> – to‘liq qo‘llab-quvvatlanadi"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> tili tarmoqqa ulanishi lozim"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> – qo‘llab-quvvatlanmaydi"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Tekshirmoqda..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Mexanizmlari"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> sozlamalari"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> yoniq"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> o‘chiq"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Mexanizm sozlamalari"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> sozlamalari"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Tillar va ovozlar"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"O‘rnatilgan"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"O‘rnatilmagan"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Ayol"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Erkak"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Nutqni sintezlash mexanizmi o‘rnatildi"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Foydalanishdan oldin yangi dasturni yoqing."</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Mexanizm sozlamalarini ishga tushirish"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Standart tizim"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Umumiy"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Quvvat boshqaruvi"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi sozlamasi yangilanmoqda"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth sozlamar yangilanmoqda"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Ilova javob bermayotgani haqida xabar qilish"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Tashqi xotira qurilmasidagi ilova dasturlariga majburiy ruxsat berish"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Manifest qiymatidan qat’i nazar istalgan ilovani tashqi xotiraga saqlash imkonini beradi"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Harakatlarni moslashuvchan o‘lchamga keltirish"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Manifest qiymatidan qat’i nazar barcha harakatlarni ko‘p oynali rejimga moslashtiradi."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Trafik sarfi"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ilova trafigi"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
@@ -2437,7 +2390,7 @@
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Ovoz va kommunikatsiya xususiyatlarini oshirish uchun LTE tarmog‘idan foydalaning (tavsiya etiladi)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Tarmoq turi"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (tavsiya etiladi)"</string>
-    <string name="work_sim_title" msgid="4843322164662606891">"Ishchi SIM-karta"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"Ishchi SIM karta"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Ilovalar va kontentga kirish"</string>
     <string name="user_rename" msgid="8523499513614655279">"QAYTA NOMLASH"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ilova cheklovlarini o‘rnatish"</string>
@@ -2470,24 +2423,24 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Mobil internet SIM kartasini tanlash uchun bosing"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Bundan doim qo‘ng‘iroqlar uchun foyd-sin"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Internet uchun SIM kartani tanlang"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"Mobil internet uchun SIM-karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Quyidagi bilan qo‘ng‘iroq qilish"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM kartani tanlang"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>-SIM"</string>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-karta uyasi bo‘sh"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"SIM-karta nomi"</string>
-    <string name="sim_name_hint" msgid="7038643345238968930">"SIM-karta nomini kiriting"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karta uyasi bo‘sh"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"SIM karta nomi"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM karta nomini kiriting"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d-SIM karta teshigi"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Aloqa operatori"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Raqam"</string>
-    <string name="sim_editor_color" msgid="2542605938562414355">"SIM-karta rangi"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"SIM karta rangi"</string>
     <string name="sim_card_select_title" msgid="6668492557519243456">"SIM kartani tanlang"</string>
     <string name="color_orange" msgid="4417567658855022517">"To‘q sariq"</string>
     <string name="color_purple" msgid="3888532466427762504">"Binafsharang"</string>
-    <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM-karta solinmagan"</string>
-    <string name="sim_status_title" msgid="6744870675182447160">"SIM-karta holati"</string>
+    <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM karta solinmagan"</string>
+    <string name="sim_status_title" msgid="6744870675182447160">"SIM karta holati"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Birlamchi SIM kartadan qaytarib qo‘ng‘iroq qilish"</string>
-    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chiqish qo‘ng‘iroqlari uchun mo‘ljallangan SIM-karta"</string>
+    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chiqish qo‘ng‘iroqlari uchun mo‘ljallangan SIM karta"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Boshqa qo‘ng‘iroq sozlamalari"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Tarmoq yukini kam-sh usuli"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Tarmoq nomi ko‘rsatilmasin"</string>
@@ -2496,7 +2449,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> sh.s.b"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartalar o‘zgartirildi."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Sozlash uchun bosing"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"Quyidagi uchun afzal ko‘rilgan SIM-karta"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"Quyidagi uchun afzal ko‘rilgan SIM karta"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Har safar so‘ralsin"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Tanlash zarur"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Sozlamalar"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Faqat signallar"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Tinchlik saqlansin"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Vizual bildirishnomalar"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon ringtoni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Bildirishnomalar ringtoni"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Chaqiruv vaqtida tebranish"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Qurilmangiz qulflanganda, bildirishnomalar qanday ko‘rsatilsin?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Bildirishnomalar"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Mavzular bildirishnomalari"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Boshqa ovozlar"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Raqam terilgandagi ovoz"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekran qulflangandagi ovoz"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Barchasini bloklash"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ushbu ilovadan keladigan bildirishnomalar hech qachon ko‘rsatilmasin"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Muhim deb hisoblash"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"“Bezovta qilinmasin” rejimi “Faqat muhim bildirishnomalar” uchun istisno qilingan holatda ushbu ilova bildirishnomalari ham ko‘rsatilsin."</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Qisqa bildirishnomalar"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Ilovaga ba’zi bildirishnomalarni joriy ekranga qisqa muddatga chiqarishga ruxsat berish"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"“Bezovta qilinmasin” rejimini qayta o‘rnatish"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"“Bezovta qilinmasin” rejimi “Faqat muhim bildirishnomalar” uchun istisno qilingan holatda ushbu bildirishnomalar ham ko‘rsatilsin."</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Shaxsiy ma’lumotlar yashirilsin"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Qurilma qulflangan holatda, shaxsiy ma’lumotlarni oshkor qilishi mumkin bo‘lgan ilova bildirishnomalari ko‘rsatilmasin."</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Qurilma qulflangan holatda, shaxsiy ma’lumotlarni oshkor qilishi mumkin bo‘lgan bildirishnomalari ko‘rsatilmasin"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloklangan"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Muhimlik darajasi"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Maxfiy"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ushbu vaqtgacha faqat uyg‘otkich signallari yoniq qolsin: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Har doim bezovta qilinaversin"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Ekranga chiqarilmasin"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalarning hozirgi ekranda ko‘rsatilishining oldini olish"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Bildirishnoma indikatorisiz"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalarning yoritkichli indikatori ishlashining oldini olish"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ilovalar"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida fikr-mulohaza"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Yechishda PIN-kod so‘ralsin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Yechishdan oldin parol so‘ralsin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Yechish vaqtida qurilma qulflansin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Ishchi profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu ishchi profil quyidagi tomonidan boshqariladi:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tomonidan boshqariladi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Bildirishnomalar"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Odatiy"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Bloklash"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Maxfiy ma’lumotlar berkitilgan"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Muhimlik darajasi"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Qisqa bildirishnomalarsiz"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Shaxsiy"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Ishga oid"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloklangan"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Muhim"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Maxfiy ma’lumotlar berkitilgan"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Qisqa bildirishnomalarsiz"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Domen havolalari bilan"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Administrator tomonidan o‘chirib qo‘yilgan"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Ilovalarni sozlash"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil tanlash"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ilovalar uchun ruxsatlar"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Qo‘shimcha ruxsatga ega ilovalar: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Ruxsat berilgan ilovalar: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Rang rejimi"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ranglaridan foydalanish"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Ekran ko‘lami"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekran zichlik ko‘lam miqyos oshirish"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kichkina"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Odatiy"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Katta"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Kattaroq"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Eng katta"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Moslashtirilgan (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Barchasini ko‘rsatish"</string>
+    <string name="see_less" msgid="1250265310929558370">"Kamroq"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Aloqa uzildi"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Ishlatilgan traffik: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ta ilova o‘rnatilgan"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Xotiradan band qilingan joy: <xliff:g id="SIZE1">%1$s</xliff:g> / <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Moslashuvchan yorqinlik yoniq"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Moslashuvchan yorqinlik o‘chiq"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 5dfc8c2..8c8073b 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Lớn"</item>
     <item msgid="7786168277516233536">"Rất lớn"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Rất chậm"</item>
-    <item msgid="2361722960903353554">"Chậm"</item>
-    <item msgid="1145554631248513562">"Thường"</item>
-    <item msgid="7553665153391107454">"Nhanh"</item>
-    <item msgid="1370673569131070146">"Nhanh hơn"</item>
-    <item msgid="4648206845228970803">"Rất nhanh"</item>
-    <item msgid="4977949754169483251">"Nhanh"</item>
-    <item msgid="6106302964845503577">"Rất nhanh"</item>
-    <item msgid="6800277205640837264">"Nhanh nhất"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Rất thấp"</item>
-    <item msgid="2692137425242433765">"Thấp"</item>
-    <item msgid="3332408460740717754">"Thường"</item>
-    <item msgid="4907380534957572531">"Cao"</item>
-    <item msgid="4699640516390840297">"Rất cao"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Đang quét…"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 71c050a..18f9db5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Bị tắt bởi quản trị viên"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vân tay"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Quản lý vân tay"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sử dụng vân tay để"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Không phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Không phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
     <string name="account_settings" msgid="6403589284618783461">"Tài khoản"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Cá nhân"</string>
-    <string name="category_work" msgid="8699184680584175622">"Cơ quan"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Tài khoản hồ sơ công việc - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Tài khoản hồ sơ cá nhân"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Tài khoản công việc - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Đã tắt"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Luôn bật"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Tự động"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Chuyển đổi sang mã hóa tệp"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Chuyển đổi..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Đã mã hóa tệp"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Chuyển đổi sang chế độ mã hóa dựa trên tệp"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Chuyển đổi phân vùng dữ liệu sang chế độ mã hóa dựa trên tệp.\n !!Cảnh báo!! Tính năng này sẽ xóa tất cả dữ liệu của bạn.\n Tính năng này trong giai đoạn alpha và có thể không hoạt động đúng cách.\n Nhấn \'Xóa và chuyển đổi...\' để tiếp tục."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Xóa và chuyển đổi…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Thời gian chờ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</string>
     <string name="print_settings" msgid="4742428530112487843">"In"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Dịch vụ in"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Tài liệu của bạn có thể đi qua một hoặc nhiều máy chủ trên đường đến máy in."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Không tìm thấy máy in"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Cài đặt"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Tương tác và từ nóng đầy đủ"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Ngôn từ đơn giản dễ nhắn tin"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Dịch vụ nhập bằng giọng nói này có thể thực hiện theo dõi bằng giọng nói luôn bật và kiểm soát các ứng dụng hỗ trợ giọng nói thay mặt cho bạn. Dịch vụ này đến từ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Cho phép sử dụng dịch vụ này?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Cài đặt chuyển văn bản thành giọng nói"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Đầu ra v.bản thành giọng nói"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Luôn sử dụng cài đặt của tôi"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Cài đặt mặc định dưới đây ghi đè cài đặt ứng dụng"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Cài đặt mặc định"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Công cụ mặc định"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Đặt công cụ tổng hợp giọng nói được sử dụng cho văn bản nói"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Tốc độ nói"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Tốc độ đọc văn bản"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ảnh hưởng đến âm của văn bản nói"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Ngôn ngữ"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Sử dụng ngôn ngữ hệ thống"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Không thể chọn ngôn ngữ"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Đặt giọng nói ngôn ngữ cụ thể cho văn bản nói"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Nghe ví dụ"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Phát minh hoạ ngắn về tổng hợp giọng nói"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Cài đặt dữ liệu thoại"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Cài đặt dữ liệu thoại bắt buộc cho tổng hợp tiếng nói"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Giọng nói bắt buộc cho tổng hợp tiếng nói đã được cài đặt chính xác"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Cài đặt của bạn đã thay đổi. Đây là ví dụ về cách chúng phát âm thanh."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Công cụ bạn đã chọn không thể chạy được."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Định cấu hình"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chọn công cụ khác"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Công cụ tổng hợp tiếng nói này có thể thu thập tất cả nội dụng sẽ được nói, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Công cụ này xuất phát từ công cụ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Cho phép sử dụng công cụ tổng hợp tiếng nói này?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Ngôn ngữ này yêu cầu phải có kết nối mạng hoạt động để có thể phát âm thanh được chuyển từ văn bản sang giọng nói."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Đây là một ví dụ về tổng hợp tiếng nói"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Trạng thái ngôn ngữ mặc định"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> được hỗ trợ đầy đủ"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> yêu cầu kết nối mạng"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> không được hỗ trợ"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Đang kiểm tra..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Công cụ"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Cài đặt <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> đã được bật"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> đã bị tắt"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Cài đặt công cụ"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Cài đặt cho <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Ngôn ngữ và giọng nói"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Đã cài đặt"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Chưa cài đặt"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Nữ"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Nam"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Công cụ tổng hợp giọng nói đã cài đặt"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Bật công cụ mới trước khi dùng"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Cài đặt chạy công cụ"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Công cụ ưu tiên"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Chung"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kiểm soát điện năng"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Đang cập nhật cài đặt Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Đang cập nhật cài đặt Bluetooth"</string>
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Hiện hộp thoại Ứng dụng ko đáp ứng cho ứng dụng nền"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Buộc cho phép các ứng dụng trên bộ nhớ ngoài"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Giúp ứng dụng bất kỳ đủ điều kiện được ghi vào bộ nhớ ngoài bất kể giá trị tệp kê khai là gì"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Buộc các hoạt động có thể thay đổi kích thước"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Giúp tất cả hoạt động có thể thay đổi kích thước cho nhiều cửa sổ bất kể giá trị tệp kê khai là gì."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dữ liệu ứng dụng"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Tính toán dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Chỉ báo thức"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Hoàn toàn tắt tiếng"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Gián đoạn trực quan"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Nhạc chuông thông báo mặc định"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Đồng thời rung khi có cuộc gọi"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Khi thiết bị của bạn bị khóa, bạn muốn thông báo hiển thị như thế nào?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Thông báo"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Thông báo chủ đề"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Âm thanh khác"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Âm bàn phím số"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Âm thanh khóa màn hình"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Không bao giờ hiển thị thông báo từ ứng dụng này"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Coi là ưu tiên"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Bật âm cho thông báo của ứng dụng này khi Không làm phiền được đặt thành Chỉ ưu tiên"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Cho phép xem nhanh"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Cho phép ứng dụng này nhấn mạnh các thông báo nhất định bằng cách trượt nhanh chúng vào chế độ xem trên màn hình hiện tại"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ghi đè Không làm phiền"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Cho phép các thông báo này tiếp tục làm gián đoạn khi tính năng Không làm phiền được đặt thành Chỉ ưu tiên."</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ẩn nội dung nhạy cảm"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Khi thiết bị bị khóa, hãy ẩn nội dung có thể tiết lộ thông tin cá nhân trong thông báo của ứng dụng này"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Khi thiết bị bị khóa, hãy ẩn nội dung có thể hiển thị thông tin riêng tư trong các thông báo này."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bị chặn"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Mức độ ưu tiên"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nhạy cảm"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Đổi sang báo thức chỉ đến khi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Đổi sang luôn làm gián đoạn"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Không có tùy chọn gián đoạn màn hình"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Ngăn thông báo được tắt tiếng bằng tính năng Không làm phiền lướt qua hay xuất hiện trên màn hình hiện tại"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Không có đèn thông báo"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Ngăn thông báo được tắt tiếng bằng tính năng Không làm phiền khiến ánh sáng xung"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Hỏi mã PIN trước khi bỏ ghim"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Hỏi mật khẩu trước khi bỏ khóa màn hình"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Khóa thiết bị khi bỏ khóa màn hình"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Hồ sơ công việc"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hồ sơ công việc này được quản lý bằng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Quản lý bởi <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Thử nghiệm)"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Thông báo"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Bình thường"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Chặn"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Đã ẩn nội dung nhạy cảm"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Mức độ ưu tiên"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Không có xem nhanh"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,15 +2720,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Cá nhân"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Cơ quan"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Đã chặn"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Mức độ ưu tiên"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Đã ẩn nội dung nhạy cảm"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Không có xem nhanh"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Có URL miền"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Bị tắt bởi quản trị viên"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Định cấu hình ứng dụng"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Chọn hồ sơ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Giấy phép ứng dụng"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Đã cấp quyền truy cập bổ sung cho <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Đã cho phép <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Chế độ màu của ảnh"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Sử dụng sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Tỷ lệ hiển thị"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"mật độ hiển thị tỷ lệ thu phóng chia tỷ lệ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Nhỏ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Bình thường"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Lớn"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lớn hơn"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Lớn nhất"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Tùy chỉnh (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Xem tất cả"</string>
+    <string name="see_less" msgid="1250265310929558370">"Xem bớt"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Đã ngắt kết nối"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Đã sử dụng <xliff:g id="AMOUNT">%1$s</xliff:g> dữ liệu"</string>
+    <string name="apps_summary" msgid="193158055537070092">"Đã cài đặt <xliff:g id="COUNT">%1$d</xliff:g> ứng dụng"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"Đã sử dụng <xliff:g id="SIZE1">%1$s</xliff:g> / <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Độ sáng thích ứng được BẬT"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Độ sáng thích ứng bị TẮT"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index e5f0f54..2c15f8f 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"超大"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"很慢"</item>
-    <item msgid="2361722960903353554">"慢"</item>
-    <item msgid="1145554631248513562">"正常"</item>
-    <item msgid="7553665153391107454">"快"</item>
-    <item msgid="1370673569131070146">"较快"</item>
-    <item msgid="4648206845228970803">"非常快"</item>
-    <item msgid="4977949754169483251">"迅速"</item>
-    <item msgid="6106302964845503577">"很迅速"</item>
-    <item msgid="6800277205640837264">"最快"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"很低"</item>
-    <item msgid="2692137425242433765">"低"</item>
-    <item msgid="3332408460740717754">"正常"</item>
-    <item msgid="4907380534957572531">"高"</item>
-    <item msgid="4699640516390840297">"很高"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"正在扫描..."</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ec582c8..a148484 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -34,7 +34,7 @@
     <string name="header_category_connections" msgid="6471513040815680662">"无线和网络"</string>
     <string name="header_category_device" msgid="4544026001618307754">"设备"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"个人"</string>
-    <string name="header_category_access" msgid="7580499097416970962">"帐户和权限"</string>
+    <string name="header_category_access" msgid="7580499097416970962">"帐号和权限"</string>
     <string name="header_category_system" msgid="2816866961183068977">"系统"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"打开无线通信"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"关闭无线通信"</string>
@@ -100,7 +100,7 @@
     <string name="bluetooth_device_name" msgid="8415828355207423800">"设备名称"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"设备设置"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"配置文件设置"</string>
-    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"未设置名称，使用帐户名"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"未设置名称，使用帐号名"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"扫描设备"</string>
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"重命名此设备"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重命名"</string>
@@ -158,7 +158,7 @@
     <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"启动<xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
-    <string name="intent_sender_account_label" msgid="465210404475603404">"帐户:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"帐号:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"代理"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"代理服务器端口"</string>
@@ -306,13 +306,14 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"用户信息"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在锁定屏幕上显示个人资料信息"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
-    <string name="Accounts_settings_title" msgid="1643879107901699406">"帐户"</string>
+    <string name="Accounts_settings_title" msgid="1643879107901699406">"帐号"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
-    <string name="account_settings_title" msgid="626177544686329806">"帐户"</string>
+    <string name="account_settings_title" msgid="626177544686329806">"帐号"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"已被管理员停用"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指纹"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指纹"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"将指纹用于以下用途："</string>
@@ -372,8 +373,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"您可以对自己的帐户、设置、下载的应用及其数据、媒体和其他文件进行加密。加密平板电脑后，如果您设置了屏幕锁定（即图案、数字PIN码或密码），那么您必须在每次开机时解锁屏幕，才能将平板电脑解密。除此之外，唯一的解密方法就是恢复出厂设置，但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前，您必须先将电池充满电，并让平板电脑在整个加密过程中保持电源接通状态。如果加密过程出现中断，您将丢失部分或所有数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"您可以对自己的帐户、设置、下载的应用及其数据、媒体和其他文件进行加密。加密手机后，如果您设置了屏幕锁定（即图案、数字PIN码或密码），那么您必须在每次开机时解锁屏幕，才能将手机解密。除此之外，唯一的解密方法就是恢复出厂设置，但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前，您必须先将电池充满电，并让手机在整个加密过程中保持电源接通状态。如果加密过程出现中断，您将丢失部分或所有数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"您可以对自己的帐号、设置、下载的应用及其数据、媒体和其他文件进行加密。加密平板电脑后，如果您设置了屏幕锁定（即图案、数字PIN码或密码），那么您必须在每次开机时解锁屏幕，才能将平板电脑解密。除此之外，唯一的解密方法就是恢复出厂设置，但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前，您必须先将电池充满电，并让平板电脑在整个加密过程中保持电源接通状态。如果加密过程出现中断，您将丢失部分或所有数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"您可以对自己的帐号、设置、下载的应用及其数据、媒体和其他文件进行加密。加密手机后，如果您设置了屏幕锁定（即图案、数字PIN码或密码），那么您必须在每次开机时解锁屏幕，才能将手机解密。除此之外，唯一的解密方法就是恢复出厂设置，但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前，您必须先将电池充满电，并让手机在整个加密过程中保持电源接通状态。如果加密过程出现中断，您将丢失部分或所有数据。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电，然后重试。"</string>
@@ -393,11 +394,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告：如果解锁尝试再失败<xliff:g id="COUNT">^1</xliff:g>次，您的设备将被清空！"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到Google帐户的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。\n\n要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到Google帐户的所有数据恢复到手机中。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到Google帐号的所有数据恢复到平板电脑中。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。\n\n要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到Google帐号的所有数据恢复到手机中。"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"解密失败"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"您输入的密码正确无误，但遗憾的是，您的数据已损坏。\n\n要继续使用您的平板电脑，您需要将其恢复出厂设置。对恢复出厂设置后的平板电脑进行设置时，您可以恢复之前备份到 Google 帐户的任何数据。"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"您输入的密码正确无误，但遗憾的是，您的数据已损坏。\n\n要继续使用您的手机，您需要将其恢复出厂设置。对恢复出厂设置后的手机进行设置时，您可以恢复之前备份到 Google 帐户的任何数据。"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"您输入的密码正确无误，但遗憾的是，您的数据已损坏。\n\n要继续使用您的平板电脑，您需要将其恢复出厂设置。对恢复出厂设置后的平板电脑进行设置时，您可以恢复之前备份到 Google 帐号的任何数据。"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"您输入的密码正确无误，但遗憾的是，您的数据已损坏。\n\n要继续使用您的手机，您需要将其恢复出厂设置。对恢复出厂设置后的手机进行设置时，您可以恢复之前备份到 Google 帐号的任何数据。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切换输入法"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"选择屏幕锁定方式"</string>
@@ -810,13 +811,11 @@
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"手机插入基座或拔出时发出声音"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"平板电脑插入基座或拔出时不发出声音"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手机插入基座或拔出时不发出声音"</string>
-    <string name="account_settings" msgid="6403589284618783461">"帐户"</string>
-    <string name="category_personal" msgid="1299663247844969448">"个人"</string>
-    <string name="category_work" msgid="8699184680584175622">"工作"</string>
-    <string name="accessibility_category_work" msgid="4339262969083355720">"工作资料帐户 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="accessibility_category_personal" msgid="1263518850905945594">"个人资料帐户"</string>
-    <string name="accessibility_work_account_title" msgid="1231830766637939527">"工作帐户 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="accessibility_personal_account_title" msgid="2169071663029067826">"个人帐户 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="account_settings" msgid="6403589284618783461">"帐号"</string>
+    <string name="accessibility_category_work" msgid="4339262969083355720">"工作资料帐号 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_personal" msgid="1263518850905945594">"个人资料帐号"</string>
+    <string name="accessibility_work_account_title" msgid="1231830766637939527">"工作帐号 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_personal_account_title" msgid="2169071663029067826">"个人帐号 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
     <string name="display_settings" msgid="7965901687241669598">"显示"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"已停用"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"始终开启"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自动"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"转换为文件加密"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"转换…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"文件已加密"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"正在转换为文件加密"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"将数据分区转换为文件加密。\n！！警告！！此操作将会清除您所有的数据。\n此功能为 Alpha 版功能，可能无法正常运行。\n要继续操作，请按“清除并转换…”。"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"清除并转换…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"屏幕关闭"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -1109,9 +1114,9 @@
     <string name="reset_network_complete_toast" msgid="787829973559541880">"网络设置已重置"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"恢复设备出厂设置"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐户"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户：\n"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐号：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"此设备上目前还有其他用户。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
@@ -1347,7 +1352,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD卡存储设备"</string>
     <string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"要删除应用数据吗？"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"系统会永久删除此应用的所有数据。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"系统会永久删除此应用的所有数据。删除的内容包括所有文件、设置、帐号、数据库等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"确定"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"取消"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
     <string name="print_settings" msgid="4742428530112487843">"打印"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"打印服务"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文档可能会经由一个或多个服务器发送至打印机。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安装任何服务"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"找不到打印机"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"设置"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"全语音启动指令和互动"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"简单的语音转文字"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"此语音输入服务能够始终进行语音监测，并能替您控制所有支持语音功能的应用。该服务由“<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>”提供。要启用此服务吗？"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"文字转语音设置"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"文字转语音 (TTS) 输出"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"总是使用我的设置"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"使用以下默认设置代替应用设置"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"默认设置"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"默认引擎"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"设置用于文字转语音功能的语音合成引擎"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"语速"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字转换成语音后的播放速度"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"更改所播放的文字的音调"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"语言"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"使用系统语言"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未选择语言"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"设置文字转语音功能要使用的语言"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"收听示例"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"播放简短的语音合成示例"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"安装语音数据包"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"安装语音合成所需的数据包"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"语音合成所需的语音已安装妥当"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"设置已发生变化。这是声音效果示例。"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"您选择的引擎无法运行。"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"配置"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"选择其他引擎"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"此语音合成引擎能够收集语音中出现的所有信息，包括密码和信用卡号码之类的个人数据。此功能由 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 引擎提供。是否启用此语音合成引擎？"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"您必须连接到网络才能使用文字转语音功能输出这种语言。"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"这是语音合成示例"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"默认语言状态"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"完全支持<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"只有在连接到网络的情况下，才支持<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"不支持<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"正在检查…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>设置"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已启用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"未启用<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"引擎设置"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"“<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>”的设置"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"语言和语音"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"已安装"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"未安装"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"女声"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"男声"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"语音合成引擎已安装"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"启用新引擎后才能使用。"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"进行引擎设置"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"首选引擎"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"常规"</string>
     <string name="gadget_title" msgid="5519037532720577836">"电量控制"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新WLAN设置"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
@@ -1982,12 +1937,12 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"将应用数据、WLAN密码和其他设置备份到Google服务器"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"备份帐户"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"备份帐号"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"包括应用数据"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安装某个应用后，系统会还原已经备份的设置和数据"</string>
     <string name="backup_inactive_title" msgid="5355557151569037197">"备份服务未启用。"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前没有帐户存储备份数据"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前没有帐号存储备份数据"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
     <string name="local_backup_password_summary_none" msgid="6951095485537767956">"桌面完整备份当前未设置密码保护"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
@@ -2003,7 +1958,7 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"取消激活"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"设备管理器"</string>
     <string name="no_device_admins" msgid="702695100241728775">"没有可供显示的设备管理器"</string>
-    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"要禁止<xliff:g id="APP_NAME">%1$s</xliff:g>访问您的工作资料，请在“设置”&gt;“帐户”下移除相应资料"</string>
+    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"要禁止<xliff:g id="APP_NAME">%1$s</xliff:g>访问您的工作资料，请在“设置”&gt;“帐号”下移除相应资料"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"个人"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"工作"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"没有信任的代理"</string>
@@ -2055,7 +2010,7 @@
     <string name="sync_active" msgid="8476943765960863040">"正在同步"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"同步"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
-    <string name="add_account_label" msgid="7811707265834013767">"添加帐户"</string>
+    <string name="add_account_label" msgid="7811707265834013767">"添加帐号"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"工作资料尚不可用"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"移除工作资料"</string>
     <string name="background_data" msgid="5779592891375473817">"后台流量"</string>
@@ -2081,13 +2036,13 @@
     <string name="header_application_sync_settings" msgid="6205903695598000286">"应用同步设置"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"更改密码"</string>
-    <string name="header_account_settings" msgid="5382475087121880626">"帐户设置"</string>
-    <string name="remove_account_label" msgid="5921986026504804119">"移除帐户"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"添加帐户"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"帐号设置"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"移除帐号"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"添加帐号"</string>
     <string name="finish_button_label" msgid="481587707657751116">"完成"</string>
-    <string name="really_remove_account_title" msgid="8800653398717172460">"要移除帐户吗？"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"移除该帐户会从平板电脑中删除所有相关的邮件、联系人以及其他数据。"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"移除该帐户会从手机中删除所有相关的邮件、联系人以及其它数据。"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"要移除帐号吗？"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"移除该帐号会从平板电脑中删除所有相关的邮件、联系人以及其他数据。"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"移除该帐号会从手机中删除所有相关的邮件、联系人以及其它数据。"</string>
     <string name="remove_account_failed" msgid="6980737964448187854">"您的管理员不允许进行此更改。"</string>
     <string name="provider_label" msgid="7724593781904508866">"推送订阅"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2167,10 +2122,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"为后台应用显示“应用无响应”对话框"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"强制允许将应用写入外部存储设备"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"允许将任何应用写入外部存储设备（无论清单值是什么）"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"强制将活动设为可调整大小"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"将所有活动设为可配合多窗口环境调整大小（无论清单值是什么）。"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"流量使用情况"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"应用数据流量"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"运营商的流量计算方式可能与您设备的计算方式不同。"</string>
@@ -2194,8 +2147,8 @@
     <string name="data_usage_menu_cellular_networks" msgid="5243515735055652279">"移动网络"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"已暂停（达到数据流量上限）"</string>
     <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"自动同步数据"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"自动同步个人帐户数据"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"自动同步工作帐户数据"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"自动同步个人帐号数据"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"自动同步工作帐号数据"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"更改周期..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"流量周期设置："</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"没有任何应用在此期间产生过数据流量。"</string>
@@ -2227,10 +2180,10 @@
     <string name="data_usage_app_restrict_dialog" msgid="5871168521456832764">"只能连接到移动网络时，此功能可能会导致需要使用后台流量的应用无法正常运行。\n\n您可以在相关应用的设置中为其设定更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="1493134803720421674">"您需要先设置移动数据流量上限，然后才能限制后台流量。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"要打开自动同步数据功能吗？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在网络上对自己的帐户进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐户还可以将您在平板电脑上进行的所有更改自动同步到网络上。Google帐户就支持此类双向同步。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在网络上对自己的帐户进行的所有更改都会自动同步到您的手机。\n\n有些帐户还可以将您在手机上进行的所有更改自动同步到网络上。Google帐户就支持此类双向同步。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐号还可以将您在平板电脑上进行的所有更改自动同步到网络上。Google帐号就支持此类双向同步。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的手机。\n\n有些帐号还可以将您在手机上进行的所有更改自动同步到网络上。Google帐号就支持此类双向同步。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"要关闭自动同步数据功能吗？"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐户才能获得最新信息，并且在有更新时不会收到通知。"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐号才能获得最新信息，并且在有更新时不会收到通知。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"流量重置日期"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"日期："</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"确定"</string>
@@ -2275,7 +2228,7 @@
     <string name="vpn_routes" msgid="3818655448226312232">"转发路线（例如10.0.0.0/8）"</string>
     <string name="vpn_username" msgid="1863901629860867849">"用户名"</string>
     <string name="vpn_password" msgid="6756043647233596772">"密码"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"保存帐户信息"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"保存帐号信息"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"（未使用）"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"（不验证服务器）"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"（来自服务器）"</string>
@@ -2344,7 +2297,7 @@
     <string name="user_add_user_type_title" msgid="2146438670792322349">"添加"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"您最多可添加 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位用户"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"用户拥有个人专属的应用和内容"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"您可以限制其他人使用来自您的帐户的应用和内容"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"您可以限制其他人使用来自您的帐号的应用和内容"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"用户"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限个人资料"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"要添加新用户吗？"</string>
@@ -2357,7 +2310,7 @@
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"以后再说"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"只有平板电脑的机主可以管理用户。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"只有手机的机主可以管理用户。"</string>
-    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐户"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐号"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
     <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"允许在设备锁定时添加用户"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新用户"</string>
@@ -2416,7 +2369,7 @@
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改PIN码"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
     <string name="help_label" msgid="6886837949306318591">"帮助和反馈"</string>
-    <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"内容帐号"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"极端威胁"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"接收有关生命和财产极端威胁的警报"</string>
@@ -2442,8 +2395,8 @@
     <string name="user_rename" msgid="8523499513614655279">"重命名"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"设置应用限制"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受“<xliff:g id="APP">%1$s</xliff:g>”控制"</string>
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"此应用可使用您的帐户"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"此应用由“<xliff:g id="APP">%1$s</xliff:g>”控制，可使用您的帐户"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"此应用可使用您的帐号"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"此应用由“<xliff:g id="APP">%1$s</xliff:g>”控制，可使用您的帐号"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"WLAN和移动网络"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允许修改WLAN和移动网络设置"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"蓝牙"</string>
@@ -2531,7 +2484,7 @@
     <string name="keywords_app" msgid="6334757056536837791">"RAM 内存"</string>
     <string name="keywords_location" msgid="782326973714313480">"附近 位置信息 位置 记录 报告"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"精确度 准确度"</string>
-    <string name="keywords_accounts" msgid="1957925565953357627">"帐户"</string>
+    <string name="keywords_accounts" msgid="1957925565953357627">"帐号"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 文本 更正 声音 提示音 振动 自动 语言 手势 推荐 建议 主题 主题背景 令人反感的字词 输入 表情符号 国际 打字"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重置 偏好设置 默认"</string>
@@ -2562,6 +2515,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"仅限闹钟"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全阻止"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"视觉干扰"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"默认通知铃声"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"有来电时响铃并振动"</string>
@@ -2575,6 +2529,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"在设备锁定时，您希望通知如何显示？"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"主题通知"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"其他提示音"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"拨号键盘提示音"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"屏幕锁定提示音"</string>
@@ -2602,12 +2557,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部阻止"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"一律不显示来自此应用的通知"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"视为优先通知"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"当勿扰模式设为“仅限优先打扰”时，允许此应用的通知发出提示音"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"允许快速查看"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"允许此应用将特定通知暂时滑入当前屏幕，以突出显示这些通知"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆盖“请勿打扰”模式"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当“请勿打扰”模式设为“仅限优先打扰”时，允许这类通知继续打扰"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隐藏敏感内容"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"当设备锁定时，隐藏此应用通知中可能会泄露隐私信息的内容"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"当设备锁定时，隐藏这些可能会泄露隐私信息的通知内容"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"屏蔽"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"优先"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"敏感"</string>
@@ -2678,6 +2631,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"更改为仅限闹钟（到<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>）"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"更改为一律允许打扰"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"屏幕不受干扰"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"禁止在勿扰模式下被静音的通知在当前屏幕上短暂弹出或持续显示"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"停用通知指示灯"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"禁止在勿扰模式下被静音的通知让指示灯亮起"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
@@ -2690,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定屏幕前要求输入 PIN 码"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定屏幕前要求输入密码"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定屏幕时锁定设备"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"工作资料"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"此工作资料由以下应用管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（实验性）"</string>
@@ -2743,9 +2699,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"通知"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"常规"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"屏蔽"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"敏感内容已隐藏"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"优先级"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"不允许快速查看"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2767,16 +2720,12 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已屏蔽"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"优先"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"敏感内容已隐藏"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"不允许快速查看"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含网域网址"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已被管理员停用"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
     <string name="configure_apps" msgid="6685680790825882528">"配置应用"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"应用所需权限"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"应用访问授权"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已授予 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）其他权限"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授权 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"点按唤醒"</string>
@@ -2932,4 +2881,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"图片颜色模式"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"显示比例"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"显示 密度 缩放 比例 调整比例"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"正常"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"较大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"自定义 (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"查看全部"</string>
+    <string name="see_less" msgid="1250265310929558370">"隐藏部分"</string>
+    <string name="disconnected" msgid="5787956818111197212">"已断开连接"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g> 的数据"</string>
+    <string name="apps_summary" msgid="193158055537070092">"已安装 <xliff:g id="COUNT">%1$d</xliff:g> 个应用"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"已使用 <xliff:g id="SIZE1">%1$s</xliff:g>（共 <xliff:g id="SIZE2">%2$s</xliff:g>）"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"自动调节亮度功能已开启"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"自动调节亮度功能已关闭"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index c8d1cb8..8135870 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"最大"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"非常慢"</item>
-    <item msgid="2361722960903353554">"慢"</item>
-    <item msgid="1145554631248513562">"標準"</item>
-    <item msgid="7553665153391107454">"快"</item>
-    <item msgid="1370673569131070146">"較快"</item>
-    <item msgid="4648206845228970803">"很快"</item>
-    <item msgid="4977949754169483251">"急速"</item>
-    <item msgid="6106302964845503577">"極急速"</item>
-    <item msgid="6800277205640837264">"最快"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"非常低"</item>
-    <item msgid="2692137425242433765">"低"</item>
-    <item msgid="3332408460740717754">"標準"</item>
-    <item msgid="4907380534957572531">"高"</item>
-    <item msgid="4699640516390840297">"極高"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"掃瞄中…"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1c8360d..8788402 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"已由管理員停用"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"使用指紋"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手機插入底座或離開底座時，不要播放音效"</string>
     <string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人"</string>
-    <string name="category_work" msgid="8699184680584175622">"公司"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"工作設定檔帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人設定檔帳戶"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"工作帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"已停用"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"永遠開啟"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"轉換為檔案加密"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"轉換…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"已加密檔案"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"正在轉換為檔案式加密"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"轉換資料分區至檔案式加密。\n！警告！這會清除您的所有資料。\n 這是測試功能，可能未能正常運作。\n如要繼續，請按 [清除並轉換…] 。"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"清除並轉換…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1698,8 +1703,6 @@
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"列印服務"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文件可能會經由一個或以上的伺服器傳送至打印機。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"找不到打印機"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
@@ -1880,54 +1883,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"完全啟動字詞與互動"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"簡易語音轉文字"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"這項語音輸入服務由 <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> 提供，可隨時監控語言輸入，並代您控制具備語音操控功能的應用程式。您要啟用這項服務嗎？"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"文字轉語音設定"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"文字轉語音輸出"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"永遠使用我的設定"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"下列預設設定會覆寫應用程式設定"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"預設設定"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"預設引擎"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"設定朗讀功能用的語音合成引擎"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"語音速率"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字轉語音的播放速度"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"影響文字轉語音功能的播放音調"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"語言"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"使用系統語言"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未選取語言"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"設定朗讀文字所使用的語音語言"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"聆聽例子"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"播放簡短的語音合成例子"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"安裝語音資料"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"安裝語音合成所需的語音資料"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"語音合成所需的語音資料已正確安裝"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"設定已更改，請聆聽語音例子。"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"無法執行您選擇的引擎。"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"選擇另一個引擎"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"這個語音合成引擎可能會收集您輸入的所有語音，包括密碼和信用卡號等個人資料。這個引擎來自「<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>」引擎，是否要使用這個語音合成引擎？"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"您需要操作正常的網絡連線，才能使用文字轉語音功能輸出這種語言。"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"這是語音合成例子"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"預設語言狀態"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"全面支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>需要網絡連線"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"不支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"檢查中…"</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>設定"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已啟用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>已停用"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"引擎設定"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> 設定"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"語言及語音"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"已安裝"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"未安裝"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"女"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"男"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"語音合成引擎安裝完畢"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"請在使用前先啟用新引擎。"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"啟動引擎設定"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"首選引擎"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"一般設定"</string>
     <string name="gadget_title" msgid="5519037532720577836">"電源控制"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新 Wi-Fi 設定"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
@@ -2172,10 +2127,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"顯示背景應用程式的「應用程式無回應」對話框"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"強制允許應用程式寫入到外部儲存空間"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"允許將所有應用程式寫入到外部儲存完間 (所有資訊清單值)"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"強制可變更活動尺寸"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"在任何資訊清單值下，允許為多個視窗變更所有活動的尺寸。"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"流動網絡供應商的數據計算方式可能與裝置有所不同。"</string>
@@ -2567,6 +2520,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅限鬧鐘"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全靜音"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"視覺干擾"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
@@ -2580,6 +2534,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"當裝置鎖定時，您要如何顯示通知？"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"主題通知"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
@@ -2607,12 +2562,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"優先處理"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"允許這個應用程式的通知在「請勿騷擾」設定為「僅限優先」時發出"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"允許快速預覽"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"允許這個應用程式將部分通知短暫滑入目前畫面，以示強調"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"取代「請勿騷擾」"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「請勿騷擾」設定為「僅限優先」時，允許顯示這些通知"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隱藏敏感內容"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"當裝置鎖定時，隱藏這個應用程式可能透露個人資訊的通知內容"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"裝置上鎖時，隱藏可能會披露私人資料的通知內容"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"已封鎖"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"重要"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"敏感"</string>
@@ -2683,6 +2636,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"響 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>前改為只允許鬧鐘"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為永遠允許干擾"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"螢幕不受干擾"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"防止已啟用「請勿騷擾」的通知在目前的螢幕出現"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"停用通知燈"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"防止已啟用「請勿騷擾」的通知令通知燈閃爍"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
@@ -2695,7 +2652,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"公司檔案"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個工作設定檔由以下應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
@@ -2748,9 +2704,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"通知"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"正常"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"封鎖"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"已隱藏敏感內容"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"重要"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"沒有預覽"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2772,15 +2725,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"重要"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"已隱藏敏感內容"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"沒有預覽"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"使用網域網址"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已由管理員停用"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="configure_apps" msgid="6685680790825882528">"設定應用程式"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
     <string name="app_permissions" msgid="4148222031991883874">"應用程式權限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已允許 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式額外存取權 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已允許 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
@@ -2846,7 +2795,7 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示系統使用者介面調諧器"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 個"</string>
-    <string name="usb_use_charging_only" msgid="167707234832117768">"正在充電"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"只為此裝置充電"</string>
     <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
     <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他已連接的裝置充電"</string>
@@ -2937,4 +2886,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"相片顏色模式"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"顯示屏密度比例"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"顯示 密度 縮放 比例 按比例"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"正常"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"較大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"自訂 (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"顯示全部"</string>
+    <string name="see_less" msgid="1250265310929558370">"顯示較少"</string>
+    <string name="disconnected" msgid="5787956818111197212">"已中斷連線"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g> 數據"</string>
+    <string name="apps_summary" msgid="193158055537070092">"已安裝 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"已使用 <xliff:g id="SIZE1">%1$s</xliff:g> (共 <xliff:g id="SIZE2">%2$s</xliff:g>)"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"適應調節亮度功能已開啟"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"適應調節亮度功能已關閉"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index cf65af9..9686c9b 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"大"</item>
     <item msgid="7786168277516233536">"最大"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"非常慢"</item>
-    <item msgid="2361722960903353554">"慢"</item>
-    <item msgid="1145554631248513562">"適中"</item>
-    <item msgid="7553665153391107454">"快"</item>
-    <item msgid="1370673569131070146">"較快"</item>
-    <item msgid="4648206845228970803">"非常快"</item>
-    <item msgid="4977949754169483251">"快"</item>
-    <item msgid="6106302964845503577">"很快"</item>
-    <item msgid="6800277205640837264">"最快"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"非常低"</item>
-    <item msgid="2692137425242433765">"低"</item>
-    <item msgid="3332408460740717754">"適中"</item>
-    <item msgid="4907380534957572531">"高"</item>
-    <item msgid="4699640516390840297">"非常高"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"掃描中…"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 561c6d9..aa334ac 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"已由管理員停用"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"指紋辨識用途："</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手機插入底座或離開底座時，不要播放音效"</string>
     <string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人"</string>
-    <string name="category_work" msgid="8699184680584175622">"公司"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work 設定檔帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人設定檔帳戶"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work 帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"已停用"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"一律開啟"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"轉換成檔案加密"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"轉換..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"已將檔案加密"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"正在轉換成個別加密檔案"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"將資料分割區轉換成個別加密檔案。\n警告！這項操作會清除您的所有資料。\n這是 Alpha 版功能，可能無法正確運作。\n按下 [清除並轉換...] 即可繼續。"</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"清除並轉換..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -1697,8 +1702,6 @@
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"列印服務"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用「<xliff:g id="SERVICE">%1$s</xliff:g>」嗎？"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文件可能會透過一或多個伺服器輾轉傳送至印表機。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"找不到印表機"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
@@ -1824,7 +1827,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"節約耗電量"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"省電模式"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"電量為 %1$s 時"</string>
@@ -1879,54 +1882,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"全語音啟動字詞與互動服務"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"簡易語音轉文字"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"這項語音輸入服務由 <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> 應用程式提供，可隨時監控語音輸入，而且會替您管理所有支援語音功能的應用程式。要啟用這項服務嗎？"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"文字轉語音設定"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"文字轉語音輸出"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"永遠使用我的設定"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"下列預設設定會覆寫應用程式設定"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"預設設定"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"預設引擎"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"設定執行文字轉語音作業專用的語音合成引擎"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"語音速率"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"文字轉語音的播放速度"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"影響文字轉語音功能的播放音調"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"語言"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"使用系統設定"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未選取語言"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"設定文字轉語音功能要用的語言"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"聆聽範例"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"播放簡短的語音合成範例"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"安裝語音資料"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"安裝語音合成所需的語音資料"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"語音合成所需的語音資料已正確安裝"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"設定已變更，請聆聽語音範例。"</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"您選擇的引擎無法執行。"</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"選擇其他引擎"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"此語音合成引擎可能會收集您輸入的所有語音，包括密碼和信用卡號等個人資料。此引擎來自「<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>」引擎，是否要使用此語音合成引擎？"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"您必須連上網路才能使用文字轉語音輸出功能。"</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"您目前聽到的是我們的語音合成範例"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"預設語言狀態"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"完整支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"需要網路連線才支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"不支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"檢查中..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>設定"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已啟用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"已停用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"引擎設定"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> 設定"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"語言及語音"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"已安裝"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"未安裝"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"女性"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"男性"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"語音合成引擎安裝完畢"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"請先啟用新引擎再使用。"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"啟動引擎設定"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"偏好的引擎"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"一般"</string>
     <string name="gadget_title" msgid="5519037532720577836">"電源控制"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"更新 Wi-Fi 設定"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
@@ -2171,10 +2126,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"為背景應用程式顯示「應用程式無回應」對話方塊"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"強制允許將應用程式寫入外部儲存空間"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"允許將任何應用程式寫入外部儲存空間 (無論資訊清單值為何)"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"將活動強制設為可調整大小"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"將所有活動設為可配合多重視窗環境調整大小 (無論資訊清單值為何)。"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"行動通訊業者與裝置的數據計算方式可能有所不同。"</string>
@@ -2566,6 +2519,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅允許鬧鐘"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全靜音"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"視覺干擾"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
@@ -2579,14 +2533,15 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"當裝置鎖定時，您要如何顯示通知？"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"通知"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"主題通知"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"充電音效"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"固定音效"</string>
+    <string name="docking_sounds_title" msgid="155236288949940607">"座架插入音效"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"觸控音效"</string>
     <string name="vibrate_on_touch_title" msgid="674710566941697253">"觸控時震動"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"固定喇叭播放音效"</string>
+    <string name="dock_audio_media_title" msgid="1346838179626123900">"座架喇叭播放音效"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音訊"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"僅限媒體音訊"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
@@ -2606,12 +2561,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"永不顯示這個應用程式的通知"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"視為優先通知"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"當干擾模式設定為 [僅限優先通知] 時，讓這個應用程式的通知發出聲響"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"允許迅速瀏覽"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"允許這個應用程式將特定通知暫時滑入目前的畫面，藉此突顯這些通知"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆寫「零打擾」模式設定"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「零打擾」模式設定為「僅限優先通知」時，允許這些通知繼續干擾"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"隱藏機密內容"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"當裝置鎖定時，隱藏這個應用程式通知中可能涉及私人資訊的內容"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"當裝置鎖定時，隱藏這些可能揭露私人資訊的通知內容"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"已封鎖"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"優先"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"機密"</string>
@@ -2682,6 +2635,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"變更為僅允許鬧鐘模式，結束時間為 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為一律允許干擾模式"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"禁止畫面干擾"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"禁止「零打擾」模式設為靜音的通知在目前的畫面上短暫或持續顯示"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"禁止使用指示燈號"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"禁止「零打擾」模式設為靜音的通知使用指示燈號"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
@@ -2694,7 +2651,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"工作設定檔"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個 Work 設定檔是由下列應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由 <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> 管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
@@ -2747,9 +2703,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"通知"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"一般"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"封鎖"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"已隱藏敏感內容"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"優先"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"已停用迅速瀏覽"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2771,15 +2724,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"公司"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"優先"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"已隱藏敏感內容"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"已停用迅速瀏覽"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"包含網域網址"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"已由管理員停用"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="configure_apps" msgid="6685680790825882528">"設定應用程式"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
     <string name="app_permissions" msgid="4148222031991883874">"應用程式權限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已將額外存取權授予 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授權 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
@@ -2845,7 +2794,7 @@
     <string name="system_ui_settings" msgid="579824306467081123">"顯示 SystemUI 調整精靈"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 項"</string>
-    <string name="usb_use_charging_only" msgid="167707234832117768">"充電中"</string>
+    <string name="usb_use_charging_only" msgid="167707234832117768">"充電"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"僅為這個裝置充電"</string>
     <string name="usb_use_power_only" msgid="6304554004177083963">"電源"</string>
     <string name="usb_use_power_only_desc" msgid="708134382305728112">"為其他連接的裝置充電"</string>
@@ -2936,4 +2885,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"螢幕色彩模式"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"顯示比例"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"顯示 密度 縮放 比例 調整比例"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"適中"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"較大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"自訂 (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"全部顯示"</string>
+    <string name="see_less" msgid="1250265310929558370">"顯示較少"</string>
+    <string name="disconnected" msgid="5787956818111197212">"已中斷連線"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g> 的數據用量"</string>
+    <string name="apps_summary" msgid="193158055537070092">"已安裝 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"已使用 <xliff:g id="SIZE1">%1$s</xliff:g>，共 <xliff:g id="SIZE2">%2$s</xliff:g>"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"自動調整亮度功能已開啟"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"自動調整亮度功能已關閉"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 62e2349..3802690 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -65,24 +65,6 @@
     <item msgid="38373998008112077">"Okukhulu"</item>
     <item msgid="7786168277516233536">"Nkulu kakhulu"</item>
   </string-array>
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Phansi kakhulu"</item>
-    <item msgid="2361722960903353554">"Phansi"</item>
-    <item msgid="1145554631248513562">"Jwayelekile"</item>
-    <item msgid="7553665153391107454">"Sheshayo"</item>
-    <item msgid="1370673569131070146">"Ngokushesha"</item>
-    <item msgid="4648206845228970803">"Kushesha kakhulu"</item>
-    <item msgid="4977949754169483251">"Esheshisayo"</item>
-    <item msgid="6106302964845503577">"Esheshisa kakhulu"</item>
-    <item msgid="6800277205640837264">"Esheshisa kakhulukhulu"</item>
-  </string-array>
-  <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"Phansi kakhulu"</item>
-    <item msgid="2692137425242433765">"Phansi"</item>
-    <item msgid="3332408460740717754">"Jwayelekile"</item>
-    <item msgid="4907380534957572531">"Phezulu"</item>
-    <item msgid="4699640516390840297">"Phezulu kakhulu"</item>
-  </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Iyathwebula..."</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0d917e7..7c24695 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -313,6 +313,7 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Amaphasiwedi"</string>
+    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Ikhutshazwe umlawuli"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Izigxivizo zeminwe"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Phatha izigxivizo zeminwe"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sebenzisa izigxivizo zeminwe ukuthi"</string>
@@ -811,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
     <string name="account_settings" msgid="6403589284618783461">"Ama-akhawunti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Okomuntu siqu"</string>
-    <string name="category_work" msgid="8699184680584175622">"Umsebenzi"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Ama-akhawunti wephrofayela yomsebenzi - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Ama-akhawunti wephrofayela yomuntu siqu"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"I-akhawunti yomsebenzi - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +834,12 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Kukhutshaziwe"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Njalo ivuliwe"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Okuzenzakalelayo"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Phendulisela ekubethelweni kwefayela"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Iyaphendulela..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sekuvele kubethelwe ngefayela"</string>
+    <string name="title_convert_fbe" msgid="1263622876196444453">"Ukuphendulela kuya ekubethelweni okususelwe kwifayela"</string>
+    <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Phendulela kwehlukaniswa kwedatha kuya ekubethelweni okususelwe kufayela.\n !!Isexwayiso!! Lokhu kuzosula yonke idatha yakho.\n Lesi sici siyi-alpha, futhi singahle singasebenzi kahle.\n Cindezela okuthi \'Sula futhi uphendulele...\' ukuze uqhubeke."</string>
+    <string name="button_convert_fbe" msgid="5152671181309826405">"Sula futhi uphendulele..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -1704,8 +1709,6 @@
     <string name="settings_button" msgid="3006713718908152930">"Izilungiselelo"</string>
     <string name="print_settings" msgid="4742428530112487843">"Ukuphrinta"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Amasevisi wokuphrinta"</string>
-    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Idokhumenti yakho ingase idlule iseva eyodwa noma amaningi lapho iya kuphrinta."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Awekho amasevisi afakiwe"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Awekho amaphrinta atholiwe"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Izilungiselelo"</string>
@@ -1886,54 +1889,6 @@
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"I-hotword ephelele nokusebenzisana"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Inkulumo elula eya embhalweni"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Le sevisi yokufaka yezwi izokwazi ukwenza ukwengamela okuhlala kuvuliwe kwezwi nokulawula izinhlelo zokusebenza ezinikwe amandla ukulawula izwi engxenyeni yakho. Ivela kuhlelo lokusebenza le <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Nika amandla ukusetshenziswa kwale sevisi?"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Izilungiselelo zombhalo-kuya-kunkulumo"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Umbhalo-uya-kokukhishwa ngokukhuluma"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Sebenzisa njalo izilungiselelo zami"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Izilungiselelo ezizenzakalelayo ngenzansi kwezilungiselelo zohlelo lokusebenza"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Izilungiselelo ezizenzakalalelayo"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Okuzenzekelayo kwenjini"</string>
-    <string name="tts_default_synth_summary" msgid="7326298606388069173">"Setha ukuhlelwa kwemiqondo kwenjini yengxoxo okumele isetshenziselwe umbhalo okhulunyiwe"</string>
-    <string name="tts_default_rate_title" msgid="6030550998379310088">"Ukukala izwi"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Isivinini leso umbhalo okhulunywe ngaso"</string>
-    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ukuphakama"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ithinta ithoni yombhalo okhulunyiwe"</string>
-    <string name="tts_default_lang_title" msgid="8018087612299820556">"Ulimi"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Sebenzisa ulimi lwesistimu"</string>
-    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Ulimi alukhethwanga"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ihlela izwi lolimi oluthize lombhalo okhulunyiwe"</string>
-    <string name="tts_play_example_title" msgid="7094780383253097230">"Lalela isibonelo"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Dlala umboniso omfushane wamazwi"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Faka idatha yezwi"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Faka idatha yezwi edingekayo yamazwi ngamanye"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Amazwi adingekayo ezwi kakade afakwe kahle"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Izilungiselelo zakho zishintshile. Lesi isibonelo sokuthi zizwakala kanjani."</string>
-    <string name="tts_engine_error" msgid="6336134545728152761">"Injini oyikhethile ayikwazi ukusebenza."</string>
-    <string name="tts_engine_error_config" msgid="5820525416624637313">"Misa"</string>
-    <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Khetha enye injini"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lenjini yokuqaphela amagama ingase ikwazi ukuqoqa wonke umbhalo ozokhulunywa, kuhlanganise idatha yomuntu siqu njengamaphasiwedi nezinombolo zekhadi lesikoloto. Iphuma <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> kwinjini. Vumela ukusebenzisa lenjini yokuqaphela amagama?"</string>
-    <string name="tts_engine_network_required" msgid="1190837151485314743">"Lolu limi ludinga ukuxhumana okusebenzayo kwenethiwekhi ekukhishweni kokuthunyelwe njengombhalo kunkulumo."</string>
-    <string name="tts_default_sample_string" msgid="4040835213373086322">"Lesi isibonelo sezwi"</string>
-    <string name="tts_status_title" msgid="7268566550242584413">"Isimo solimi oluzenzakalelayo"</string>
-    <string name="tts_status_ok" msgid="1309762510278029765">"I-<xliff:g id="LOCALE">%1$s</xliff:g> isekelwe ngokugcwele"</string>
-    <string name="tts_status_requires_network" msgid="6042500821503226892">"I-<xliff:g id="LOCALE">%1$s</xliff:g> idinga ukuxhumeka kwenethiwekhi"</string>
-    <string name="tts_status_not_supported" msgid="4491154212762472495">"I-<xliff:g id="LOCALE">%1$s</xliff:g> ayisekelwe"</string>
-    <string name="tts_status_checking" msgid="4983413982985913047">"Iyahlola..."</string>
-    <string name="tts_engines_section" msgid="7515470972378742429">"Izinjini"</string>
-    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> izilungiselelo"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ivunyelwe"</string>
-    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> kuvimbelwe"</string>
-    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Izilungiselelo zenjini"</string>
-    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Izilungiselelo ze-<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Izilimi namazwi"</string>
-    <string name="pico_installed" msgid="2452546687858267414">"Kufakiwe"</string>
-    <string name="pico_not_installed" msgid="6266845418419994311">"Akufakiwe"</string>
-    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Owesifazane"</string>
-    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Owesilisa"</string>
-    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Injini yokuqaphela amagama ifakiwe"</string>
-    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Vumela injini entsha ngaphambi kokusebenzisa"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"Faka izilungiselelo zenjini"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Injini eyintandokazi"</string>
-    <string name="tts_general_section_title" msgid="4402572014604490502">"Okuvamile"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Ukulawula Amandla"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ibuyekeza isilungiselelo se-Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ibuyekeza ilungiselelo le-Bluetooth"</string>
@@ -2174,10 +2129,8 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Boniso idayalogi Yohlelo Lokusebenza Olungasabeli kwizinhlelo zokusebenza zasemuva"</string>
     <string name="force_allow_on_external" msgid="3215759785081916381">"Phoqelela ukuvumela izinhlelo zokusebenza ngaphandle"</string>
     <string name="force_allow_on_external_summary" msgid="3191952505860343233">"Yenza noma uluphi uhlelo lokusebenza lifaneleke ukuthi libhalwe kusitoreji sangaphandle, ngaphandle kwamavelu we-manifest"</string>
-    <!-- no translation found for force_resizable_activities (8615764378147824985) -->
-    <skip />
-    <!-- no translation found for force_resizable_activities_summary (4508217476997182216) -->
-    <skip />
+    <string name="force_resizable_activities" msgid="8615764378147824985">"Imisebenzi yamandla izonikezwa usayizi omusha"</string>
+    <string name="force_resizable_activities_summary" msgid="4508217476997182216">"Yenza yonke imisebenzi ibe nosayizi abasha kuwindi lokuningi, ngokunganaki amanani we-manifest."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ukusebenzisa idatha"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
@@ -2569,6 +2522,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ama-alamu kuphela"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Ukuthula okuphelele"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="168576844124787420">"Ukuphazamiso kokubona"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Ithoni yokukhala yezaziso ezenzakalelayo"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Iyadlidliza uma kungena amakholi"</string>
@@ -2582,6 +2536,7 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Uma idivayisi yakho ikhiyiwe, ufuna ukuthi izaziso zivele kanjani?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Izaziso"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
+    <string name="topic_notifications_title" msgid="7243623930984080881">"Izaziso zesihloko"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Eminye imisindo"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Amathoni wephedi yokudayela"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Imisindo yokukhiya isikrini"</string>
@@ -2609,12 +2564,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Ungalokothi ubonise izaziso kusuka kulolu hlelo lokusebenza"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Phatha njengokubalulekile"</string>
-    <string name="app_notification_priority_summary" msgid="2538018111338754446">"Vumela izaziso zalolu hlelo lokusebenza ukuthi zizwiwe uma  ukungaphazamisi kusethelwe kokubalulekile kuphela"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Vumela ukukoba"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Vumela lolu hlelo lokusebenza lugcizelele izaziso ezithile ngokuzislayida kafushane ekubukweni kwesikrini samanje"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bhala ngaphezulu okuthi ungaphazamisi"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Vumela lezi zaziso ziqhubeke nokuphazamisa uma okuthi ungaphazamisi kusethelwe okuphezulu kuphela"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Fihla okuqukethwe okubucayi"</string>
-    <string name="app_notification_sensitive_summary" msgid="3263836642625157920">"Uma idivayisi ikhiyiwe, fihla okuqukethwe kuzaziso zalolu hlelo lokusebenza okungaveza ulwazi oluyimfihlo"</string>
+    <string name="app_notification_sensitive_summary" msgid="2515056180303710894">"Uma idivayisi ikhiyiwe, fihla okuqukethwe kulezi zaziso ezingabonisa ulwazi oluyimfihlo"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Ivinjelwe"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Okubalulekile"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ukuzwela"</string>
@@ -2685,6 +2638,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Guqulela kuma-alamu kuphela kuze kube ngumhla ka-<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Guqulela kuhlala uphazamisa"</string>
+    <string name="zen_mode_peek" msgid="1468557671879175931">"Akukho ukuphazamiseka kwesikrini"</string>
+    <string name="zen_mode_peek_summary" msgid="27622220787132681">"Gwema izaziso ezithuliswe ukungaphazamisi kusuka ekukhetheni noma ekubonakaleni esikrinini samanje"</string>
+    <string name="zen_mode_lights" msgid="904184586121619154">"Asikho isibani sesaziso"</string>
+    <string name="zen_mode_lights_summary" msgid="6953305086643633530">"Gwema izaziso ezithuliswe ukungaphazamisi kusuka ekubangeleni isibani ukuthi sishaye"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
@@ -2697,7 +2654,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Cela iphinikhodi ngaphambi kokuphina"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Cela iphasiwedi ngaphambi kokususa ukuphina"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Khiya idivayisi uma ususa ukuphina"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Iphrofayela yomsebenzi"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Le phrofayela yomsebenzi iphethwe ngu:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Iphethwe ngu-<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Ukuhlola)"</string>
@@ -2750,9 +2706,6 @@
     <string name="notifications_label" msgid="2872668710589600731">"Izaziso"</string>
     <string name="notifications_enabled" msgid="4386196629684749507">"Okujwayelekile"</string>
     <string name="notifications_disabled" msgid="4326096527874762629">"Vimba"</string>
-    <string name="notifications_sensitive" msgid="7636231039287237132">"Okuqukethwe okuzwelayo kufihliwe"</string>
-    <string name="notifications_priority" msgid="1812498477331421719">"Okubalulekile"</string>
-    <string name="notifications_no_peeking" msgid="999951669023262823">"Akukho ukukoba"</string>
     <string name="notifications_two_items" msgid="4619842959192163127">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g>"</string>
     <string name="notifications_three_items" msgid="7536490263864218246">"<xliff:g id="NOTIF_STATE_0">%1$s</xliff:g> / <xliff:g id="NOTIF_STATE_1">%2$s</xliff:g> / <xliff:g id="NOTIF_STATE_2">%3$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
@@ -2774,15 +2727,11 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Okomuntu siqu"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Umsebenzi"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Uvinjelwe"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Okubalulekile"</string>
-    <string name="filter_notif_sensitive_apps" msgid="4909289478844197927">"Okuqukethwe okuzwelayo kufihliwe"</string>
-    <string name="filter_notif_no_peeking" msgid="5197968265625096563">"Akukho ukukoba"</string>
     <string name="filter_with_domain_urls_apps" msgid="4573276638806792792">"Nama-URL wesizinda"</string>
     <string name="trust_agent_disabled_device_admin" msgid="5982562414642596563">"Ikhutshazwe ngumlawuli"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Lungisa izinhlelo zokusebenza"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Khetha iphrofayela"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Izimvume zohlelo lokusebenza"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe ekufinyeleleni okungeziwe"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe"</string>
@@ -2939,4 +2888,20 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Imodi yombala wesithombe"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Sebenzisa i-sRGB"</string>
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Isikala sokubonisa"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"bonisa isikala sokusondeza esiminyene"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kuncane"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Okujwayelekile"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Okukhulu"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Nkulu kakhulu"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Okukhulu"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Ngokwezifiso (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
+    <string name="see_all" msgid="8883901630052886984">"Buka konke"</string>
+    <string name="see_less" msgid="1250265310929558370">"Buka okuncane"</string>
+    <string name="disconnected" msgid="5787956818111197212">"Inqamukile"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> wedatha esetshenzisiwe"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> izinhlelo zokusebenza ezifakiwe"</string>
+    <string name="storage_summary" msgid="1110250618334248745">"<xliff:g id="SIZE1">%1$s</xliff:g> kokungu-<xliff:g id="SIZE2">%2$s</xliff:g> okusetshenzisiwe"</string>
+    <string name="display_summary_on" msgid="5628868543070268634">"Ukukhanya okujwayelayo kuvuliwe"</string>
+    <string name="display_summary_off" msgid="6399558022426312990">"Ukukhanya okujwayelayo kuvaliwe"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index e5f1988..12a0172 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -150,69 +150,6 @@
         <item>1.30</item>
     </string-array>
 
-    <!-- TTS settings -->
-
-    <!-- Default speech rate choices -->
-    <string-array name="tts_rate_entries">
-        <item>Very slow</item>
-        <item>Slow</item>
-        <item>Normal</item>
-        <item>Fast</item>
-        <item>Faster</item>
-        <item>Very fast</item>
-        <item>Rapid</item>
-        <item>Very rapid</item>
-        <item>Fastest</item>
-    </string-array>
-    <!-- Do not translate. -->
-    <string-array name="tts_rate_values">
-        <item>60</item>
-        <item>80</item>
-        <item>100</item>
-        <item>150</item>
-        <item>200</item>
-        <item>250</item>
-        <item>300</item>
-        <item>350</item>
-        <item>400</item>
-    </string-array>
-
-    <!-- Default pitch choices -->
-    <string-array name="tts_pitch_entries">
-        <item>Very low</item>
-        <item>Low</item>
-        <item>Normal</item>
-        <item>High</item>
-        <item>Very high</item>
-    </string-array>
-    <!-- Do not translate. -->
-    <string-array name="tts_pitch_values">
-        <item>50</item>
-        <item>80</item>
-        <item>100</item>
-        <item>120</item>
-        <item>150</item>
-    </string-array>
-
-    <!-- Do not translate. -->
-    <string-array name="tts_demo_strings" translatable="false">
-        <item>This is an example of speech synthesis in English.</item>
-        <item>Voici un échantillon de synthèse vocale en français.</item>
-        <item>Dies ist ein Beispiel für Sprachsynthese in Deutsch.</item>
-        <item>Questo è un esempio di sintesi vocale in italiano.</item>
-        <item>Este es un ejemplo de síntesis de voz en español.</item>
-        <item>이것은 한국어 음성 합성의 예입니다.</item>
-    </string-array>
-    <string-array name="tts_demo_string_langs" translatable="false">
-        <item>eng</item>
-        <item>fra</item>
-        <item>deu</item>
-        <item>ita</item>
-        <item>spa</item>
-        <item>kor</item>
-    </string-array>
-
-
     <!-- Wi-Fi settings -->
 
     <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip />
@@ -683,11 +620,25 @@
         <item>monitor high power location</item>
         <item>get usage stats</item>
         <item>mute/unmute microphone</item>
+        <item>show toast</item>
         <item>project media</item>
         <item>activate VPN</item>
         <item>write wallpaper</item>
         <item>assist structure</item>
         <item>assist screenshot</item>
+        <item>read phone state</item>
+        <item>add voicemail</item>
+        <item>use sip</item>
+        <item>process outgoing call</item>
+        <item>fingerprint</item>
+        <item>body sensors</item>
+        <item>read cell broadcasts</item>
+        <item>mock location</item>
+        <item>read storage</item>
+        <item>write storage</item>
+        <item>turn on screen</item>
+        <item>get accounts</item>
+        <item>run in background</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -737,11 +688,25 @@
         <item>Location</item>
         <item>Get usage stats</item>
         <item>Mute/unmute microphone</item>
+        <item>Show toast</item>
         <item>Project media</item>
         <item>Activate VPN</item>
         <item>Write wallpaper</item>
         <item>Assist structure</item>
         <item>Assist screenshot</item>
+        <item>Read phone state</item>
+        <item>Add voicemail</item>
+        <item>Use sip</item>
+        <item>Process outgoing call</item>
+        <item>Fingerprint</item>
+        <item>Body sensors</item>
+        <item>Read cell broadcasts</item>
+        <item>Mock location</item>
+        <item>Read storage</item>
+        <item>Write storage</item>
+        <item>Turn on screen</item>
+        <item>Get accounts</item>
+        <item>Run in background</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
@@ -943,237 +908,6 @@
         <item>-1</item>
     </integer-array>
 
-    <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
-    <string-array name="select_logd_size_titles">
-        <item>64K</item>
-        <item>256K</item>
-        <item>1M</item>
-        <item>4M</item>
-        <item>16M</item>
-    </string-array>
-
-    <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
-    <string-array name="select_logd_size_lowram_titles">
-        <item>64K</item>
-        <item>256K</item>
-        <item>1M</item>
-    </string-array>
-
-    <!-- Values for logd limit size selection preference. -->
-    <string-array name="select_logd_size_values" translatable="false" >
-        <item>65536</item>
-        <item>262144</item>
-        <item>1048576</item>
-        <item>4194304</item>
-        <item>16777216</item>
-    </string-array>
-
-    <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
-    <string-array name="select_logd_size_summaries" >
-        <item>64K per log buffer</item>
-        <item>256K per log buffer</item>
-        <item>1M per log buffer</item>
-        <item>4M per log buffer</item>
-        <item>16M per log buffer</item>
-    </string-array>
-
-    <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
-    <string-array name="hdcp_checking_titles">
-        <item>Never check</item>
-        <item>Check for DRM content only</item>
-        <item>Always check</item>
-    </string-array>
-
-    <!-- Values for HDCP checking preference. -->
-    <string-array name="hdcp_checking_values" translatable="false" >
-        <item>never</item>
-        <item>drm-only</item>
-        <item>always</item>
-    </string-array>
-
-    <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
-    <string-array name="hdcp_checking_summaries" >
-        <item>Never use HDCP checking</item>
-        <item>Use HDCP checking for DRM content only</item>
-        <item>Always use HDCP checking</item>
-    </string-array>
-
-    <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
-    <string-array name="window_animation_scale_entries">
-        <item>Animation off</item>
-        <item>Animation scale .5x</item>
-        <item>Animation scale 1x</item>
-        <item>Animation scale 1.5x</item>
-        <item>Animation scale 2x</item>
-        <item>Animation scale 5x</item>
-        <item>Animation scale 10x</item>
-    </string-array>
-
-    <!-- Values for window animation scale preference. -->
-    <string-array name="window_animation_scale_values" translatable="false" >
-        <item>0</item>
-        <item>.5</item>
-        <item>1</item>
-        <item>1.5</item>
-        <item>2</item>
-        <item>5</item>
-        <item>10</item>
-    </string-array>
-
-    <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
-    <string-array name="transition_animation_scale_entries">
-        <item>Animation off</item>
-        <item>Animation scale .5x</item>
-        <item>Animation scale 1x</item>
-        <item>Animation scale 1.5x</item>
-        <item>Animation scale 2x</item>
-        <item>Animation scale 5x</item>
-        <item>Animation scale 10x</item>
-    </string-array>
-
-    <!-- Values for transition animation scale preference. -->
-    <string-array name="transition_animation_scale_values" translatable="false" >
-        <item>0</item>
-        <item>.5</item>
-        <item>1</item>
-        <item>1.5</item>
-        <item>2</item>
-        <item>5</item>
-        <item>10</item>
-    </string-array>
-
-    <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
-    <string-array name="animator_duration_scale_entries">
-        <item>Animation off</item>
-        <item>Animation scale .5x</item>
-        <item>Animation scale 1x</item>
-        <item>Animation scale 1.5x</item>
-        <item>Animation scale 2x</item>
-        <item>Animation scale 5x</item>
-        <item>Animation scale 10x</item>
-    </string-array>
-
-    <!-- Values for animator duration scale preference. -->
-    <string-array name="animator_duration_scale_values" translatable="false" >
-        <item>0</item>
-        <item>.5</item>
-        <item>1</item>
-        <item>1.5</item>
-        <item>2</item>
-        <item>5</item>
-        <item>10</item>
-    </string-array>
-
-    <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
-    <string-array name="overlay_display_devices_entries">
-        <item>None</item>
-        <item>480p</item>
-        <item>480p (secure)</item>
-        <item>720p</item>
-        <item>720p (secure)</item>
-        <item>1080p</item>
-        <item>1080p (secure)</item>
-        <item>4K</item>
-        <item>4K (secure)</item>
-        <item>4K (upscaled)</item>
-        <item>4K (upscaled, secure)</item>
-        <item>720p, 1080p (dual screen)</item>
-    </string-array>
-
-    <!-- Values for overlay display devices preference. -->
-    <string-array name="overlay_display_devices_values" translatable="false" >
-        <item></item>
-        <item>720x480/142</item>
-        <item>720x480/142,secure</item>
-        <item>1280x720/213</item>
-        <item>1280x720/213,secure</item>
-        <item>1920x1080/320</item>
-        <item>1920x1080/320,secure</item>
-        <item>3840x2160/320</item>
-        <item>3840x2160/320,secure</item>
-        <item>1920x1080/320|3840x2160/640</item>
-        <item>1920x1080/320|3840x2160/640,secure</item>
-        <item>1280x720/213;1920x1080/320</item>
-    </string-array>
-
-    <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
-    <string-array name="enable_opengl_traces_entries">
-        <item>None</item>
-        <item>Logcat</item>
-        <item>Systrace (Graphics)</item>
-        <item>Call stack on glGetError</item>
-    </string-array>
-
-    <!-- Values for OpenGL traces preference. -->
-    <string-array name="enable_opengl_traces_values" translatable="false" >
-        <item>0</item>
-        <item>1</item>
-        <item>systrace</item>
-        <item>error</item>
-    </string-array>
-
-    <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
-    <string-array name="show_non_rect_clip_entries">
-        <item>Off</item>
-        <item>Draw non-rectangular clip region in blue</item>
-        <item>Highlight tested drawing commands in green</item>
-    </string-array>
-
-    <!-- Values for non-rectangular clipping preference. -->
-    <string-array name="show_non_rect_clip_values" translatable="false" >
-        <item>hide</item>
-        <item>region</item>
-        <item>highlight</item>
-    </string-array>
-
-    <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
-    <string-array name="track_frame_time_entries">
-        <item>Off</item>
-        <item>On screen as bars</item>
-        <item>In adb shell dumpsys gfxinfo</item>
-    </string-array>
-
-    <!-- Values for frame time tracking preference. -->
-    <string-array name="track_frame_time_values" translatable="false" >
-        <item>false</item>
-        <item>visual_bars</item>
-        <item>true</item>
-    </string-array>
-
-    <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
-    <string-array name="debug_hw_overdraw_entries">
-        <item>Off</item>
-        <item>Show overdraw areas</item>
-        <item>Show areas for Deuteranomaly</item>
-    </string-array>
-
-    <!-- Values for debug overdraw preference. -->
-    <string-array name="debug_hw_overdraw_values" translatable="false" >
-        <item>false</item>
-        <item>show</item>
-        <item>show_deuteranomaly</item>
-    </string-array>
-
-    <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
-    <string-array name="app_process_limit_entries">
-        <item>Standard limit</item>
-        <item>No background processes</item>
-        <item>At most 1 process</item>
-        <item>At most 2 processes</item>
-        <item>At most 3 processes</item>
-        <item>At most 4 processes</item>
-    </string-array>
-
-    <!-- Values for app process limit preference. -->
-    <string-array name="app_process_limit_values" translatable="false" >
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-
     <!-- Match this with the constants in VpnProfile. --> <skip />
     <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
     <string-array name="vpn_types" translatable="false">
@@ -1276,24 +1010,6 @@
         <item>13</item>
     </string-array>
 
-    <!-- Display color space adjustment modes for developers -->
-    <string-array name="simulate_color_space_entries" translatable="false">
-        <item>@string/daltonizer_mode_disabled</item>
-        <item>@string/daltonizer_mode_monochromacy</item>
-        <item>@string/daltonizer_mode_deuteranomaly</item>
-        <item>@string/daltonizer_mode_protanomaly</item>
-        <item>@string/daltonizer_mode_tritanomaly</item>
-    </string-array>
-
-    <!-- Values for display color space adjustment modes for developers -->
-    <string-array name="simulate_color_space_values" translatable="false">
-        <item>-1</item>
-        <item>0</item>
-        <item>2</item>
-        <item>1</item>
-        <item>3</item>
-    </string-array>
-
     <!-- Battery saver mode: allowable trigger threshold levels. -->
     <integer-array name="battery_saver_trigger_values" translatable="false" >
         <item>0</item>
@@ -1337,56 +1053,4 @@
         <item>Red</item>
     </string-array>
 
-    <!-- USB configuration names for Developer Settings.
-         This can be overridden by devices with additional USB configurations. -->
-    <string-array name="usb_configuration_titles">
-        <item>@string/usb_use_charging_only</item>
-        <item>MTP (Media Transfer Protocol)</item>
-        <item>PTP (Picture Transfer Protocol)</item>
-        <item>RNDIS (USB Ethernet)</item>
-        <item>Audio Source</item>
-        <item>MIDI</item>
-    </string-array>
-
-    <!-- USB configuration values for Developer Settings.
-         These are lists of USB functions passed to the USB Manager to change USB configuraton.
-         This can be overridden by devices with additional USB configurations.
-         Do not translate. -->
-    <string-array name="usb_configuration_values" translatable="false">
-        <!-- Do not translate. -->
-        <item>none</item>
-        <!-- Do not translate. -->
-        <item>mtp</item>
-        <!-- Do not translate. -->
-        <item>ptp</item>
-        <!-- Do not translate. -->
-        <item>rndis</item>
-        <!-- Do not translate. -->
-        <item>audio_source</item>
-        <!-- Do not translate. -->
-        <item>midi</item>
-    </string-array>
-
-    <!-- Possible values for user theme in Display Settings.
-         Do not translate. -->
-    <string-array name="night_mode_entries" translatable="false">
-        <!-- Do not translate. -->
-        <item>@string/night_mode_no</item>
-        <!-- Do not translate. -->
-        <item>@string/night_mode_yes</item>
-        <!-- Do not translate. -->
-        <item>@string/night_mode_auto</item>
-    </string-array>
-
-    <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
-         Do not translate. -->
-    <string-array name="night_mode_values" translatable="false">
-        <!-- Do not translate. -->
-        <item>1</item>
-        <!-- Do not translate. -->
-        <item>2</item>
-        <!-- Do not translate. -->
-        <item>0</item>
-    </string-array>
-
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 090cbc3..dc0b186 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -193,11 +193,6 @@
 
     <!-- Height of a user icon view -->
     <dimen name="user_icon_view_height">56dp</dimen>
-    <!-- User spinner -->
-    <dimen name="user_spinner_height">72dp</dimen>
-    <dimen name="user_spinner_padding">4dp</dimen>
-    <dimen name="user_spinner_padding_sides">20dp</dimen>
-    <dimen name="user_spinner_item_height">56dp</dimen>
 
     <!-- CheckBoxPreference -->
     <dimen name="checkbox_widget_min_width">58dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9c314c3..f0955a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -403,7 +403,7 @@
     <string name="radio_info_data_attempts_label">Data attempts:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
 
-    <string name="radio_info_gprs_service_label">GPRS service:</string>
+    <string name="radio_info_gprs_service_label">Data Technology:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_roaming_label">Roaming:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -421,7 +421,7 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_ppp_received_label">PPP received:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_gsm_service_label">GSM service:</string>
+    <string name="radio_info_gsm_service_label">Voice Technology:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_signal_strength_label">Signal strength:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -441,9 +441,9 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_set_perferred_label">Set preferred network type:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_ping_ipaddr">Ping IpAddr:</string>
+    <string name="radio_info_ping_hostname_v4">Ping Hostname(www.google.com) IPv4:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_ping_hostname">Ping Hostname(www.google.com):</string>
+    <string name="radio_info_ping_hostname_v6">Ping Hostname(www.google.com) IPv6:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_http_client_test">HTTP Client test:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -690,6 +690,8 @@
     <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
     <!-- In the security screen, the header title for settings related to  Passwords-->
     <string name="security_passwords_title">Passwords</string>
+    <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->
+    <string name="disabled_by_administrator_summary">Disabled by administrator</string>
 
     <!-- Fingerprint enrollment and settings --><skip />
     <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
@@ -1484,6 +1486,8 @@
     <string name="wifi_menu_scan">Scan</string>
     <!-- Menu option to Wi-Fi advanced settings -->
     <string name="wifi_menu_advanced">Advanced</string>
+    <!-- Menu option to Wi-Fi configure settings -->
+    <string name="wifi_menu_configure">Configure</string>
     <!-- Menu option to connect to a Wi-Fi network -->
     <string name="wifi_menu_connect">Connect to network</string>
     <!-- Menu option to remember a temporary Wi-Fi network -->
@@ -1654,6 +1658,8 @@
     <string name="wifi_saved_access_points_titlebar">Saved networks</string>
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
     <string name="wifi_advanced_titlebar">Advanced Wi\u2011Fi</string>
+    <!-- Wi-Fi settings screen, configure, settings section.  This is a header shown above configure wifi settings. [CHAR LIMIT=30] -->
+    <string name="wifi_configure_titlebar">Configure Wi\u2011Fi</string>
     <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
     <string name="wifi_setting_frequency_band_title">Wi\u2011Fi frequency band</string>
     <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
@@ -1959,10 +1965,6 @@
 
     <!-- Account settings header. [CHAR LIMIT=30] -->
     <string name="account_settings">Accounts</string>
-    <!-- Header for items under the personal user [CHAR LIMIT=30] -->
-    <string name="category_personal">Personal</string>
-    <!-- Header for items under the work user [CHAR LIMIT=30] -->
-    <string name="category_work">Work</string>
     <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
     <string name="accessibility_category_work">Work profile accounts - <xliff:g id="managed_by" example="Managed by Corporate application">%s</xliff:g></string>
     <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
@@ -2000,16 +2002,7 @@
     <string name="auto_brightness_title">Adaptive brightness</string>
     <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
     <string name="auto_brightness_summary">Optimize brightness level for available light</string>
-    <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
-    <string name="night_mode_title">Night mode</string>
-    <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
-    <string name="night_mode_summary">%s</string>
-    <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
-    <string name="night_mode_no">Disabled</string>
-    <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
-    <string name="night_mode_yes">Always on</string>
-    <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
-    <string name="night_mode_auto">Automatic</string>
+
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
     <string name="screen_timeout">Sleep</string>
     <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
@@ -2790,8 +2783,6 @@
 
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
-    <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
-    <string name="managed_profile_location_category">Work profile</string>
     <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
     <string name="managed_profile_location_switch_title">Location for work profile</string>
     <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
@@ -3309,10 +3300,6 @@
     <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
     <string name="storageuse_settings_summary">View storage used by apps</string>
 
-    <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
-    <string name="runningservices_settings_title">Running services</string>
-    <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
-    <string name="runningservices_settings_summary">View and control currently running services</string>
     <!-- Label for a service item when it is restarting -->
     <string name="service_restarting">Restarting</string>
     <!-- Label for a process item representing a background process -->
@@ -3575,140 +3562,6 @@
     <!-- Summary for built-in keyboard settings -->
     <string name="builtin_keyboard_settings_summary">Physical keyboard settings</string>
 
-    <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
-    <string name="development_settings_title">Developer options</string>
-    <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
-    <string name="development_settings_summary">Set options for app development</string>
-    <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
-    <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
-    <string name="development_settings_not_available">Developer options are not available for this user</string>
-    <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
-    <string name="vpn_settings_not_available">VPN settings are not available for this user</string>
-    <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
-    <string name="tethering_settings_not_available">Tethering settings are not available for this user</string>
-    <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-    <string name="apn_settings_not_available">Access Point Name settings are not available for this user</string>
-    <string name="enable_adb">USB debugging</string>
-    <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
-    <string name="enable_adb_summary">Debug mode when USB is connected</string>
-    <!-- Setting title to revoke secure USB debugging authorizations -->
-    <string name="clear_adb_keys">Revoke USB debugging authorizations</string>
-    <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
-    <string name="bugreport_in_power">Bug report shortcut</string>
-    <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
-    <string name="bugreport_in_power_summary">Show a button in the power menu for taking a bug report</string>
-    <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
-    <string name="keep_screen_on">Stay awake</string>
-    <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
-    <string name="keep_screen_on_summary">Screen will never sleep while charging</string>
-    <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
-    <string name="bt_hci_snoop_log">Enable Bluetooth HCI snoop log</string>
-    <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
-    <string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
-    <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
-    <string name="oem_unlock_enable">OEM unlocking</string>
-    <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
-    <string name="oem_unlock_enable_summary">Allow the bootloader to be unlocked</string>
-    <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
-    <string name="confirm_enable_oem_unlock_title">Allow OEM unlocking?</string>
-    <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
-    <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</string>
-
-    <!-- UI debug setting: limit size of Android logger buffers -->
-    <string name="select_logd_size_title">Logger buffer sizes</string>
-    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
-    <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
-
-    <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
-    <string name="mock_location_app">Select mock location app</string>
-    <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
-    <string name="mock_location_app_not_set">No mock location app set</string>
-    <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
-    <string name="mock_location_app_set">Mock location app: <xliff:g id="app_name">%1$s</xliff:g></string>
-
-    <!-- Setting Checkbox title whether to enable view attribute inspection -->
-    <string name="debug_view_attributes">Enable view attribute inspection</string>
-    <!-- Title of warning dialog about the implications of enabling USB debugging -->
-
-    <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
-    <string name="debug_networking_category">Networking</string>
-
-    <!-- Setting Checkbox title whether to show options for wireless display certification -->
-    <string name="wifi_display_certification">Wireless display certification</string>
-    <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
-    <string name="wifi_verbose_logging">Enable Wi\u2011Fi Verbose Logging</string>
-    <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
-    <string name="wifi_aggressive_handover">Aggressive Wi\u2011Fi to Cellular handover</string>
-    <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
-    <string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>
-    <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
-    <string name="legacy_dhcp_client">Use legacy DHCP client</string>
-    <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
-    <string name="mobile_data_always_on">Cellular data always active</string>
-
-    <!-- setting Checkbox summary whether to show options for wireless display certification  -->
-    <string name="wifi_display_certification_summary">Show options for wireless display certification</string>
-    <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
-    <string name="wifi_verbose_logging_summary">Increase Wi\u2011Fi logging level, show per SSID RSSI in Wi\u2011Fi Picker</string>
-    <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
-    <string name="wifi_aggressive_handover_summary">When enabled, Wi\u2011Fi will be more aggressive in handing over the data connection to Cellular, when Wi\u2011Fi signal is low</string>
-    <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
-    <string name="wifi_allow_scan_with_traffic_summary">Allow/Disallow Wi\u2011Fi Roam Scans based on the amount of data traffic present at the interface</string>
-    <!-- UI debug setting: limit size of Android logger buffers -->
-    <string name="select_logd_size_title">Logger buffer sizes</string>
-    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
-    <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
-    <!-- UI debug setting: select USB configuration -->
-    <string name="select_usb_configuration_title">Select USB Configuration</string>
-    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
-    <string name="select_usb_configuration_dialog_title">Select USB Configuration</string>
-    <!-- Setting Checkbox title whether to allow mock locations -->
-    <string name="allow_mock_location">Allow mock locations</string>
-    <!-- setting Checkbox summary whether to allow mock locations  -->
-    <string name="allow_mock_location_summary">Allow mock locations</string>
-    <!-- Setting Checkbox title whether to enable view attribute inspection -->
-    <string name="debug_view_attributes">Enable view attribute inspection</string>
-    <!-- Title of warning dialog about the implications of enabling USB debugging -->
-    <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
-    <string name="legacy_dhcp_client_summary">Use the DHCP client from Lollipop instead of the new Android DHCP client.</string>
-    <string name="mobile_data_always_on_summary">Always keep mobile data active, even when Wi\u2011Fi is active (for fast network switching).</string>
-    <string name="adb_warning_title">Allow USB debugging?</string>
-    <!-- Warning text to user about the implications of enabling USB debugging -->
-    <string name="adb_warning_message">USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data.</string>
-    <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
-    <string name="adb_keys_warning_message">Revoke access to USB debugging from all computers you\u2019ve previously authorized?</string>
-    <!-- Title of warning dialog about the implications of enabling developer settings -->
-    <string name="dev_settings_warning_title">Allow development settings?</string>
-    <!-- Warning text to user about the implications of enabling USB debugging -->
-    <string name="dev_settings_warning_message">These settings are intended for development use only.  They can cause your device and the applications on it to break or misbehave.</string>
-    <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
-    <string name="verify_apps_over_usb_title">Verify apps over USB</string>
-    <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
-    <string name="verify_apps_over_usb_summary">Check apps installed via ADB/ADT for harmful behavior.</string>
-
-    <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
-    <string name="enforce_read_external_title" product="nosdcard">Protect USB storage</string>
-    <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
-    <string name="enforce_read_external_summary" product="nosdcard">Apps must request permission to read USB storage</string>
-    <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
-    <string name="enforce_read_external_confirm_title" product="nosdcard">Protect USB storage?</string>
-    <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
-    <string name="enforce_read_external_confirm_message" product="nosdcard">When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
-
-    <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
-    <string name="enforce_read_external_title" product="default">Protect SD card</string>
-    <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
-    <string name="enforce_read_external_summary" product="default">Apps must request permission to read SD card</string>
-    <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
-    <string name="enforce_read_external_confirm_title" product="default">Protect SD card?</string>
-    <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
-    <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
-
-    <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
-    <string name="enable_terminal_title">Local terminal</string>
-    <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
-    <string name="enable_terminal_summary">Enable terminal app that offers local shell access</string>
-
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
          (or other screens that can host gadgets).  Note to translators: we're still determining
          the final name for Gadgets/Widgets, so please translate both for now. -->
@@ -3806,16 +3659,14 @@
     <string name="accessibility_power_button_ends_call_prerefence_title">Power button ends call</string>
     <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
+    <!-- Title for the accessibility preference for enabling/disabling large icons for mouse/trackpad pointers. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_large_pointer_icon_title">Large mouse/trackpad pointer icons</string>
     <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
     <string name="accessibility_long_press_timeout_preference_title">Touch &amp; hold delay</string>
     <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
     <string name="accessibility_display_inversion_preference_title">Color inversion</string>
     <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
     <string name="accessibility_display_inversion_preference_subtitle">(Experimental) May affect performance</string>
-    <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_display_daltonizer_preference_title">Color correction</string>
-    <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_display_daltonizer_preference_subtitle">This feature is experimental and may affect performance.</string>
     <!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] -->
     <string name="accessibility_autoclick_preference_title">Click after pointer stops moving</string>
     <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
@@ -3825,19 +3676,6 @@
     <string name="enable_quick_setting">Show in Quick Settings</string>
     <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
     <string name="daltonizer_type">Correction mode</string>
-    <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
-    <string name="daltonizer_type_overridden">Overridden by <xliff:g id="title" example="Simulate color space">%1$s</xliff:g></string>
-
-    <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
-    <string name="daltonizer_mode_disabled">Disabled</string>
-    <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
-    <string name="daltonizer_mode_monochromacy">Monochromacy</string>
-    <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
-    <string name="daltonizer_mode_deuteranomaly">Deuteranomaly (red-green)</string>
-    <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
-    <string name="daltonizer_mode_protanomaly">Protanomaly (red-green)</string>
-    <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
-    <string name="daltonizer_mode_tritanomaly">Tritanomaly (blue-yellow)</string>
 
     <!-- Subtitle for the accessibility preference to configure feature that performs click action soon after mouse/trackpad pointer stops moving, in case delay before click is extremely short. Placeholder will be set to the number of milliseconds to which the delay amounts. [CHAR LIMIT=NONE] -->
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay">
@@ -4006,15 +3844,6 @@
     <!-- Title for print service settings screen [CHAR LIMIT=25] -->
     <string name="print_settings_title">Print services</string>
 
-    <!-- Title for a warning message about security implications of enabling a print service,
-         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
-    <string name="print_service_security_warning_title">Use
-         <xliff:g id="service" example="My Print Service">%1$s</xliff:g>?</string>
-    <!-- Summary for a warning message about security implications of enabling a print service,
-         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
-    <string name="print_service_security_warning_summary">Your document may pass through
-        one or more servers on its way to the printer.</string>
-
     <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
     <string name="print_no_services_installed">No services installed</string>
 
@@ -4459,124 +4288,6 @@
         behalf.  It comes from the <xliff:g id="voice_input_service_app_name">%s</xliff:g>
         application.  Enable the use of this service?</string>
 
-    <!-- Text-To-Speech (TTS) settings --><skip />
-    <!-- Name of the TTS package as listed by the package manager. -->
-    <string name="tts_settings">Text-to-speech settings</string>
-    <!-- TTS option item name in the main settings screen -->
-    <string name="tts_settings_title">Text-to-speech output</string>
-    <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
-    <string name="use_default_tts_settings_title">Always use my settings</string>
-    <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
-    <string name="use_default_tts_settings_summary">Default settings below override app settings</string>
-    <!-- On main TTS Settings screen, section header for default TTS settings -->
-    <string name="tts_default_settings_section">Default settings</string>
-    <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
-    <string name="tts_default_synth_title">Default engine</string>
-    <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
-    <string name="tts_default_synth_summary">Set the speech synthesis engine to be used for spoken text</string>
-    <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
-    <string name="tts_default_rate_title">Speech rate</string>
-    <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
-    <string name="tts_default_rate_summary">Speed at which the text is spoken</string>
-    <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
-    <string name="tts_default_pitch_title">Pitch</string>
-    <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
-    <string name="tts_default_pitch_summary">Affects the tone of the spoken text</string>
-
-    <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
-    <string name="tts_default_lang_title">Language</string>
-    <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
-    <string name="tts_lang_use_system">Use system language</string>
-    <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
-    <string name="tts_lang_not_selected">Language not selected</string>
-    <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
-    <string name="tts_default_lang_summary">Sets the language-specific voice for the spoken text</string>
-    <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
-    <string name="tts_play_example_title">Listen to an example</string>
-    <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
-    <string name="tts_play_example_summary">Play a short demonstration of speech synthesis</string>
-    <!-- On main TTS Settings screen, click to install required speech synthesis data -->
-    <string name="tts_install_data_title">Install voice data</string>
-    <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
-    <string name="tts_install_data_summary">Install the voice data required for speech synthesis</string>
-    <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
-    <string name="tts_data_installed_summary">Voices required for speech synthesis already properly installed</string>
-    <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
-    <string name="tts_settings_changed_demo">Your settings have changed. This is an example of how they sound.</string>
-    <!-- Error screen when a selected TTS engine can't run because it's missing components -->
-    <string name="tts_engine_error">The engine you chose can\u2019t run.</string>
-    <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
-    <string name="tts_engine_error_config">Configure</string>
-    <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
-    <string name="tts_engine_error_reselect">Choose another engine</string>
-    <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
-         message when the user selects to enable an engine. -->
-    <string name="tts_engine_security_warning">This speech synthesis engine may be able to collect
-    all the text that will be spoken, including personal data like passwords and credit
-    card numbers. It comes from the <xliff:g id="tts_plugin_engine_name">%s</xliff:g> engine.
-    Enable the use of this speech synthesis engine?</string>
-    <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
-         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
-    <string name="tts_engine_network_required">This language requires a working network connection for text-to-speech output.</string>
-    <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
-    <string name="tts_default_sample_string">This is an example of speech synthesis</string>
-    <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
-         current default language [CHAR LIMIT=50] -->
-    <string name="tts_status_title">Default language status</string>
-    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
-         selected language is fully supported by the engine [CHAR LIMIT=150]-->
-    <string name="tts_status_ok"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is fully supported</string>
-    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
-         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
-    <string name="tts_status_requires_network"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> requires network connection</string>
-    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
-         selected language is not supported by the engine [CHAR LIMIT=150] -->
-    <string name="tts_status_not_supported"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is not supported</string>
-    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
-         tts engine is queried for status [CHAR LIMIT=150] -->
-    <string name="tts_status_checking">Checking...</string>
-    <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
-    <string name="tts_engines_section">Engines</string>
-    <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
-    <string name="tts_engine_name_settings"><xliff:g id="tts_plugin_engine_name">%s</xliff:g> settings</string>
-    <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
-    <string name="tts_engine_name_is_enabled_summary"><xliff:g id="tts_plugin_engine_name">%s</xliff:g> is enabled</string>
-    <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
-    <string name="tts_engine_name_is_disabled_summary"><xliff:g id="tts_plugin_engine_name">%s</xliff:g> is disabled</string>
-    <!-- On the main TTS settings screen, text for a divider under which
-         the engine specific settings and the "engine install data" option
-         are listed [CHAR LIMIT=30]-->
-    <string name="tts_engine_settings_section">Engine settings</string>
-    <!-- Title for a preference in the main TTS settings screen, which
-         launches the settings screen for a given TTS engine when clicked
-         [CHAR LIMIT=30]-->
-    <string name="tts_engine_settings_title">Settings for <xliff:g id="tts_engine_name">%s</xliff:g></string>
-    <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
-    <string name="pico_languages_and_voices">Languages and voices</string>
-    <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
-    <string name="pico_installed">Installed</string>
-    <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
-    <string name="pico_not_installed">Not installed</string>
-    <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
-    <string name="pico_voice_summary_female">Female</string>
-    <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
-    <string name="pico_voice_summary_male">Male</string>
-    <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
-    <string name="tts_notif_engine_install_title">Speech synthesis engine installed</string>
-    <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
-         to warn the user that this engine cannot be used before the checkbox for that engine
-         in TTS settings is checked. -->
-    <string name="tts_notif_engine_install_message">Enable new engine before use.</string>
-    <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
-         the image that launches the TTS engine settings when clicked. -->
-    <string name="tts_engine_settings_button">Launch engine settings</string>
-    <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
-         preferred text to speech engine -->
-    <string name="tts_engine_preference_section_title">Preferred engine</string>
-    <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
-         that are applicable to all engines, such as the speech rate -->
-    <string name="tts_general_section_title">General</string>
-
     <!-- Power Control Widget -->
     <string name="gadget_title">Power control</string>
     <string name="gadget_toggle_wifi">Updating Wi\u2011Fi setting</string>
@@ -4704,20 +4415,6 @@
     <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
     <string name="backup_configure_account_default_summary">No account is currently storing backed up data</string>
 
-    <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
-    <string name="local_backup_password_title">Desktop backup password</string>
-    <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
-    <string name="local_backup_password_summary_none">Desktop full backups aren\u2019t currently protected</string>
-    <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
-    <string name="local_backup_password_summary_change">Touch to change or remove the password for desktop full backups</string>
-
-    <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
-    <string name="local_backup_password_toast_success">New backup password set</string>
-    <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
-    <string name="local_backup_password_toast_confirmation_mismatch">New password and confirmation don\u2019t match</string>
-    <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
-    <string name="local_backup_password_toast_validation_failure">Failure setting backup password</string>
-
     <!-- Dialog title for confirmation to erase backup data from server -->
     <string name="backup_erase_dialog_title"></string>
     <!-- Dialog title for confirmation to erase backup data from server -->
@@ -5016,168 +4713,6 @@
     <!--  action to select all [CHAR LIMIT=30] -->
     <string name="select_all">Select all</string>
 
-    <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
-    <string name="hdcp_checking_title">HDCP checking</string>
-    <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
-    <string name="hdcp_checking_dialog_title">Set HDCP checking behavior</string>
-
-    <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
-    <string name="debug_debugging_category">Debugging</string>
-
-    <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
-    <string name="debug_app">Select debug app</string>
-    <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
-    <string name="debug_app_not_set">No debug application set</string>
-    <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
-    <string name="debug_app_set">Debugging application: <xliff:g id="app_name">%1$s</xliff:g></string>
-
-    <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
-    <string name="select_application">Select application</string>
-    <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
-    <string name="no_application">Nothing</string>
-
-    <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
-    <string name="wait_for_debugger">Wait for debugger</string>
-    <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
-    <string name="wait_for_debugger_summary">Debugged application waits for debugger to
-            attach before executing</string>
-
-    <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
-    <string name="debug_input_category">Input</string>
-
-    <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
-    <string name="debug_drawing_category">Drawing</string>
-
-    <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
-    <string name="debug_hw_drawing_category">Hardware accelerated rendering</string>
-
-    <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
-    <string name="media_category">Media</string>
-
-    <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
-    <string name="debug_monitoring_category">Monitoring</string>
-
-    <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
-    <string name="strict_mode">Strict mode enabled</string>
-    <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
-    <string name="strict_mode_summary">Flash screen when apps do long operations
-            on main thread</string>
-
-    <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
-    <string name="pointer_location">Pointer location</string>
-    <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
-    <string name="pointer_location_summary">Screen overlay showing current touch data</string>
-
-    <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
-    <string name="show_touches">Show touches</string>
-    <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
-    <string name="show_touches_summary">Show visual feedback for touches</string>
-
-    <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
-    <string name="show_screen_updates">Show surface updates</string>
-    <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
-    <string name="show_screen_updates_summary">Flash entire window surfaces when they update</string>
-
-    <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
-    <string name="show_hw_screen_updates">Show GPU view updates</string>
-    <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
-    <string name="show_hw_screen_updates_summary">Flash views inside windows when drawn with the GPU</string>
-
-    <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
-    <string name="show_hw_layers_updates">Show hardware layers updates</string>
-    <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
-    <string name="show_hw_layers_updates_summary">Flash hardware layers green when they update</string>
-
-    <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
-    <string name="debug_hw_overdraw">Debug GPU overdraw</string>
-
-    <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
-    <string name="disable_overlays">Disable HW overlays</string>
-    <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
-    <string name="disable_overlays_summary">Always use GPU for screen compositing</string>
-
-    <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
-    <string name="simulate_color_space">Simulate color space</string>
-
-    <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
-    <string name="enable_opengl_traces_title">Enable OpenGL traces</string>
-
-    <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
-    <string name="usb_audio_disable_routing">Disable USB audio routing</string>
-    <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
-    <string name="usb_audio_disable_routing_summary">Disable automatic routing to USB audio peripherals</string>
-
-    <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
-    <string name="debug_layout">Show layout bounds</string>
-    <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
-    <string name="debug_layout_summary">Show clip bounds, margins, etc.</string>
-
-    <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
-    <string name="force_rtl_layout_all_locales">Force RTL layout direction</string>
-    <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
-    <string name="force_rtl_layout_all_locales_summary">Force screen layout direction to RTL for all locales</string>
-
-    <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
-    <string name="show_cpu_usage">Show CPU usage</string>
-    <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
-    <string name="show_cpu_usage_summary">Screen overlay showing current CPU usage</string>
-
-    <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
-    <string name="force_hw_ui">Force GPU rendering</string>
-    <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
-    <string name="force_hw_ui_summary">Force use of GPU for 2d drawing</string>
-
-    <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
-    <string name="force_msaa">Force 4x MSAA</string>
-    <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
-    <string name="force_msaa_summary">Enable 4x MSAA in OpenGL ES 2.0 apps</string>
-
-    <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
-    <string name="show_non_rect_clip">Debug non-rectangular clip operations</string>
-
-    <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
-    <string name="track_frame_time">Profile GPU rendering</string>
-
-    <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
-    <string name="window_animation_scale_title">Window animation scale</string>
-
-    <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
-    <string name="transition_animation_scale_title">Transition animation scale</string>
-
-    <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
-    <string name="animator_duration_scale_title">Animator duration scale</string>
-
-    <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
-    <string name="overlay_display_devices_title">Simulate secondary displays</string>
-
-    <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
-    <string name="debug_applications_category">Apps</string>
-
-    <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
-    <string name="immediately_destroy_activities">Don\u2019t keep activities</string>
-    <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
-    <string name="immediately_destroy_activities_summary">Destroy every activity as soon as
-            the user leaves it</string>
-
-    <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
-    <string name="app_process_limit_title">Background process limit</string>
-
-    <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
-    <string name="show_all_anrs">Show all ANRs</string>
-    <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
-    <string name="show_all_anrs_summary">Show App Not Responding dialog
-        for background apps</string>
-
-    <!-- UI debug setting: force allow apps on external storage [CHAR LIMIT=50] -->
-    <string name="force_allow_on_external">Force allow apps on external</string>
-    <!-- UI debug setting: force allow on external summary [CHAR LIMIT=150] -->
-    <string name="force_allow_on_external_summary">Makes any app elligible to be written to external storage, regardless of manifest values</string>
-
-    <!-- UI debug setting: force all activites to be resizable for multiwindow [CHAR LIMIT=50] -->
-    <string name="force_resizable_activities">Force activities to be resizable</string>
-    <!-- UI debug setting: force allow on external summary [CHAR LIMIT=150] -->
-    <string name="force_resizable_activities_summary">Makes all activities resizable for multi-window, regardless of manifest values.</string>
-
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
     <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
@@ -5999,7 +5534,7 @@
     <string name="keywords_network_reset">reset restore factory</string>
     <string name="keywords_factory_data_reset">wipe delete restore clear remove</string>
     <string name="keywords_printing">printer</string>
-    <string name="keywords_sounds_and_notifications">speaker beep</string>
+    <string name="keywords_sounds">speaker beep</string>
     <string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb interrupt interruption break</string>
     <string name="keywords_app">RAM</string>
     <string name="keywords_location">nearby location history reporting</string>
@@ -6040,75 +5575,117 @@
 
 
     <!-- Sounds and Notification -->
+    <!-- Sound: Dashboard summary. [CHAR LIMIT=100] -->
+    <string name="sound_settings_summary">Ringer volume at <xliff:g id="percentage" example="2">%1$s</xliff:g></string>
 
-    <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
-    <string name="notification_settings">Sound &amp; notification</string>
-
-    <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
     <string name="media_volume_option_title">Media volume</string>
 
-    <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
     <string name="alarm_volume_option_title">Alarm volume</string>
 
-    <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
     <string name="ring_volume_option_title">Ring volume</string>
 
-    <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option managing notification volume. [CHAR LIMIT=30] -->
     <string name="notification_volume_option_title">Notification volume</string>
 
-    <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>
-
-    <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_priority_settings_title">Priority only allows</string>
-
-    <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_automation_settings_title">Automatic rules</string>
-
-    <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_important_interruptions">Priority only</string>
-
-    <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_alarms">Alarms only</string>
-
-    <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
-    <string name="zen_mode_option_no_interruptions">Total silence</string>
-
-    <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
-    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
-
-    <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
     <string name="ringtone_title">Phone ringtone</string>
 
-    <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
     <string name="notification_ringtone_title">Default notification ringtone</string>
 
-    <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+    <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
     <string name="vibrate_when_ringing_title">Also vibrate for calls</string>
 
-    <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
-    <string name="notification_section_header">Notification</string>
+    <!-- Sound: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="other_sound_settings">Other sounds</string>
 
-    <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+    <!-- Sound: Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+    <string name="dial_pad_tones_title">Dial pad tones</string>
+
+    <!-- Sound: Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+    <string name="screen_locking_sounds_title">Screen locking sounds</string>
+
+    <!-- Sound: Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+    <string name="charging_sounds_title">Charging sounds</string>
+
+    <!-- Sound: Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+    <string name="docking_sounds_title">Docking sounds</string>
+
+    <!-- Sound: Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+    <string name="touch_sounds_title">Touch sounds</string>
+
+    <!-- Sound: Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+    <string name="vibrate_on_touch_title">Vibrate on touch</string>
+
+    <!-- Sound: Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+    <string name="dock_audio_media_title">Dock speaker plays</string>
+
+    <!-- Sound: Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+    <string name="dock_audio_media_disabled">All audio</string>
+
+    <!-- Sound: Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+    <string name="dock_audio_media_enabled">Media audio only</string>
+
+    <!-- Sound: Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_silent">Silent</string>
+
+    <!-- Sound: Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_alert">Alert</string>
+
+    <!-- Sound: Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_vibrate">Vibrate</string>
+
+    <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>
+
+    <!-- Do not disturb: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_priority_settings_title">Priority only allows</string>
+
+    <!--  Do not disturb: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_automation_settings_title">Automatic rules</string>
+
+    <!--  Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+    <string name="zen_mode_option_important_interruptions">Priority only</string>
+
+    <!--  Do not disturb: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+    <string name="zen_mode_option_alarms">Alarms only</string>
+
+    <!--  Do not disturb: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+    <string name="zen_mode_option_no_interruptions">Total silence</string>
+
+    <!--  Do not disturb: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
+
+    <!--  Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
+    <string name="zen_mode_visual_interruptions_settings_title">Visual interruptions</string>
+
+
+    <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
+    <string name="configure_notification_settings">Configure notifications</string>
+
+    <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->
     <string name="advanced_section_header">Advanced</string>
 
-    <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+    <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
     <string name="notification_pulse_title">Pulse notification light</string>
 
-    <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
     <string name="lock_screen_notifications_title">When device is locked</string>
 
-    <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+    <!-- Configure Notifications: Value for lockscreen notifications:  all information will be
          shown in notifications shown on a secure lock screen
          [CHAR LIMIT=50] -->
     <string name="lock_screen_notifications_summary_show">Show all notification content</string>
 
-    <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+    <!-- Configure Notifications: Value for lockscreen notifications: sensitive information will be
          hidden or redacted from notifications shown on a secure lock screen
          [CHAR LIMIT=50] -->
     <string name="lock_screen_notifications_summary_hide">Hide sensitive notification content</string>
 
-    <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+    <!-- Configure Notifications: Value for lockscreen notifications: notifications will not appear on a secure lock screen
          [CHAR LIMIT=50] -->
     <string name="lock_screen_notifications_summary_disable">Don\u2019t show notifications at all</string>
 
@@ -6118,47 +5695,13 @@
     <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
     <string name="lock_screen_notifications_interstitial_title">Notifications</string>
 
-    <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
-    <string name="app_notifications_title">App notifications</string>
+    <!-- Notification Settings: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+    <string name="app_notifications_title">Notifications</string>
 
-    <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="other_sound_settings">Other sounds</string>
+    <!-- Sound & notification > Notification section: Title for the option managing notifications per topic. [CHAR LIMIT=30] -->
+    <string name="topic_notifications_title">Topic notifications</string>
 
-    <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
-    <string name="dial_pad_tones_title">Dial pad tones</string>
 
-    <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
-    <string name="screen_locking_sounds_title">Screen locking sounds</string>
-
-    <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
-    <string name="charging_sounds_title">Charging sounds</string>
-
-    <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
-    <string name="docking_sounds_title">Docking sounds</string>
-
-    <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
-    <string name="touch_sounds_title">Touch sounds</string>
-
-    <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
-    <string name="vibrate_on_touch_title">Vibrate on touch</string>
-
-    <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
-    <string name="dock_audio_media_title">Dock speaker plays</string>
-
-    <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
-    <string name="dock_audio_media_disabled">All audio</string>
-
-    <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
-    <string name="dock_audio_media_enabled">Media audio only</string>
-
-    <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
-    <string name="emergency_tone_silent">Silent</string>
-
-    <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
-    <string name="emergency_tone_alert">Alert</string>
-
-    <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
-    <string name="emergency_tone_vibrate">Vibrate</string>
 
     <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
     <string name="manage_notification_access_title">Notification access</string>
@@ -6203,23 +5746,17 @@
     <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
     <string name="app_notification_block_summary">Never show notifications from this app</string>
 
-    <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
-    <string name="app_notification_priority_title">Treat as priority</string>
+    <!-- [CHAR LIMIT=NONE] App notification settings: Override DND option title -->
+    <string name="app_notification_override_dnd_title">Override Do Not Disturb</string>
 
-    <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
-    <string name="app_notification_priority_summary">Let this app\u2019s notifications be heard when Do not disturb is set to Priority only</string>
-
-    <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
-    <string name="app_notification_peekable_title">Allow peeking</string>
-
-    <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
-    <string name="app_notification_peekable_summary">Let this app emphasize certain notifications by sliding them briefly into view on the current screen</string>
+    <!-- [CHAR LIMIT=NONE] App notification settings: Override DND option description-->
+    <string name="app_notification_override_dnd_summary">Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
     <string name="app_notification_sensitive_title">Hide sensitive content</string>
 
     <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
-    <string name="app_notification_sensitive_summary">When the device is locked, hide content in this app\u2019s notifications that might reveal private information</string>
+    <string name="app_notification_sensitive_summary">When the device is locked, hide content in these notifications that might reveal private information</string>
 
     <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
     <string name="app_notification_row_banned">Blocked</string>
@@ -6233,6 +5770,9 @@
     <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
     <string name="app_notifications_dialog_done">Done</string>
 
+    <!-- [CHAR LIMIT=150] App notification settings: App notifications Importance title -->
+    <string name="app_notification_importance_title">Importance</string>
+
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
     <string name="zen_mode_rule_name">Rule name</string>
 
@@ -6419,8 +5959,17 @@
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
     <string name="zen_mode_summary_always">Change to always interrupt</string>
 
-    <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
-    <string name="notification_settings_apps_title">App notifications</string>
+    <!-- [CHAR LIMIT=40] Zen mode settings: No screen interruptions option -->
+    <string name="zen_mode_peek">No screen interruptions</string>
+
+    <!-- [CHAR LIMIT=130] Zen mode settings: No screen interruptions summary -->
+    <string name="zen_mode_peek_summary">Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen</string>
+
+    <!-- [CHAR LIMIT=40] Zen mode settings: No notification light option -->
+    <string name="zen_mode_lights">No notification light</string>
+
+    <!-- [CHAR LIMIT=105] Zen mode settings: No notification light summary -->
+    <string name="zen_mode_lights_summary">Prevent notifications silenced by Do Not Disturb from causing the light to pulse</string>
 
     <!-- [CHAR LIMIT=NONE] Content description for per-app notification
          settings button -->
@@ -6453,9 +6002,6 @@
     <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
     <string name="screen_pinning_unlock_none">Lock device when unpinning</string>
 
-    <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
-    <!-- Title for a work profile. [CHAR LIMIT=25] -->
-    <string name="managed_user_title">Work profile</string>
     <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
     <string name="opening_paragraph_delete_profile_unknown_company">This work profile is managed by:</string>
     <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -6591,12 +6137,6 @@
    <string name="notifications_enabled">Normal</string>
    <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
    <string name="notifications_disabled">Block</string>
-   <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
-   <string name="notifications_sensitive">Sensitive content hidden</string>
-   <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
-   <string name="notifications_priority">Priority</string>
-   <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
-   <string name="notifications_no_peeking">No peeking</string>
    <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
    <string name="notifications_two_items"><xliff:g id="notif_state" example="Priority">%1$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%2$s</xliff:g></string>
    <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
@@ -6637,12 +6177,6 @@
     <string name="filter_work_apps">Work</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_blocked_apps">Blocked</string>
-    <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_priority_apps">Priority</string>
-    <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_sensitive_apps">Sensitive content hidden</string>
-    <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_no_peeking">No peeking</string>
     <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
     <string name="filter_with_domain_urls_apps">With domain URLs</string>
 
@@ -6658,9 +6192,6 @@
    <!-- Warning toast shown when data usage screen can't find specified app -->
    <string name="unknown_app">Unknown app</string>
 
-   <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
-   <string name="choose_profile">Choose Profile</string>
-
    <!-- Label for list that shows all permissions -->
    <string name="app_permissions">App permissions</string>
    <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
@@ -6896,12 +6427,11 @@
          usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
     <string name="usb_use">Use USB for</string>
 
-    <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
-    <string name="inactive_apps_title">Inactive apps</string>
-    <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
-    <string name="inactive_app_inactive_summary">Inactive. Touch to toggle.</string>
-    <!-- Settings item summary for active app [CHAR LIMIT=100] -->
-    <string name="inactive_app_active_summary">Active. Touch to toggle.</string>
+    <!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
+    <string name="background_check_pref">Background check</string>
+
+    <!-- Settings screen title for background check prefs [CHAR LIMIT=35] -->
+    <string name="background_check_title">Full background access</string>
 
     <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
     <string name="assist_access_context_title">Use text from screen</string>
@@ -6982,6 +6512,12 @@
     <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
     <string name="zen_access_warning_dialog_summary">The app will be able to turn on/off Do Not Disturb and make changes to related settings.</string>
 
+    <!-- Zen mode access settings - title for warning dialog when revoking access [CHAR LIMIT=NONE] -->
+    <string name="zen_access_revoke_warning_dialog_title">Revoke access to Do Not Disturb for <xliff:g id="app" example="Tasker">%1$s</xliff:g>?</string>
+
+    <!-- Zen mode access settings - summary for warning dialog when revoking access [CHAR LIMIT=NONE] -->
+    <string name="zen_access_revoke_warning_dialog_summary">All Do Not Disturb rules created by this app will be removed.</string>
+
     <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
     <string name="ignore_optimizations_on">Don\u2019t optimize</string>
 
@@ -7077,23 +6613,65 @@
     <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
     <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
 
-    <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
-    <string-array name="color_mode_names">
-        <item>Vibrant (default)</item>
-        <item>Natural</item>
-        <item>Standard</item>
-    </string-array>
+    <!-- Title of setting that controls display scale (e.g. density). [CHAR LIMIT=40] -->
+    <string name="force_density_preference_title">Display scale</string>
+    <!-- Keywords for setting that controls display scale (e.g. density). [CHAR LIMIT=NONE] -->
+    <string name="force_density_keywords">display density zoom scale scaling</string>
+    <!-- Description for the display scale that makes interface elements small. [CHAR LIMIT=24] -->
+    <string name="force_density_summary_small">Small</string>
+    <!-- Description for the device's default display scale. [CHAR LIMIT=24] -->
+    <string name="force_density_summary_normal">Normal</string>
+    <!-- Description for the display scale that makes interface elements large. [CHAR LIMIT=24] -->
+    <string name="force_density_summary_large">Large</string>
+    <!-- Description for the display scale that makes interface elements larger. [CHAR LIMIT=24] -->
+    <string name="force_density_summary_very_large">Larger</string>
+    <!-- Description for the display scale that makes interface elements largest. [CHAR LIMIT=24] -->
+    <string name="force_density_summary_extremely_large">Largest</string>
+    <!-- Description for a custom display scale. This shows the requested display
+         density in raw pixels per inch rather than computing a scale amount. [CHAR LIMIT=24] -->
+    <string name="force_density_summary_custom">Custom (<xliff:g id="densityDpi" example="160">%d</xliff:g>)</string>
 
-    <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
-    <string-array name="color_mode_descriptions">
-        <item>Enhanced colors</item>
-        <item>Natural colors as seen by the eye</item>
-        <item>Colors optimized for digital content</item>
-    </string-array>
+    <!-- Button to show all top-level settings items [CHAR LIMIT=20] -->
+    <string name="see_all">See all</string>
+    <!-- Button to show less top-level settings items [CHAR LIMIT=20] -->
+    <string name="see_less">See less</string>
 
-    <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
-    <string name="picture_color_mode">Picture color mode</string>
+    <!-- Wi-Fi state - Disconnected [CHAR LIMIT=NONE] -->
+    <string name="disconnected">Disconnected</string>
 
-    <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
-    <string name="picture_color_mode_desc">Use sRGB</string>
+    <!-- Summary of data usage [CHAR LIMIT=NONE] -->
+    <string name="data_usage_summary_format"><xliff:g id="amount" example="50%">%1$s</xliff:g> of data used</string>
+
+    <!-- Summary of apps [CHAR LIMIT=NONE] -->
+    <string name="apps_summary"><xliff:g id="count" example="24">%1$d</xliff:g> apps installed</string>
+
+    <!-- Summary of storage usage [CHAR LIMIT=NONE] -->
+    <string name="storage_summary"><xliff:g id="size1" example="8GB">%1$s</xliff:g> of <xliff:g id="size2" example="32GB">%2$s</xliff:g> used</string>
+
+    <!-- Summary of display with adaptive brightness on [CHAR LIMIT=NONE] -->
+    <string name="display_summary_on">Adaptive brightness is ON</string>
+
+    <!-- Summary of display with adaptive brightness off [CHAR LIMIT=NONE] -->
+    <string name="display_summary_off">Adaptive brightness is OFF</string>
+
+    <!-- Summary of memory screen [CHAR LIMIT=NONE] -->
+    <string name="memory_summary">Avg <xliff:g id="used_memory" example="1.7GB">%1$s</xliff:g> of <xliff:g id="total_memory" example="2GB">%2$s</xliff:g> memory used</string>
+
+    <!-- Summary of user screen [CHAR LIMIT=NONE] -->
+    <string name="user_summary">Signed in as <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
+
+    <!-- Summary of payment screen [CHAR LIMIT=NONE] -->
+    <string name="payment_summary"><xliff:g id="app_name" example="Payment App">%1$s</xliff:g> is default</string>
+
+    <!-- Summary of location screen [CHAR LIMIT=NONE] -->
+    <string name="location_on_summary">ON / <xliff:g id="location_mode" example="High accuracy">%1$s</xliff:g></string>
+
+    <!-- Location off [CHAR LIMIT=NONE] -->
+    <string name="location_off_summary">OFF</string>
+
+    <!-- Backup disabled summary [CHAR LIMIT=NONE] -->
+    <string name="backup_disabled">Back up disabled</string>
+
+    <!-- Summary of device info page [CHAR LIMIT=NONE] -->
+    <string name="about_summary">Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8b400ef..50ecaaa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -142,7 +142,7 @@
     <style name="SettingsPreferenceHeaderList" parent="@*android:style/PreferenceHeaderList">
     </style>
 
-    <style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment">
+    <style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
         <item name="android:layout">@layout/preference_list_fragment</item>
     </style>
 
@@ -299,7 +299,7 @@
     <style name="TextAppearance.Switch" parent="@android:style/TextAppearance.Material.Title" />
 
     <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Subhead" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0a265de..e72ad30 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -29,7 +29,7 @@
     <style name="SetupWizardDisableAppStartingTheme">
         <!-- Theme to disable the app starting window. The actual theme of the activity needs to
              be then set in code via setTheme or onApplyThemeResource. -->
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.SetupWizard</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
         <item name="android:windowBackground">@null</item>
     </style>
 
@@ -51,7 +51,7 @@
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.SetupWizard</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <!-- LockPatternView colors -->
         <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>
@@ -77,7 +77,7 @@
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.SetupWizard</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <!-- LockPatternView colors -->
         <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
@@ -85,7 +85,28 @@
         <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
     </style>
 
-    <style name="PreferenceThemeOverlay.SetupWizard" parent="PreferenceThemeOverlay.v14.Material">
+    <style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
+    <style name="SetupWizardTheme.Light.Transparent" parent="SetupWizardTheme.Light">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
+    <style name="PreferenceTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+        <item name="@android:preferenceStyle">@style/Preference</item>
+        <item name="@android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
+
+        <item name="apnPreferenceStyle">@style/ApnPreference</item>
+    </style>
+
+    <style name="PreferenceTheme.SetupWizard">
         <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
     </style>
 
@@ -100,17 +121,13 @@
     <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Settings" />
 
     <style name="Theme.Settings" parent="Theme.SettingsBase">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="@*android:preferenceStyle">@style/Preference</item>
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
         <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
         <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
         <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
         <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
-        <item name="@*android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
         <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
 
-        <item name="apnPreferenceStyle">@style/ApnPreference</item>
-
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="fingerprint_progress_bar_size">@dimen/fingerprint_progress_bar_size</item>
         <item name="fingerprint_ring_radius">@dimen/fingerprint_ring_radius</item>
@@ -183,7 +200,7 @@
     </style>
 
     <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
         <item name="android:actionBarWidgetTheme">@null</item>
         <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
 
@@ -240,6 +257,8 @@
 
     <style name="Theme.FingerprintEnroll" parent="@*android:style/Theme.Material.Settings.NoActionBar">
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
+
+        <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item>
     </style>
 
 </resources>
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index 1eb4dc1..39b9736 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -18,7 +18,7 @@
     android:title="@string/accessibility_autoclick_preference_title" >
 
 
-    <SeekBarPreference
+    <com.android.settings.SeekBarPreference
         android:key="autoclick_delay"
         android:title="@string/accessibility_autoclick_delay_preference_title"
         android:layout="@layout/preference_iconless_slider" />
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 881037d..791f1b8 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -68,6 +68,10 @@
                 android:title="@string/accessibility_toggle_speak_password_preference_title"
                 android:persistent="false"/>
 
+        <SwitchPreference
+                android:key="toggle_large_pointer_icon"
+                android:title="@string/accessibility_toggle_large_pointer_icon_title" />
+
         <PreferenceScreen
                 android:fragment="com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment"
                 android:key="enable_global_gesture_preference_screen"
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index b7557b2..6e27a07 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -26,30 +26,6 @@
             android:order="1"
             android:persistent="false" />
 
-    <!-- Priority -->
-    <SwitchPreference
-            android:key="priority"
-            android:title="@string/app_notification_priority_title"
-            android:summary="@string/app_notification_priority_summary"
-            android:order="2"
-            android:persistent="false" />
-
-    <!-- Peekable -->
-    <SwitchPreference
-            android:key="peekable"
-            android:title="@string/app_notification_peekable_title"
-            android:summary="@string/app_notification_peekable_summary"
-            android:order="3"
-            android:persistent="false" />
-
-    <!-- Sensitive -->
-    <SwitchPreference
-            android:key="sensitive"
-            android:title="@string/app_notification_sensitive_title"
-            android:summary="@string/app_notification_sensitive_summary"
-            android:order="4"
-            android:persistent="false" />
-
     <!-- App notification preferences -->
     <Preference
             android:key="app_settings"
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
new file mode 100644
index 0000000..aa15f06
--- /dev/null
+++ b/res/xml/configure_notification_settings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/configure_notification_settings"
+        android:key="configure_notification_settings" >
+
+    <!-- Pulse notification light -->
+    <SwitchPreference
+            android:key="notification_pulse"
+            android:title="@string/notification_pulse_title"
+            android:persistent="false" />
+
+    <!-- When device is locked -->
+    <com.android.settings.DropDownPreference
+            android:key="lock_screen_notifications"
+            android:title="@string/lock_screen_notifications_title"
+            android:persistent="false" />
+
+    <PreferenceCategory
+        android:key="advanced"
+        android:title="@string/advanced_section_header" >
+
+        <!-- Notification access -->
+        <Preference
+                android:key="manage_notification_access"
+                android:title="@string/manage_notification_access_title"
+                android:persistent="false"
+                android:fragment="com.android.settings.notification.NotificationAccessSettings" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
deleted file mode 100644
index d437dcf..0000000
--- a/res/xml/dashboard_categories.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<dashboard-categories
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- WIRELESS and NETWORKS -->
-    <dashboard-category
-            android:id="@+id/wireless_section"
-            android:key="@string/category_key_wireless"
-            android:title="@string/header_category_wireless_networks" >
-
-        <!-- Wifi -->
-        <dashboard-tile
-                android:id="@+id/wifi_settings"
-                android:title="@string/wifi_settings_title"
-                android:fragment="com.android.settings.wifi.WifiSettings"
-                android:icon="@drawable/ic_settings_wireless"
-                />
-
-        <!-- Bluetooth -->
-        <dashboard-tile
-                android:id="@+id/bluetooth_settings"
-                android:title="@string/bluetooth_settings_title"
-                android:fragment="com.android.settings.bluetooth.BluetoothSettings"
-                android:icon="@drawable/ic_settings_bluetooth"
-                />
-
-        <!-- SIM Cards -->
-        <dashboard-tile
-                android:id="@+id/sim_settings"
-                android:title="@string/sim_settings_title"
-                android:fragment="com.android.settings.sim.SimSettings"
-                android:icon="@drawable/ic_settings_sim"
-                />
-
-        <!-- Data Usage -->
-        <dashboard-tile
-                android:id="@+id/data_usage_settings"
-                android:title="@string/data_usage_summary_title"
-                android:fragment="com.android.settings.DataUsageSummary"
-                android:icon="@drawable/ic_settings_data_usage"
-                />
-
-        <!-- Operator hook -->
-        <dashboard-tile
-                android:id="@+id/operator_settings"
-                android:fragment="com.android.settings.WirelessSettings" >
-            <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" />
-        </dashboard-tile>
-
-        <!-- Other wireless and network controls -->
-        <dashboard-tile
-                android:id="@+id/wireless_settings"
-                android:title="@string/radio_controls_title"
-                android:fragment="com.android.settings.WirelessSettings"
-                android:icon="@drawable/ic_settings_more"
-                />
-
-    </dashboard-category>
-
-    <!-- DEVICE -->
-    <dashboard-category
-            android:id="@+id/device_section"
-            android:key="@string/category_key_device"
-            android:title="@string/header_category_device" >
-
-        <!-- Home -->
-        <dashboard-tile
-                android:id="@+id/home_settings"
-                android:title="@string/home_settings"
-                android:fragment="com.android.settings.HomeSettings"
-                android:icon="@drawable/ic_settings_home"
-                />
-
-        <!-- Display -->
-        <dashboard-tile
-                android:id="@+id/display_settings"
-                android:title="@string/display_settings"
-                android:fragment="com.android.settings.DisplaySettings"
-                android:icon="@drawable/ic_settings_display"
-                />
-
-        <!-- Notifications -->
-        <dashboard-tile
-                android:id="@+id/notification_settings"
-                android:title="@string/notification_settings"
-                android:fragment="com.android.settings.notification.NotificationSettings"
-                android:icon="@drawable/ic_settings_notifications"
-                />
-
-        <!-- Application Settings -->
-        <dashboard-tile
-                android:id="@+id/application_settings"
-                android:title="@string/applications_settings"
-                android:fragment="com.android.settings.applications.ManageApplications"
-                android:icon="@drawable/ic_settings_applications"
-                />
-
-        <!-- Storage -->
-        <dashboard-tile
-                android:id="@+id/storage_settings"
-                android:title="@string/storage_usb_settings"
-                android:fragment="com.android.settings.deviceinfo.StorageSettings"
-                android:icon="@drawable/ic_settings_storage"
-                />
-
-        <!-- Battery -->
-        <dashboard-tile
-                android:id="@+id/battery_settings"
-                android:title="@string/power_usage_summary_title"
-                android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
-                android:icon="@drawable/ic_settings_battery"
-                />
-
-        <!-- Memory -->
-        <dashboard-tile
-                android:id="@+id/manage_memory"
-                android:title="@string/memory_settings_title"
-                android:fragment="com.android.settings.applications.ProcessStatsSummary"
-                android:icon="@drawable/ic_settings_memory"
-                />
-
-        <!-- Manage users -->
-        <dashboard-tile
-                android:id="@+id/user_settings"
-                android:title="@string/user_settings_title"
-                android:fragment="com.android.settings.users.UserSettings"
-                android:icon="@drawable/ic_settings_multiuser"
-                />
-
-        <!-- Manage NFC payment apps -->
-        <dashboard-tile
-                android:id="@+id/nfc_payment_settings"
-                android:title="@string/nfc_payment_settings_title"
-                android:fragment="com.android.settings.nfc.PaymentSettings"
-                android:icon="@drawable/ic_settings_nfc_payment"
-                />
-
-        <!-- Manufacturer hook -->
-        <dashboard-tile
-                android:id="@+id/manufacturer_settings"
-                android:fragment="com.android.settings.WirelessSettings">
-            <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
-        </dashboard-tile>
-
-    </dashboard-category>
-
-    <!-- PERSONAL -->
-    <dashboard-category
-            android:id="@+id/personal_section"
-            android:key="@string/category_key_personal"
-            android:title="@string/header_category_personal" >
-
-        <!-- Location -->
-        <dashboard-tile
-                android:id="@+id/location_settings"
-                android:title="@string/location_settings_title"
-                android:fragment="com.android.settings.location.LocationSettings"
-                android:icon="@drawable/ic_settings_location"
-                />
-
-        <!-- Security -->
-        <dashboard-tile
-                android:id="@+id/security_settings"
-                android:title="@string/security_settings_title"
-                android:fragment="com.android.settings.SecuritySettings"
-                android:icon="@drawable/ic_settings_security"
-                />
-
-        <!-- Account -->
-        <dashboard-tile
-                android:id="@+id/account_settings"
-                android:title="@string/account_settings_title"
-                android:fragment="com.android.settings.accounts.AccountSettings"
-                android:icon="@drawable/ic_settings_accounts"
-                />
-
-        <!-- Marker for where to place external tiles in this category -->
-        <external-tiles />
-
-        <!-- Language -->
-        <dashboard-tile
-                android:id="@+id/language_settings"
-                android:title="@string/language_settings"
-                android:fragment="com.android.settings.inputmethod.InputMethodAndLanguageSettings"
-                android:icon="@drawable/ic_settings_language"
-                />
-
-        <!-- Backup and reset -->
-        <dashboard-tile
-                android:id="@+id/privacy_settings"
-                android:title="@string/privacy_settings"
-                android:fragment="com.android.settings.PrivacySettings"
-                android:icon="@drawable/ic_settings_backup"
-                />
-
-    </dashboard-category>
-
-    <!-- SYSTEM -->
-    <dashboard-category
-        android:id="@+id/system_section"
-        android:key="@string/category_key_system"
-        android:title="@string/header_category_system" >
-
-        <!-- Date & Time -->
-        <dashboard-tile
-                android:id="@+id/date_time_settings"
-                android:title="@string/date_and_time_settings_title"
-                android:fragment="com.android.settings.DateTimeSettings"
-                android:icon="@drawable/ic_settings_date_time"
-                />
-
-        <!-- Accessibility feedback -->
-        <dashboard-tile
-                android:id="@+id/accessibility_settings"
-                android:title="@string/accessibility_settings"
-                android:fragment="com.android.settings.accessibility.AccessibilitySettings"
-                android:icon="@drawable/ic_settings_accessibility"
-                />
-
-        <!-- Print -->
-        <dashboard-tile
-                android:id="@+id/print_settings"
-                android:title="@string/print_settings"
-                android:fragment="com.android.settings.print.PrintSettingsFragment"
-                android:icon="@drawable/ic_settings_print"
-                />
-
-        <!-- Development -->
-        <dashboard-tile
-                android:id="@+id/development_settings"
-                android:title="@string/development_settings_title"
-                android:fragment="com.android.settings.DevelopmentSettings"
-                android:icon="@drawable/ic_settings_development"
-                />
-
-        <!-- About Device -->
-        <dashboard-tile
-                android:id="@+id/about_settings"
-                android:title="@string/about_settings"
-                android:fragment="com.android.settings.DeviceInfoSettings"
-                android:icon="@drawable/ic_settings_about"
-                />
-
-    </dashboard-category>
-
-</dashboard-categories>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 8417e48..d3c8852 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -67,6 +67,12 @@
         android:entries="@array/night_mode_entries"
         android:entryValues="@array/night_mode_values" />
 
+    <PreferenceScreen
+        android:key="convert_to_file_encryption"
+        android:title="@string/convert_to_file_encryption"
+        android:summary="@string/convert_to_file_encryption_enabled"
+        android:fragment="com.android.settings.applications.ConvertToFbe" />
+
     <com.android.settings.ColorModePreference
         android:key="color_mode"
         android:title="@string/picture_color_mode"
@@ -334,6 +340,10 @@
             android:entries="@array/app_process_limit_entries"
             android:entryValues="@array/app_process_limit_values" />
 
+        <Preference
+                android:key="background_check"
+                android:title="@string/background_check_pref" />
+
         <SwitchPreference
             android:key="show_all_anrs"
             android:title="@string/show_all_anrs"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index ad23bc2..60730a9 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -99,6 +99,13 @@
                 android:entries="@array/entries_font_size"
                 android:entryValues="@array/entryvalues_font_size" />
 
+        <com.android.settings.DisplayDensityPreference
+                android:key="display_density"
+                android:title="@string/force_density_preference_title"
+                android:summary="%s"
+                settings:keywords="@string/force_density_keywords"
+                android:persistent="false" />
+
         <com.android.settings.DropDownPreference
                 android:key="auto_rotate"
                 android:title="@string/display_auto_rotate_title" />
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 2cd86f5..4ccc14a 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -27,19 +27,13 @@
             android:summary="@string/location_mode_location_off_title" />
 
         <!-- This preference category gets removed if there is no managed profile -->
-        <PreferenceCategory
-            android:key="managed_profile_location_category"
-            android:title="@string/managed_profile_location_category">
-
-            <Preference
-                android:key="managed_profile_location_switch"
-                android:title="@string/managed_profile_location_switch_title"
-                android:summary="@string/managed_profile_location_switch_lockdown"
-                android:persistent="false"
-                android:enabled="false"
-                android:selectable="false" />
-
-        </PreferenceCategory>
+        <SwitchPreference
+            android:key="managed_profile_location_switch"
+            android:title="@string/managed_profile_location_switch_title"
+            android:summary="@string/managed_profile_location_switch_lockdown"
+            android:persistent="false"
+            android:enabled="false"
+            android:selectable="true" />
 
         <PreferenceCategory
             android:key="recent_location_requests"
diff --git a/res/xml/notification_settings.xml b/res/xml/sound_settings.xml
similarity index 63%
rename from res/xml/notification_settings.xml
rename to res/xml/sound_settings.xml
index 43fd116..652310f 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2015 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,13 +16,9 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/notification_settings"
-        android:key="notification_settings"
-        settings:keywords="@string/keywords_sounds_and_notifications">
-
-    <PreferenceCategory
-        android:key="sound"
-        android:title="@string/sound_settings" >
+        android:title="@string/sound_settings"
+        android:key="sound_settings"
+        settings:keywords="@string/keywords_sounds">
 
         <!-- Media volume -->
         <com.android.settings.notification.VolumeSeekBarPreference
@@ -77,6 +73,15 @@
                 android:persistent="false"
                 android:ringtoneType="notification" />
 
+        <PreferenceScreen
+                android:key="cell_broadcast_settings"
+                android:title="@string/cell_broadcast_settings" >
+                <intent
+                        android:action="android.intent.action.MAIN"
+                        android:targetPackage="com.android.cellbroadcastreceiver"
+                        android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+        </PreferenceScreen>
+
         <!-- Other sounds -->
         <Preference
                 android:key="other_sounds"
@@ -90,54 +95,4 @@
                 android:title="@string/wifi_display_settings_title"
                 android:fragment="com.android.settings.wfd.WifiDisplaySettings" />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="notification"
-        android:title="@string/notification_section_header" >
-
-        <!-- Pulse notification light -->
-        <SwitchPreference
-                android:key="notification_pulse"
-                android:title="@string/notification_pulse_title"
-                android:persistent="false" />
-
-         <!-- When device is locked -->
-        <com.android.settings.DropDownPreference
-                android:key="lock_screen_notifications"
-                android:title="@string/lock_screen_notifications_title"
-                android:persistent="false" />
-
-        <!-- App notifications -->
-        <PreferenceScreen
-                android:key="app_notifications"
-                android:title="@string/app_notifications_title"
-                android:fragment="com.android.settings.applications.ManageApplications">
-                <extra
-                    android:name="classname"
-                    android:value="com.android.settings.Settings$NotificationAppListActivity" />
-        </PreferenceScreen>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="advanced"
-        android:title="@string/advanced_section_header" >
-
-        <!-- Notification access -->
-        <Preference
-                android:key="manage_notification_access"
-                android:title="@string/manage_notification_access_title"
-                android:persistent="false"
-                android:fragment="com.android.settings.notification.NotificationAccessSettings" />
-
-        <!-- Do Not Disturb access -->
-        <Preference
-                android:key="manage_zen_access"
-                android:title="@string/manage_zen_access_title"
-                android:persistent="false"
-                android:fragment="com.android.settings.notification.ZenAccessSettings" />
-
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/topic_notification_settings.xml b/res/xml/topic_notification_settings.xml
new file mode 100644
index 0000000..174c273
--- /dev/null
+++ b/res/xml/topic_notification_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/topic_notifications_title"
+        android:key="topic_notification_settings">
+
+    <!-- Importance -->
+    <com.android.settings.notification.ImportanceSeekBarPreference
+            android:key="importance"
+            android:title="@string/app_notification_importance_title"
+            android:order="1"
+            android:persistent="false" />
+
+    <!-- Bypass DND -->
+    <SwitchPreference
+            android:key="bypass_dnd"
+            android:title="@string/app_notification_override_dnd_title"
+            android:summary="@string/app_notification_override_dnd_summary"
+            android:order="2"
+            android:persistent="false" />
+
+    <!-- Sensitive -->
+    <SwitchPreference
+            android:key="sensitive"
+            android:title="@string/app_notification_sensitive_title"
+            android:summary="@string/app_notification_sensitive_summary"
+            android:order="4"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index ed6cfbd..8d9a6cd 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -17,35 +17,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_advanced_titlebar">
 
-    <!-- android:dependency="enable_wifi" -->
-    <SwitchPreference
-            android:key="notify_open_networks"
-            android:title="@string/wifi_notify_open_networks"
-            android:summary="@string/wifi_notify_open_networks_summary"
-            android:persistent="false" />
-
-    <ListPreference
-            android:key="sleep_policy"
-            android:title="@string/wifi_setting_sleep_policy_title"
-            android:persistent="false"
-            android:entries="@array/wifi_sleep_policy_entries"
-            android:entryValues="@array/wifi_sleep_policy_values" />
-
-    <com.android.settings.AppListSwitchPreference
-            android:key="wifi_assistant"
-            android:title="@string/wifi_automatically_connect_title"
-            android:summary="@string/wifi_automatically_connect_summary"
-            android:dialogTitle="@string/wifi_select_assistant_dialog_title"
-            android:persistent="false" />
-
-    <ListPreference
-            android:key="frequency_band"
-            android:title="@string/wifi_setting_frequency_band_title"
-            android:summary="@string/wifi_setting_frequency_band_summary"
-            android:persistent="false"
-            android:entries="@array/wifi_frequency_band_entries"
-            android:entryValues="@array/wifi_frequency_band_values" />
-
     <Preference
             android:key="install_credentials"
             android:title="@string/wifi_install_credentials"
@@ -66,14 +37,4 @@
             android:title="@string/wifi_menu_wps_pin"
             android:persistent="false" />
 
-    <Preference
-            android:key="mac_address"
-            android:title="@string/wifi_advanced_mac_address_title"
-            android:layout="@layout/wifi_advance_layout" />
-
-    <Preference
-            android:key="current_ip_address"
-            android:title="@string/wifi_advanced_ip_address_title"
-            android:layout="@layout/wifi_advance_layout" />
-
-</PreferenceScreen>   
+</PreferenceScreen>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
new file mode 100644
index 0000000..15e524a
--- /dev/null
+++ b/res/xml/wifi_configure_settings.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wifi_configure_titlebar">
+
+    <Preference
+        android:key="saved_networks"
+        android:title="@string/wifi_saved_access_points_label"
+        android:fragment="com.android.settings.wifi.SavedAccessPointsWifiSettings" />
+
+    <!-- android:dependency="enable_wifi" -->
+    <SwitchPreference
+        android:key="notify_open_networks"
+        android:title="@string/wifi_notify_open_networks"
+        android:summary="@string/wifi_notify_open_networks_summary"
+        android:persistent="false" />
+
+    <ListPreference
+        android:key="sleep_policy"
+        android:title="@string/wifi_setting_sleep_policy_title"
+        android:persistent="false"
+        android:entries="@array/wifi_sleep_policy_entries"
+        android:entryValues="@array/wifi_sleep_policy_values" />
+
+    <com.android.settings.AppListSwitchPreference
+        android:key="wifi_assistant"
+        android:title="@string/wifi_automatically_connect_title"
+        android:summary="@string/wifi_automatically_connect_summary"
+        android:dialogTitle="@string/wifi_select_assistant_dialog_title"
+        android:persistent="false" />
+
+    <ListPreference
+        android:key="frequency_band"
+        android:title="@string/wifi_setting_frequency_band_title"
+        android:summary="@string/wifi_setting_frequency_band_summary"
+        android:persistent="false"
+        android:entries="@array/wifi_frequency_band_entries"
+        android:entryValues="@array/wifi_frequency_band_values" />
+
+    <Preference
+        android:key="mac_address"
+        android:title="@string/wifi_advanced_mac_address_title"
+        android:layout="@layout/wifi_advance_layout" />
+
+    <Preference
+        android:key="current_ip_address"
+        android:title="@string/wifi_advanced_ip_address_title"
+        android:layout="@layout/wifi_advance_layout" />
+
+</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 96f26ac..2d25ed5 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -81,13 +81,4 @@
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title" />
 
-    <PreferenceScreen
-        android:key="cell_broadcast_settings"
-        android:title="@string/cell_broadcast_settings" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.cellbroadcastreceiver"
-            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
-    </PreferenceScreen>
-
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 267727f..d8ad10d 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -25,9 +25,15 @@
             android:title="@string/zen_mode_priority_settings_title"
             android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
 
-    <!-- Downtime -->
+    <!-- Automated rules -->
     <PreferenceScreen
             android:key="automation_settings"
             android:title="@string/zen_mode_automation_settings_title"
             android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
+
+    <!-- Visual interruptions -->
+    <PreferenceScreen
+            android:key="visual_interruptions_settings"
+            android:title="@string/zen_mode_visual_interruptions_settings_title"
+            android:fragment="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_visual_interruptions_settings.xml b/res/xml/zen_mode_visual_interruptions_settings.xml
new file mode 100644
index 0000000..8131650
--- /dev/null
+++ b/res/xml/zen_mode_visual_interruptions_settings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:title="@string/zen_mode_visual_interruptions_settings_title" >
+
+    <SwitchPreference android:key="peek"
+                      android:title="@string/zen_mode_peek"
+                      android:summary="@string/zen_mode_peek_summary"
+                      android:persistent="false" />
+
+    <SwitchPreference android:key="lights"
+                      android:title="@string/zen_mode_lights"
+                      android:summary="@string/zen_mode_lights_summary"
+                      android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/AppListSwitchPreference.java b/src/com/android/settings/AppListSwitchPreference.java
index cb656d1..007f243 100644
--- a/src/com/android/settings/AppListSwitchPreference.java
+++ b/src/com/android/settings/AppListSwitchPreference.java
@@ -24,7 +24,7 @@
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
-        mSwitch = (Checkable) view.findViewById(com.android.internal.R.id.switchWidget);
+        mSwitch = (Checkable) view.findViewById(com.android.internal.R.id.switch_widget);
         mSwitch.setChecked(getValue() != null);
     }
 
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index 3304fd7..4c3fb7b 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -59,7 +59,7 @@
      * @return true if one exists and we launched an activity to confirm it
      * @see Activity#onActivityResult(int, int, android.content.Intent)
      */
-    boolean launchConfirmationActivity(int request, CharSequence title) {
+    public boolean launchConfirmationActivity(int request, CharSequence title) {
         return launchConfirmationActivity(request, title, null, null, false, false);
     }
 
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 3c1bc6f0..ac27540 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -31,19 +31,13 @@
 import android.view.View.MeasureSpec;
 import android.widget.ImageView;
 import android.widget.ListView;
-
 import com.android.settings.Settings.TetherSettingsActivity;
-import com.android.settings.dashboard.DashboardCategory;
-import com.android.settings.dashboard.DashboardTile;
 import com.android.settingslib.TetherUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class CreateShortcut extends LauncherActivity {
 
-    private static final String TOP_LEVEL_HEADER = "com.android.settings.TOP_LEVEL_HEADER_ID";
-
     @Override
     protected Intent getTargetIntent() {
         Intent targetIntent = new Intent(Intent.ACTION_MAIN, null);
@@ -63,10 +57,8 @@
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);
         ResolveInfo resolveInfo = itemForPosition(position).resolveInfo;
         ActivityInfo activityInfo = resolveInfo.activityInfo;
-        if (activityInfo.metaData != null && activityInfo.metaData.containsKey(TOP_LEVEL_HEADER)) {
-            int topLevelId = activityInfo.metaData.getInt(TOP_LEVEL_HEADER);
-            int resourceId = getDrawableResource(topLevelId);
-            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createIcon(resourceId));
+        if (activityInfo.icon != 0) {
+            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createIcon(activityInfo.icon));
         }
         setResult(RESULT_OK, intent);
         finish();
@@ -87,19 +79,6 @@
         return bitmap;
     }
 
-    private int getDrawableResource(int topLevelId) {
-        ArrayList<DashboardCategory> categories = new ArrayList<>();
-        SettingsActivity.loadCategoriesFromResource(R.xml.dashboard_categories, categories, this);
-        for (DashboardCategory category : categories) {
-            for (DashboardTile tile : category.tiles) {
-                if (tile.id == topLevelId) {
-                    return tile.iconRes;
-                }
-            }
-        }
-        return 0;
-    }
-
     @Override
     protected boolean onEvaluateShowIcons() {
         return false;
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 90ea622..1b37066 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -107,6 +107,8 @@
     private static final String FORCE_VIEW_ERROR = "error";
     private static final String FORCE_VIEW_PASSWORD = "password";
 
+    private static final String STATE_COOLDOWN = "cooldown";
+
     /** When encryption is detected, this flag indicates whether or not we've checked for errors. */
     private boolean mValidationComplete;
     private boolean mValidationRequested;
@@ -426,6 +428,10 @@
         mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
         mStatusBar.disable(sWidgetsToDisable);
 
+        if (savedInstanceState != null) {
+            mCooldown = savedInstanceState.getBoolean(STATE_COOLDOWN);
+        }
+
         setAirplaneModeIfNecessary();
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         // Check for (and recover) retained instance data
@@ -437,6 +443,11 @@
         }
     }
 
+    @Override
+    public void  onSaveInstanceState(Bundle savedInstanceState) {
+        savedInstanceState.putBoolean(STATE_COOLDOWN, mCooldown);
+    }
+
     /**
      * Note, we defer the state check and screen setup to onStart() because this will be
      * re-run if the user clicks the power button (sleeping/waking the screen), and this is
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index ddf04c9..3fe0a46 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.animation.LayoutTransition;
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -24,8 +25,6 @@
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.app.LoaderManager.LoaderCallbacks;
-import android.icu.impl.ICUResourceBundle;
-import android.icu.util.UResourceBundle;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -39,6 +38,8 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.icu.impl.ICUResourceBundle;
+import android.icu.util.UResourceBundle;
 import android.net.ConnectivityManager;
 import android.net.INetworkPolicyManager;
 import android.net.INetworkStatsService;
@@ -95,9 +96,9 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.drawable.InsetBoundsDrawable;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -110,11 +111,11 @@
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
+import com.android.settingslib.net.MobileDataController;
 import com.android.settingslib.net.SummaryForAllUidLoader;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 import com.google.android.collect.Lists;
-
 import libcore.util.Objects;
 
 import java.util.ArrayList;
@@ -551,7 +552,8 @@
 
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
-        final Context context = getActivity();
+        final Context context = getContext();
+        if (context == null) return;
         final boolean appDetailMode = isAppDetailMode();
         final boolean isAdmin = mUserManager.isAdminUser();
 
@@ -2688,6 +2690,116 @@
         summary.setText(string);
     }
 
+    private void addMobileTab(Context context, SubscriptionInfo subInfo, boolean isMultiSim) {
+        if (subInfo != null && mMobileTagMap != null) {
+            if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                if (isMultiSim) {
+                    mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+                            subInfo.getDisplayName()));
+                } else {
+                    mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+                            R.string.data_usage_tab_mobile));
+                }
+            }
+        } else {
+            if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");
+        }
+    }
+
+    private SubscriptionInfo getCurrentTabSubInfo(Context context) {
+        if (mSubInfoList != null && mTabHost != null) {
+            final int currentTagIndex = mTabHost.getCurrentTab();
+            int i = 0;
+            for (SubscriptionInfo subInfo : mSubInfoList) {
+                if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                    if (i++ == currentTagIndex) {
+                        return subInfo;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Init a map with subId key and mobile tag name
+     * @param subInfoList The subscription Info List
+     * @return The map or null if no activated subscription
+     */
+    private Map<Integer, String> initMobileTabTag(List<SubscriptionInfo> subInfoList) {
+        Map<Integer, String> map = null;
+        if (subInfoList != null) {
+            String mobileTag;
+            map = new HashMap<Integer, String>();
+            for (SubscriptionInfo subInfo : subInfoList) {
+                mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
+                map.put(subInfo.getSubscriptionId(), mobileTag);
+            }
+        }
+        return map;
+    }
+
+    private static boolean isMobileTab(String currentTab) {
+        return currentTab != null ? currentTab.contains(TAB_MOBILE) : false;
+    }
+
+    private int getSubId(String currentTab) {
+        if (mMobileTagMap != null) {
+            Set<Integer> set = mMobileTagMap.keySet();
+            for (Integer subId : set) {
+                if (mMobileTagMap.get(subId).equals(currentTab)) {
+                    return subId;
+                }
+            }
+        }
+        Log.e(TAG, "currentTab = " + currentTab + " non mobile tab called this function");
+        return -1;
+    }
+
+    private boolean isMobileDataAvailable(int subId) {
+        return mSubscriptionManager.getActiveSubscriptionInfo(subId) != null;
+    }
+
+    private static class SummaryProvider
+            implements SummaryLoader.SummaryProvider {
+
+        private final Activity mActivity;
+        private final SummaryLoader mSummaryLoader;
+        private final MobileDataController mDataController;
+
+        public SummaryProvider(Activity activity, SummaryLoader summaryLoader) {
+            mActivity = activity;
+            mSummaryLoader = summaryLoader;
+            mDataController = new MobileDataController(activity);
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                MobileDataController.DataUsageInfo info = mDataController.getDataUsageInfo();
+                String used;
+                if (info == null) {
+                    used = Formatter.formatFileSize(mActivity, 0);
+                } else if (info.limitLevel <= 0) {
+                    used = Formatter.formatFileSize(mActivity, info.usageLevel);
+                } else {
+                    used = Utils.formatPercentage(info.usageLevel, info.limitLevel);
+                }
+                mSummaryLoader.setSummary(this,
+                        mActivity.getString(R.string.data_usage_summary_format, used));
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     /**
      * For search
      */
@@ -2729,74 +2841,4 @@
                 return result;
             }
         };
-
-        private void addMobileTab(Context context, SubscriptionInfo subInfo, boolean isMultiSim) {
-            if (subInfo != null && mMobileTagMap != null) {
-                if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
-                    if (isMultiSim) {
-                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
-                                subInfo.getDisplayName()));
-                    } else {
-                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
-                                R.string.data_usage_tab_mobile));
-                    }
-                }
-            } else {
-                if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");
-            }
-        }
-
-        private SubscriptionInfo getCurrentTabSubInfo(Context context) {
-            if (mSubInfoList != null && mTabHost != null) {
-                final int currentTagIndex = mTabHost.getCurrentTab();
-                int i = 0;
-                for (SubscriptionInfo subInfo : mSubInfoList) {
-                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
-                        if (i++ == currentTagIndex) {
-                            return subInfo;
-                        }
-                    }
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Init a map with subId key and mobile tag name
-         * @param subInfoList The subscription Info List
-         * @return The map or null if no activated subscription
-         */
-        private Map<Integer, String> initMobileTabTag(List<SubscriptionInfo> subInfoList) {
-            Map<Integer, String> map = null;
-            if (subInfoList != null) {
-                String mobileTag;
-                map = new HashMap<Integer, String>();
-                for (SubscriptionInfo subInfo : subInfoList) {
-                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
-                    map.put(subInfo.getSubscriptionId(), mobileTag);
-                }
-            }
-            return map;
-        }
-
-        private static boolean isMobileTab(String currentTab) {
-            return currentTab != null ? currentTab.contains(TAB_MOBILE) : false;
-        }
-
-        private int getSubId(String currentTab) {
-            if (mMobileTagMap != null) {
-                Set<Integer> set = mMobileTagMap.keySet();
-                for (Integer subId : set) {
-                    if (mMobileTagMap.get(subId).equals(currentTab)) {
-                        return subId;
-                    }
-                }
-            }
-            Log.e(TAG, "currentTab = " + currentTab + " non mobile tab called this function");
-            return -1;
-        }
-
-        private boolean isMobileDataAvailable(int subId) {
-            return mSubscriptionManager.getActiveSubscriptionInfo(subId) != null;
-        }
 }
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 0540575..d92d610 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -38,6 +38,7 @@
 import android.widget.TimePicker;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.datetime.ZoneGetter;
 
 import java.util.Calendar;
@@ -353,4 +354,33 @@
             }
         }
     };
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                final Calendar now = Calendar.getInstance();
+                mSummaryLoader.setSummary(this, ZoneGetter.getTimeZoneOffsetAndName(
+                        now.getTimeZone(), now.getTime()));
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
 }
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 173a51a..950af3c 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -53,6 +53,8 @@
 import android.os.StrictMode;
 import android.os.SystemProperties;
 import android.os.UserManager;
+import android.os.storage.IMountService;
+import android.os.storage.StorageManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.provider.Settings.Global;
@@ -64,7 +66,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.HardwareRenderer;
+import android.view.ThreadedRenderer;
 import android.view.IWindowManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -74,6 +76,7 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.applications.BackgroundCheckSummary;
 import com.android.settings.fuelgauge.InactiveApps;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -168,6 +171,8 @@
             = "immediately_destroy_activities";
     private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
 
+    private static final String BACKGROUND_CHECK_KEY = "background_check";
+
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
@@ -175,6 +180,7 @@
     private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
 
     private static final String KEY_NIGHT_MODE = "night_mode";
+    private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
 
     private static final int RESULT_DEBUG_APP = 1000;
     private static final int RESULT_MOCK_LOCATION_APP = 1001;
@@ -295,7 +301,11 @@
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
 
         if (!mUm.isAdminUser()
-                || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) {
+                || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)
+                || Settings.Global.getInt(getActivity().getContentResolver(),
+                        Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
+            // Block access to developer options if the user is not the owner, if user policy
+            // restricts it, or if the device has not been provisioned
             mUnavailable = true;
             setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
             return;
@@ -407,6 +417,23 @@
             removePreferenceForProduction(hdcpChecking);
         }
 
+        PreferenceScreen convertFbePreference =
+            (PreferenceScreen) findPreference(KEY_CONVERT_FBE);
+
+        try {
+            IBinder service = ServiceManager.getService("mount");
+            IMountService mountService = IMountService.Stub.asInterface(service);
+            if (!mountService.isConvertibleToFBE()) {
+                removePreference(KEY_CONVERT_FBE);
+            } else if ("file".equals(SystemProperties.get("ro.crypto.type", "none"))) {
+                convertFbePreference.setEnabled(false);
+                convertFbePreference.setSummary(getResources()
+                                   .getString(R.string.convert_to_file_encryption_done));
+            }
+        } catch(RemoteException e) {
+            removePreference(KEY_CONVERT_FBE);
+        }
+
         mNightModePreference = (DropDownPreference) findPreference(KEY_NIGHT_MODE);
         final UiModeManager uiManager = (UiModeManager) getSystemService(
                 Context.UI_MODE_SERVICE);
@@ -594,7 +621,7 @@
                             == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         }
         updateSwitchPreference(mBugreportInPower, Settings.Secure.getInt(cr,
-                Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
+                Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0);
         updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
         updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr,
@@ -858,34 +885,19 @@
     }
 
     private void updateBugreportOptions() {
-        final ComponentName bugreportStorageProviderComponentName =
-                new ComponentName("com.android.shell",
-                        "com.android.shell.BugreportStorageProvider");
-        if ("user".equals(Build.TYPE)) {
-            final ContentResolver resolver = getActivity().getContentResolver();
-            final boolean adbEnabled = Settings.Global.getInt(
-                    resolver, Settings.Global.ADB_ENABLED, 0) != 0;
-            if (adbEnabled) {
-                mBugreport.setEnabled(true);
-                mBugreportInPower.setEnabled(true);
-                getPackageManager().setComponentEnabledSetting(
-                        bugreportStorageProviderComponentName,
-                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
-            } else {
-                mBugreport.setEnabled(false);
-                mBugreportInPower.setEnabled(false);
-                mBugreportInPower.setChecked(false);
-                Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
-                getPackageManager().setComponentEnabledSetting(
-                        bugreportStorageProviderComponentName,
-                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
-            }
-        } else {
-            mBugreportInPower.setEnabled(true);
-            getPackageManager().setComponentEnabledSetting(
-                    bugreportStorageProviderComponentName,
-                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
-        }
+        mBugreport.setEnabled(true);
+        mBugreportInPower.setEnabled(true);
+        setBugreportStorageProviderStatus();
+    }
+
+    private void setBugreportStorageProviderStatus() {
+        final ComponentName componentName = new ComponentName("com.android.shell",
+                "com.android.shell.BugreportStorageProvider");
+        final boolean enabled = mBugreportInPower.isChecked();
+        getPackageManager().setComponentEnabledSetting(componentName,
+                enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                        : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                0);
     }
 
     // Returns the current state of the system property that controls
@@ -1014,7 +1026,7 @@
     }
 
     private void updateTrackFrameTimeOptions() {
-        String value = SystemProperties.get(HardwareRenderer.PROFILE_PROPERTY);
+        String value = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
         if (value == null) {
             value = "";
         }
@@ -1032,7 +1044,7 @@
     }
 
     private void writeTrackFrameTimeOptions(Object newValue) {
-        SystemProperties.set(HardwareRenderer.PROFILE_PROPERTY,
+        SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
                 newValue == null ? "" : newValue.toString());
         pokeSystemProperties();
         updateTrackFrameTimeOptions();
@@ -1040,7 +1052,7 @@
 
     private void updateShowNonRectClipOptions() {
         String value = SystemProperties.get(
-                HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
+                ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
         if (value == null) {
             value = "hide";
         }
@@ -1058,7 +1070,7 @@
     }
 
     private void writeShowNonRectClipOptions(Object newValue) {
-        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
                 newValue == null ? "" : newValue.toString());
         pokeSystemProperties();
         updateShowNonRectClipOptions();
@@ -1066,28 +1078,28 @@
 
     private void updateShowHwScreenUpdatesOptions() {
         updateSwitchPreference(mShowHwScreenUpdates,
-                SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
+                SystemProperties.getBoolean(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
     }
 
     private void writeShowHwScreenUpdatesOptions() {
-        SystemProperties.set(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+        SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
                 mShowHwScreenUpdates.isChecked() ? "true" : null);
         pokeSystemProperties();
     }
 
     private void updateShowHwLayersUpdatesOptions() {
         updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean(
-                HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
+                ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
     }
 
     private void writeShowHwLayersUpdatesOptions() {
-        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+        SystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
                 mShowHwLayersUpdates.isChecked() ? "true" : null);
         pokeSystemProperties();
     }
 
     private void updateDebugHwOverdrawOptions() {
-        String value = SystemProperties.get(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY);
+        String value = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
         if (value == null) {
             value = "";
         }
@@ -1105,7 +1117,7 @@
     }
 
     private void writeDebugHwOverdrawOptions(Object newValue) {
-        SystemProperties.set(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY,
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY,
                 newValue == null ? "" : newValue.toString());
         pokeSystemProperties();
         updateDebugHwOverdrawOptions();
@@ -1624,8 +1636,9 @@
                             : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
         } else if (preference == mBugreportInPower) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.BUGREPORT_IN_POWER_MENU,
+                    Settings.Global.BUGREPORT_IN_POWER_MENU,
                     mBugreportInPower.isChecked() ? 1 : 0);
+            setBugreportStorageProviderStatus();
         } else if (preference == mKeepScreenOn) {
             Settings.Global.putInt(getActivity().getContentResolver(),
                     Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
@@ -1708,6 +1721,8 @@
             writeForceResizableOptions();
         } else if (INACTIVE_APPS_KEY.equals(preference.getKey())) {
             startInactiveAppsFragment();
+        } else if (BACKGROUND_CHECK_KEY.equals(preference.getKey())) {
+            startBackgroundCheckFragment();
         } else {
             return super.onPreferenceTreeClick(preference);
         }
@@ -1721,6 +1736,12 @@
                 null, R.string.inactive_apps_title, null, null, 0);
     }
 
+    private void startBackgroundCheckFragment() {
+        ((SettingsActivity) getActivity()).startPreferencePanel(
+                BackgroundCheckSummary.class.getName(),
+                null, R.string.background_check_title, null, null, 0);
+    }
+
     private boolean showKeyguardConfirmation(Resources resources, int requestCode) {
         return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
                 requestCode, resources.getString(R.string.oem_unlock_enable));
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 19ad25b..acd8c3b 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -303,16 +303,16 @@
                     }
                     mWaitingForRemoveMsg = true;
                     mDPM.getRemoveWarning(mDeviceAdmin.getComponent(),
-                            new RemoteCallback(mHandler) {
-                        @Override
-                        protected void onResult(Bundle bundle) {
-                            CharSequence msg = bundle != null
-                                    ? bundle.getCharSequence(
+                            new RemoteCallback(new RemoteCallback.OnResultListener() {
+                                @Override
+                                public void onResult(Bundle result) {
+                                    CharSequence msg = result != null
+                                            ? result.getCharSequence(
                                             DeviceAdminReceiver.EXTRA_DISABLE_WARNING)
-                                    : null;
-                            continueRemoveAction(msg);
-                        }
-                    });
+                                            : null;
+                                    continueRemoveAction(msg);
+                                }
+                            }, mHandler));
                     // Don't want to wait too long.
                     getWindow().getDecorView().getHandler().postDelayed(new Runnable() {
                         @Override public void run() {
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 9eb1ddb..5324983 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -108,10 +108,10 @@
         filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
         getActivity().registerReceiverAsUser(
                 mBroadcastReceiver, UserHandle.ALL, filter, null, null);
-        mDeviceOwnerPkg = mDPM.getDeviceOwner();
-        if (mDeviceOwnerPkg != null && !mDPM.isDeviceOwner(mDeviceOwnerPkg)) {
-            mDeviceOwnerPkg = null;
-        }
+
+        final ComponentName deviceOwnerComponent = mDPM.getDeviceOwnerComponentOnAnyUser();
+        mDeviceOwnerPkg =
+                deviceOwnerComponent != null ? deviceOwnerComponent.getPackageName() : null;
         mProfileOwnerComponents.clear();
         final List<UserHandle> profiles = mUm.getUserProfiles();
         final int profilesSize = profiles.size();
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 9c4de4b..95f1a83 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -19,9 +19,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
@@ -35,33 +32,23 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.telephony.CarrierConfigManager;
 import android.text.TextUtils;
-import android.text.format.DateFormat;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.DeviceInfoUtils;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class DeviceInfoSettings extends SettingsPreferenceFragment implements Indexable {
 
     private static final String LOG_TAG = "DeviceInfoSettings";
-    private static final String FILENAME_PROC_VERSION = "/proc/version";
-    private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";
 
     private static final String KEY_MANUAL = "manual";
     private static final String KEY_REGULATORY_INFO = "regulatory_info";
@@ -108,28 +95,21 @@
 
         setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
         findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
-        String patch = Build.VERSION.SECURITY_PATCH;
-        if (!"".equals(patch)) {
-            try {
-                SimpleDateFormat template = new SimpleDateFormat("yyyy-MM-dd");
-                Date patchDate = template.parse(patch);
-                String format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "dMMMMyyyy");
-                patch = DateFormat.format(format, patchDate).toString();
-            } catch (ParseException e) {
-                // broken parse; fall through and use the raw string
-            }
+
+        final String patch = DeviceInfoUtils.getSecurityPatch();
+        if (TextUtils.isEmpty(patch)) {
             setStringSummary(KEY_SECURITY_PATCH, patch);
         } else {
             getPreferenceScreen().removePreference(findPreference(KEY_SECURITY_PATCH));
-
         }
+
         setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
-        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL + getMsvSuffix());
+        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL + DeviceInfoUtils.getMsvSuffix());
         setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
         setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
         findPreference(KEY_BUILD_NUMBER).setEnabled(true);
-        findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
+        findPreference(KEY_KERNEL_VERSION).setSummary(DeviceInfoUtils.getFormattedKernelVersion());
 
         if (!SELinux.isSELinuxEnabled()) {
             String status = getResources().getString(R.string.selinux_status_disabled);
@@ -157,7 +137,7 @@
         }
 
         // Dont show feedback option if there is no reporter.
-        if (TextUtils.isEmpty(getFeedbackReporterPackage(getActivity()))) {
+        if (TextUtils.isEmpty(DeviceInfoUtils.getFeedbackReporterPackage(getActivity()))) {
             getPreferenceScreen().removePreference(findPreference(KEY_DEVICE_FEEDBACK));
         }
 
@@ -229,6 +209,12 @@
             // Don't enable developer options for secondary users.
             if (!mUm.isAdminUser()) return true;
 
+            // Don't enable developer options until device has been provisioned
+            if (Settings.Global.getInt(getActivity().getContentResolver(),
+                    Settings.Global.DEVICE_PROVISIONED, 0) == 0) {
+                return true;
+            }
+
             if (mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true;
 
             if (mDevHitCountdown > 0) {
@@ -343,7 +329,7 @@
     }
 
     private void sendFeedback() {
-        String reporterPackage = getFeedbackReporterPackage(getActivity());
+        String reporterPackage = DeviceInfoUtils.getFeedbackReporterPackage(getActivity());
         if (TextUtils.isEmpty(reporterPackage)) {
             return;
         }
@@ -352,118 +338,34 @@
         startActivityForResult(intent, 0);
     }
 
-    /**
-     * Reads a line from the specified file.
-     * @param filename the file to read from
-     * @return the first line, if any.
-     * @throws IOException if the file couldn't be read
-     */
-    private static String readLine(String filename) throws IOException {
-        BufferedReader reader = new BufferedReader(new FileReader(filename), 256);
-        try {
-            return reader.readLine();
-        } finally {
-            reader.close();
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
         }
-    }
 
-    public static String getFormattedKernelVersion() {
-        try {
-            return formatKernelVersion(readLine(FILENAME_PROC_VERSION));
-
-        } catch (IOException e) {
-            Log.e(LOG_TAG,
-                "IO Exception when getting kernel version for Device Info screen",
-                e);
-
-            return "Unavailable";
-        }
-    }
-
-    public static String formatKernelVersion(String rawKernelVersion) {
-        // Example (see tests for more):
-        // Linux version 3.0.31-g6fb96c9 (android-build@xxx.xxx.xxx.xxx.com) \
-        //     (gcc version 4.6.x-xxx 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT \
-        //     Thu Jun 28 11:02:39 PDT 2012
-
-        final String PROC_VERSION_REGEX =
-            "Linux version (\\S+) " + /* group 1: "3.0.31-g6fb96c9" */
-            "\\((\\S+?)\\) " +        /* group 2: "x@y.com" (kernel builder) */
-            "(?:\\(gcc.+? \\)) " +    /* ignore: GCC version information */
-            "(#\\d+) " +              /* group 3: "#1" */
-            "(?:.*?)?" +              /* ignore: optional SMP, PREEMPT, and any CONFIG_FLAGS */
-            "((Sun|Mon|Tue|Wed|Thu|Fri|Sat).+)"; /* group 4: "Thu Jun 28 11:02:39 PDT 2012" */
-
-        Matcher m = Pattern.compile(PROC_VERSION_REGEX).matcher(rawKernelVersion);
-        if (!m.matches()) {
-            Log.e(LOG_TAG, "Regex did not match on /proc/version: " + rawKernelVersion);
-            return "Unavailable";
-        } else if (m.groupCount() < 4) {
-            Log.e(LOG_TAG, "Regex match on /proc/version only returned " + m.groupCount()
-                    + " groups");
-            return "Unavailable";
-        }
-        return m.group(1) + "\n" +                 // 3.0.31-g6fb96c9
-            m.group(2) + " " + m.group(3) + "\n" + // x@y.com #1
-            m.group(4);                            // Thu Jun 28 11:02:39 PDT 2012
-    }
-
-    /**
-     * Returns " (ENGINEERING)" if the msv file has a zero value, else returns "".
-     * @return a string to append to the model number description.
-     */
-    private String getMsvSuffix() {
-        // Production devices should have a non-zero value. If we can't read it, assume it's a
-        // production device so that we don't accidentally show that it's an ENGINEERING device.
-        try {
-            String msv = readLine(FILENAME_MSV);
-            // Parse as a hex number. If it evaluates to a zero, then it's an engineering build.
-            if (Long.parseLong(msv, 16) == 0) {
-                return " (ENGINEERING)";
-            }
-        } catch (IOException ioe) {
-            // Fail quietly, as the file may not exist on some devices.
-        } catch (NumberFormatException nfe) {
-            // Fail quietly, returning empty string should be sufficient
-        }
-        return "";
-    }
-
-    private static String getFeedbackReporterPackage(Context context) {
-        final String feedbackReporter =
-                context.getResources().getString(R.string.oem_preferred_feedback_reporter);
-        if (TextUtils.isEmpty(feedbackReporter)) {
-            // Reporter not configured. Return.
-            return feedbackReporter;
-        }
-        // Additional checks to ensure the reporter is on system image, and reporter is
-        // configured to listen to the intent. Otherwise, dont show the "send feedback" option.
-        final Intent intent = new Intent(Intent.ACTION_BUG_REPORT);
-
-        PackageManager pm = context.getPackageManager();
-        List<ResolveInfo> resolvedPackages =
-                pm.queryIntentActivities(intent, PackageManager.GET_RESOLVED_FILTER);
-        for (ResolveInfo info : resolvedPackages) {
-            if (info.activityInfo != null) {
-                if (!TextUtils.isEmpty(info.activityInfo.packageName)) {
-                    try {
-                        ApplicationInfo ai = pm.getApplicationInfo(info.activityInfo.packageName, 0);
-                        if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                            // Package is on the system image
-                            if (TextUtils.equals(
-                                        info.activityInfo.packageName, feedbackReporter)) {
-                                return feedbackReporter;
-                            }
-                        }
-                    } catch (PackageManager.NameNotFoundException e) {
-                         // No need to do anything here.
-                    }
-                }
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary,
+                        Build.VERSION.RELEASE));
             }
         }
-        return null;
     }
 
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     /**
      * For Search.
      */
@@ -495,7 +397,7 @@
                     keys.add((KEY_BASEBAND_VERSION));
                 }
                 // Dont show feedback option if there is no reporter.
-                if (TextUtils.isEmpty(getFeedbackReporterPackage(context))) {
+                if (TextUtils.isEmpty(DeviceInfoUtils.getFeedbackReporterPackage(context))) {
                     keys.add(KEY_DEVICE_FEEDBACK);
                 }
                 final UserManager um = UserManager.get(context);
diff --git a/src/com/android/settings/DisplayDensityPreference.java b/src/com/android/settings/DisplayDensityPreference.java
new file mode 100644
index 0000000..85f2fb2
--- /dev/null
+++ b/src/com/android/settings/DisplayDensityPreference.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2015 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.content.Context;
+import android.content.res.Resources;
+import android.os.AsyncTask;
+import android.os.RemoteException;
+import android.support.annotation.ArrayRes;
+import android.support.v7.preference.ListPreference;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.MathUtils;
+import android.view.Display;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
+
+import com.android.settings.R;
+
+import java.util.Arrays;
+
+/**
+ * Preference for changing the density of the display on which the preference
+ * is visible.
+ */
+public class DisplayDensityPreference extends ListPreference {
+    private static final String LOG_TAG = "DisplayDensityPreference";
+
+    /** Minimum increment between density scales. */
+    private static final float MIN_SCALE_INTERVAL = 0.09f;
+
+    /** Minimum density scale. This is available on all devices. */
+    private static final float MIN_SCALE = 0.85f;
+
+    /** Maximum density scale. The actual scale used depends on the device. */
+    private static final float MAX_SCALE = 1.50f;
+
+    /** Sentinel value for "normal" scaling (effectively disabled). */
+    private static final int DENSITY_VALUE_NORMAL = -1;
+
+    /** Summary used for "normal" scale. */
+    private static final int DENSITY_SUMMARY_NORMAL = R.string.force_density_summary_normal;
+
+    /**
+     * Summaries for scales smaller than "normal" in order of smallest to
+     * largest.
+     */
+    private static final int[] SMALLER_SUMMARIES = new int[] {
+            R.string.force_density_summary_small
+    };
+
+    /**
+     * Summaries for scales larger than "normal" in order of smallest to
+     * largest.
+     */
+    private static final int[] LARGER_SUMMARIES = new int[] {
+            R.string.force_density_summary_large,
+            R.string.force_density_summary_very_large,
+            R.string.force_density_summary_extremely_large,
+    };
+
+    /**
+     * Minimum allowed screen dimension, corresponds to resource qualifiers
+     * "small" or "sw320dp". This value must be at least the minimum screen
+     * size required by the CDD so that we meet developer expectations.
+     */
+    private static final int MIN_DIMENSION_DP = 320;
+
+    /** The ID of the display affected by this preference. */
+    private int mDisplayId = Display.DEFAULT_DISPLAY;
+
+    public DisplayDensityPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        if (!prepareList()) {
+            setEnabled(false);
+        }
+    }
+
+    private boolean prepareList() {
+        final int initialDensity = getInitialDisplayDensity(mDisplayId);
+        if (initialDensity <= 0) {
+            return false;
+        }
+
+        final Resources res = getContext().getResources();
+        final DisplayMetrics metrics = res.getDisplayMetrics();
+        final int currentDensity = metrics.densityDpi;
+        int currentDensityIndex = -1;
+
+        // Compute number of "larger" and "smaller" scales for this display.
+        final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
+        final int maxDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / MIN_DIMENSION_DP;
+        final float maxScale = Math.min(MAX_SCALE, maxDensity / (float) initialDensity);
+        final float minScale = MIN_SCALE;
+        final int numLarger = (int) MathUtils.constrain((maxScale - 1) / MIN_SCALE_INTERVAL,
+                0, LARGER_SUMMARIES.length);
+        final int numSmaller = (int) MathUtils.constrain((1 - minScale) / MIN_SCALE_INTERVAL,
+                0, SMALLER_SUMMARIES.length);
+
+        CharSequence[] values = new CharSequence[1 + numSmaller + numLarger];
+        CharSequence[] entries = new CharSequence[values.length];
+        int curIndex = 0;
+
+        if (numSmaller > 0) {
+            final float interval = (1 - minScale) / numSmaller;
+            for (int i = numSmaller - 1; i >= 0; i--) {
+                final int density = (int) (initialDensity * (1 - (i + 1) * interval));
+                if (currentDensity == density) {
+                    currentDensityIndex = curIndex;
+                }
+                values[curIndex] = Integer.toString(density);
+                entries[curIndex] = res.getText(SMALLER_SUMMARIES[i]);
+                curIndex++;
+            }
+        }
+
+        if (currentDensity == initialDensity) {
+            currentDensityIndex = curIndex;
+        }
+        values[curIndex] = Integer.toString(DENSITY_VALUE_NORMAL);
+        entries[curIndex] = res.getText(DENSITY_SUMMARY_NORMAL);
+        curIndex++;
+
+        if (numLarger > 0) {
+            final float interval = (maxScale - 1) / numLarger;
+            for (int i = 0; i < numLarger; i++) {
+                final int density = (int) (initialDensity * (1 + (i + 1) * interval));
+                if (currentDensity == density) {
+                    currentDensityIndex = curIndex;
+                }
+                values[curIndex] = Integer.toString(density);
+                entries[curIndex] = res.getText(LARGER_SUMMARIES[i]);
+                curIndex++;
+            }
+        }
+
+        final int displayIndex;
+        if (currentDensityIndex >= 0) {
+            displayIndex = currentDensityIndex;
+        } else {
+            // We don't understand the current density. Must have been set by
+            // someone else. Make room for another entry...
+            values = Arrays.copyOf(values, values.length + 1);
+            values[curIndex] = res.getString(R.string.force_density_summary_custom, currentDensity);
+
+            entries = Arrays.copyOf(entries, values.length + 1);
+            entries[curIndex] = Integer.toString(currentDensity);
+
+            displayIndex = curIndex;
+        }
+
+        super.setEntryValues(values);
+        super.setEntries(entries);
+
+        setValueIndex(displayIndex);
+
+        return true;
+    }
+
+    @Override
+    public boolean callChangeListener(Object newValue) {
+        final boolean allowed = super.callChangeListener(newValue);
+        if (allowed) {
+            final int density = Integer.parseInt((String) newValue);
+            setForcedDisplayDensity(mDisplayId, density);
+        }
+
+        return allowed;
+    }
+
+    @Override
+    public void setEntries(CharSequence[] entries) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setEntries(@ArrayRes int entriesResId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setEntryValues(CharSequence[] entryValues) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setEntryValues(@ArrayRes int entryValuesResId) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the initial density for the specified display.
+     *
+     * @param displayId the identifier of the display
+     * @return the initial density of the specified display, or {@code -1} if
+     *         the display does not exist or the density could not be obtained
+     */
+    private static int getInitialDisplayDensity(int displayId) {
+        try {
+            IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+            return wm.getInitialDisplayDensity(displayId);
+        } catch (RemoteException exc) {
+            return -1;
+        }
+    }
+
+    /**
+     * Asynchronously applies display density changes to the specified display.
+     *
+     * @param displayId the identifier of the display to modify
+     * @param density the density to force for the specified display, or <= 0
+     *                to clear any previously forced density
+     */
+    private static void setForcedDisplayDensity(final int displayId, final int density) {
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+                    if (density <= 0) {
+                        wm.clearForcedDisplayDensity(displayId);
+                    } else {
+                        wm.setForcedDisplayDensity(displayId, density);
+                    }
+                } catch (RemoteException exc) {
+                    Log.w(LOG_TAG, "Unable to save forced display density setting");
+                }
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 8e32322..0d52aa7 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -38,9 +38,9 @@
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.text.TextUtils;
 import android.util.Log;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
@@ -76,6 +76,7 @@
     private static final String KEY_CAMERA_GESTURE = "camera_gesture";
     private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
             = "camera_double_tap_power_gesture";
+    private static final String KEY_DISPLAY_DENSITY = "display_density";
 
     private DropDownPreference mFontSizePref;
 
@@ -213,6 +214,9 @@
             mNightModePreference.setValue(String.valueOf(currentNightMode));
             mNightModePreference.setOnPreferenceChangeListener(this);
         }
+
+        final Preference displayDensity = findPreference(KEY_DISPLAY_DENSITY);
+        displayDensity.setOnPreferenceChangeListener(this);
     }
 
     private static boolean allowAllRotations(Context context) {
@@ -477,6 +481,40 @@
         return R.string.help_uri_display;
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+        private final Context mContext;
+        private final SummaryLoader mLoader;
+
+        private SummaryProvider(Context context, SummaryLoader loader) {
+            mContext = context;
+            mLoader = loader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                updateSummary();
+            }
+        }
+
+        private void updateSummary() {
+            boolean auto = Settings.System.getInt(mContext.getContentResolver(),
+                    SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC)
+                    == SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
+            mLoader.setSummary(this, mContext.getString(auto ? R.string.display_summary_on
+                    : R.string.display_summary_off));
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java
new file mode 100644
index 0000000..f92f2b2
--- /dev/null
+++ b/src/com/android/settings/FallbackHome.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 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.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+
+public class FallbackHome extends Activity {
+    private static final String TAG = "FallbackHome";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
+    }
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "User unlocked; leaving to find real home");
+            unregisterReceiver(this);
+            finish();
+        }
+    };
+}
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index fbd2ea5..145dec9 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -161,17 +161,6 @@
                 }
             }
         }
-
-        // If we're down to just one possible home app, back out of this settings
-        // fragment and show a dialog explaining to the user that they won't see
-        // 'Home' settings now until such time as there are multiple available.
-        if (mPrefs.size() < 2) {
-            if (mShowNotice) {
-                mShowNotice = false;
-                SettingsActivity.requestHomeNotice();
-            }
-            finishFragment();
-        }
     }
 
     private void buildHomeActivitiesList() {
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index 5453d52..44fd110 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -29,6 +29,9 @@
     public static final int UNDECLARED = 100000;
 
     public static final int ACCESSIBILITY_TOGGLE_AUTOCLICK = UNDECLARED + 1;
+    public static final int SOUND = UNDECLARED + 2;
+    public static final int CONFIGURE_NOTIFICATION = UNDECLARED + 3;
+    public static final int CONFIGURE_WIFI = UNDECLARED + 4;
 
     /**
      * Declare the view of this category.
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index a3caf29..fb5c94c 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -23,6 +23,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.service.persistentdata.PersistentDataBlockManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -62,8 +63,12 @@
             final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
                     getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
 
-            if (pdbManager != null && !pdbManager.getOemUnlockEnabled()) {
-                // if OEM unlock is enabled, this will be wiped during FR process.
+            if (pdbManager != null && !pdbManager.getOemUnlockEnabled() &&
+                    Settings.Global.getInt(getActivity().getContentResolver(),
+                            Settings.Global.DEVICE_PROVISIONED, 0) != 0) {
+                // if OEM unlock is enabled, this will be wiped during FR process. If disabled, it
+                // will be wiped here, unless the device is still being provisioned, in which case
+                // the persistent data block will be preserved.
                 new AsyncTask<Void, Void, Void>() {
                     int mOldOrientation;
                     ProgressDialog mProgressDialog;
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index e2ac5d0..9dd83f5 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -47,12 +47,13 @@
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.ssl_ca_cert_dialog_title);
         builder.setCancelable(true);
-        hasDeviceOwner = dpm.getDeviceOwner() != null;
+        // TODO See b/25772443
+        hasDeviceOwner = dpm.getDeviceOwnerComponentOnCallingUser() != null;
         int buttonLabel;
         if (hasDeviceOwner) {
             // Institutional case.  Show informational message.
             String message = this.getResources().getString(R.string.ssl_ca_cert_info_message,
-                    dpm.getDeviceOwnerName());
+                    dpm.getDeviceOwnerNameOnAnyUser());
             builder.setMessage(message);
             buttonLabel = R.string.done_button;
         } else {
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 14e45be..2344a33 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.app.backup.IBackupManager;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -34,6 +35,7 @@
 import android.util.Log;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
@@ -180,6 +182,51 @@
         return R.string.help_url_backup_reset;
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                IBackupManager backupManager = IBackupManager.Stub.asInterface(
+                        ServiceManager.getService(Context.BACKUP_SERVICE));
+                try {
+                    boolean backupEnabled = backupManager.isBackupEnabled();
+                    if (backupEnabled) {
+                        String transport = backupManager.getCurrentTransport();
+                        String configSummary = backupManager.getDestinationString(transport);
+                        if (configSummary != null) {
+                            mSummaryLoader.setSummary(this, configSummary);
+                        } else {
+                            mSummaryLoader.setSummary(this, mContext.getString(
+                                    R.string.backup_configure_account_default_summary));
+                        }
+                    } else {
+                        mSummaryLoader.setSummary(this, mContext.getString(
+                                R.string.backup_disabled));
+                    }
+                } catch (RemoteException e) {
+                }
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/ProfileSelectDialog.java b/src/com/android/settings/ProfileSelectDialog.java
deleted file mode 100644
index 99f962f..0000000
--- a/src/com/android/settings/ProfileSelectDialog.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2015 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.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.dashboard.DashboardTile;
-
-public class ProfileSelectDialog extends DialogFragment implements OnClickListener {
-
-    private static final String ARG_SELECTED_TILE = "selectedTile";
-
-    private DashboardTile mSelectedTile;
-
-    public static void show(FragmentManager manager, DashboardTile tile) {
-        ProfileSelectDialog dialog = new ProfileSelectDialog();
-        Bundle args = new Bundle();
-        args.putParcelable(ARG_SELECTED_TILE, tile);
-        dialog.setArguments(args);
-        dialog.show(manager, "select_profile");
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mSelectedTile = getArguments().getParcelable(ARG_SELECTED_TILE);
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        Context context = getActivity();
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        UserAdapter adapter = Utils.createUserAdapter(UserManager.get(context), context,
-                mSelectedTile.userHandle);
-        builder.setTitle(R.string.choose_profile)
-                .setAdapter(adapter, this);
-
-        return builder.create();
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        UserHandle user = mSelectedTile.userHandle.get(which);
-        getActivity().startActivityAsUser(mSelectedTile.intent, user);
-    }
-}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 2f10bb5..7ed70c7 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -22,6 +22,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.graphics.Typeface;
 import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.AsyncResult;
@@ -30,11 +31,24 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.telephony.CellInfo;
+import android.telephony.CellInfoCdma;
+import android.telephony.CellInfoGsm;
+import android.telephony.CellInfoLte;
+import android.telephony.CellInfoWcdma;
+import android.telephony.CellIdentityCdma;
+import android.telephony.CellIdentityGsm;
+import android.telephony.CellIdentityLte;
+import android.telephony.CellIdentityWcdma;
 import android.telephony.CellLocation;
+import android.telephony.CellSignalStrengthCdma;
+import android.telephony.CellSignalStrengthGsm;
+import android.telephony.CellSignalStrengthLte;
+import android.telephony.CellSignalStrengthWcdma;
 import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.NeighboringCellInfo;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
@@ -57,6 +71,7 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.PhoneStateIntentReceiver;
+import com.android.internal.telephony.RILConstants;
 import com.android.internal.telephony.TelephonyProperties;
 
 import java.io.IOException;
@@ -76,7 +91,6 @@
 
     private static final int EVENT_QUERY_PREFERRED_TYPE_DONE = 1000;
     private static final int EVENT_SET_PREFERRED_TYPE_DONE = 1001;
-    private static final int EVENT_QUERY_NEIGHBORING_CIDS_DONE = 1002;
     private static final int EVENT_QUERY_SMSC_DONE = 1005;
     private static final int EVENT_UPDATE_SMSC_DONE = 1006;
 
@@ -112,8 +126,8 @@
     private TextView sentSinceReceived;
     private TextView sent;
     private TextView received;
-    private TextView mPingIpAddr;
-    private TextView mPingHostname;
+    private TextView mPingHostnameV4;
+    private TextView mPingHostnameV6;
     private TextView mHttpClientTest;
     private TextView dnsCheckState;
     private EditText smsc;
@@ -127,15 +141,21 @@
     private Spinner preferredNetworkType;
 
     private TelephonyManager mTelephonyManager;
+    private ImsManager mImsManager = null;
     private Phone phone = null;
     private PhoneStateIntentReceiver mPhoneStateReceiver;
 
-    private String mPingIpAddrResult;
-    private String mPingHostnameResult;
+    private String mPingHostnameResultV4;
+    private String mPingHostnameResultV6;
     private String mHttpClientTestResult;
     private boolean mMwiValue = false;
     private boolean mCfiValue = false;
-    private List<CellInfo> mCellInfoValue;
+
+    private List<CellInfo> mCellInfoResult = null;
+    private CellLocation mCellLocationResult = null;
+    private List<NeighboringCellInfo> mNeighboringCellResult = null;
+
+    private int mPreferredNetworkTypeResult;
 
     private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
@@ -171,7 +191,8 @@
         @Override
         public void onCellInfoChanged(List<CellInfo> arrayCi) {
             log("onCellInfoChanged: arrayCi=" + arrayCi);
-            updateCellInfoTv(arrayCi);
+            mCellInfoResult = arrayCi;
+            updateCellInfo(mCellInfoResult);
         }
 
         @Override
@@ -181,7 +202,19 @@
         }
     };
 
+    private void updatePreferredNetworkType(int type) {
+        if (type >= mPreferredNetworkLabels.length || type < 0) {
+            log("EVENT_QUERY_PREFERRED_TYPE_DONE: unknown " +
+                    "type=" + type);
+            type = mPreferredNetworkLabels.length - 1; //set to Unknown
+        }
+        mPreferredNetworkTypeResult = type;
+
+        preferredNetworkType.setSelection(mPreferredNetworkTypeResult, true);
+    }
+
     private Handler mHandler = new Handler() {
+        @Override
         public void handleMessage(Message msg) {
             AsyncResult ar;
             switch (msg.what) {
@@ -201,31 +234,17 @@
 
                 case EVENT_QUERY_PREFERRED_TYPE_DONE:
                     ar= (AsyncResult) msg.obj;
-                    if (ar.exception == null) {
-                        int type = ((int[])ar.result)[0];
-                        if (type >= mPreferredNetworkLabels.length) {
-                            log("EVENT_QUERY_PREFERRED_TYPE_DONE: unknown " +
-                                    "type=" + type);
-                            type = mPreferredNetworkLabels.length - 1;
-                        }
-                        preferredNetworkType.setSelection(type, true);
+                    if (ar.exception == null && ar.result != null) {
+                        updatePreferredNetworkType(((int[])ar.result)[0]);
                     } else {
-                        preferredNetworkType.setSelection(mPreferredNetworkLabels.length - 1, true);
+                        //In case of an exception, we will set this to unknown
+                        updatePreferredNetworkType(mPreferredNetworkLabels.length-1);
                     }
                     break;
                 case EVENT_SET_PREFERRED_TYPE_DONE:
                     ar= (AsyncResult) msg.obj;
                     if (ar.exception != null) {
-                        phone.getPreferredNetworkType(
-                                obtainMessage(EVENT_QUERY_PREFERRED_TYPE_DONE));
-                    }
-                    break;
-                case EVENT_QUERY_NEIGHBORING_CIDS_DONE:
-                    ar= (AsyncResult) msg.obj;
-                    if (ar.exception == null) {
-                        updateNeighboringCids((ArrayList<NeighboringCellInfo>)ar.result);
-                    } else {
-                        mNeighboringCids.setText("unknown");
+                        log("Set preferred network type success.");
                     }
                     break;
                 case EVENT_QUERY_SMSC_DONE:
@@ -244,6 +263,7 @@
                     }
                     break;
                 default:
+                    super.handleMessage(msg);
                     break;
 
             }
@@ -256,9 +276,16 @@
 
         setContentView(R.layout.radio_info);
 
+        log("Started onCreate");
+
         mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
         phone = PhoneFactory.getDefaultPhone();
 
+        //TODO: Need to update this if the default phoneId changes?
+        //      Better to have an instance per phone?
+        mImsManager = ImsManager.getInstance(getApplicationContext(),
+                SubscriptionManager.getDefaultVoicePhoneId());
+
         mDeviceId= (TextView) findViewById(R.id.imei);
         number = (TextView) findViewById(R.id.number);
         callState = (TextView) findViewById(R.id.call);
@@ -273,6 +300,7 @@
         mLocation = (TextView) findViewById(R.id.location);
         mNeighboringCids = (TextView) findViewById(R.id.neighboring);
         mCellInfo = (TextView) findViewById(R.id.cellinfo);
+        mCellInfo.setTypeface(Typeface.MONOSPACE);
         mDcRtInfoTv = (TextView) findViewById(R.id.dcrtinfo);
 
         resets = (TextView) findViewById(R.id.resets);
@@ -284,9 +312,8 @@
         received = (TextView) findViewById(R.id.received);
         smsc = (EditText) findViewById(R.id.smsc);
         dnsCheckState = (TextView) findViewById(R.id.dnsCheckState);
-
-        mPingIpAddr = (TextView) findViewById(R.id.pingIpAddr);
-        mPingHostname = (TextView) findViewById(R.id.pingHostname);
+        mPingHostnameV4 = (TextView) findViewById(R.id.pingHostnameV4);
+        mPingHostnameV6 = (TextView) findViewById(R.id.pingHostnameV6);
         mHttpClientTest = (TextView) findViewById(R.id.httpClientTest);
 
         preferredNetworkType = (Spinner) findViewById(R.id.preferredNetworkType);
@@ -337,28 +364,26 @@
         mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
         mPhoneStateReceiver.notifyPhoneCallState(EVENT_PHONE_STATE_CHANGED);
 
+        mPreferredNetworkTypeResult = mPreferredNetworkLabels.length - 1; //Unknown
+
+        //FIXME: Replace with TelephonyManager call
         phone.getPreferredNetworkType(
                 mHandler.obtainMessage(EVENT_QUERY_PREFERRED_TYPE_DONE));
-        phone.getNeighboringCids(
-                mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
 
-        CellLocation.requestLocationUpdate();
-
-        // Get current cell info
-        mCellInfoValue = mTelephonyManager.getAllCellInfo();
-        log("onCreate: mCellInfoValue=" + mCellInfoValue);
+        restoreFromBundle(icicle);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
+        log("Started onResume");
+
         updatePhoneState();
         updateSignalStrength();
         updateMessageWaiting();
         updateCallRedirect();
         updateServiceState();
-        updateLocation(mTelephonyManager.getCellLocation());
         updateDataState();
         updateDataStats();
         updateDataStats2();
@@ -371,7 +396,13 @@
         updateProperties();
         updateDnsCheckState();
 
-        log("onResume: register phone & data intents");
+        updateNeighboringCids(mNeighboringCellResult);
+        updateLocation(mCellLocationResult);
+        updateCellInfo(mCellInfoResult);
+
+        mPingHostnameV4.setText(mPingHostnameResultV4);
+        mPingHostnameV6.setText(mPingHostnameResultV6);
+        mHttpClientTest.setText(mHttpClientTestResult);
 
         mPhoneStateReceiver.registerIntent();
         mTelephonyManager.listen(mPhoneStateListener,
@@ -385,7 +416,7 @@
     }
 
     @Override
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
 
         log("onPause: unregister phone & data intents");
@@ -394,6 +425,30 @@
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
     }
 
+    private void restoreFromBundle(Bundle b) {
+        if( b == null) {
+            return;
+        }
+
+        mPingHostnameResultV4 = b.getString("mPingHostnameResultV4","");
+        mPingHostnameResultV6 = b.getString("mPingHostnameResultV6","");
+        mHttpClientTestResult = b.getString("mHttpClientTestResult","");
+
+        mPingHostnameV4.setText(mPingHostnameResultV4);
+        mPingHostnameV6.setText(mPingHostnameResultV6);
+        mHttpClientTest.setText(mHttpClientTestResult);
+
+        mPreferredNetworkTypeResult = b.getInt("mPreferredNetworkTypeResult", 0);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        outState.putString("mPingHostnameResultV4", mPingHostnameResultV4);
+        outState.putString("mPingHostnameResultV6", mPingHostnameResultV6);
+        outState.putString("mHttpClientTestResult", mHttpClientTestResult);
+        outState.putInt("mPreferredNetworkTypeResult", mPreferredNetworkTypeResult);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, MENU_ITEM_SELECT_BAND, 0, R.string.radio_info_band_mode_label)
@@ -436,6 +491,7 @@
     }
 
     private boolean isRadioOn() {
+        //FIXME: Replace with a TelephonyManager call
         return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
     }
 
@@ -447,11 +503,24 @@
     }
 
     private void updateCellInfoListRate() {
-        cellInfoListRateButton.setText("CellInfoListRate " + mCellInfoListRateHandler.getRate());
-        updateCellInfoTv(mTelephonyManager.getAllCellInfo());
+        int rate = mCellInfoListRateHandler.getRate();
+        String rateStr;
+        switch(rate) {
+            case Integer.MAX_VALUE:
+                rateStr = "Off";
+                break;
+            case 0:
+                rateStr = "Immediate";
+                break;
+            default:
+                rateStr = (new Integer(rate)).toString() + "ms";
+                break;
+        }
+        cellInfoListRateButton.setText("CellInfoListRate "+ rateStr);
     }
 
     private void updateDnsCheckState() {
+        //FIXME: Replace with a TelephonyManager call
         dnsCheckState.setText(phone.isDnsCheckDisabled() ?
                 "0.0.0.0 allowed" :"0.0.0.0 not allowed");
     }
@@ -521,7 +590,7 @@
 
     }
 
-    private final void updateNeighboringCids(ArrayList<NeighboringCellInfo> cids) {
+    private final void updateNeighboringCids(List<NeighboringCellInfo> cids) {
         StringBuilder sb = new StringBuilder();
 
         if (cids != null) {
@@ -538,22 +607,128 @@
         mNeighboringCids.setText(sb.toString());
     }
 
-    private final void updateCellInfoTv(List<CellInfo> arrayCi) {
-        mCellInfoValue = arrayCi;
-        StringBuilder value = new StringBuilder();
-        if (mCellInfoValue != null) {
-            int index = 0;
-            for (CellInfo ci : mCellInfoValue) {
-                value.append('[');
-                value.append(index);
-                value.append("]=");
-                value.append(ci.toString());
-                if (++index < mCellInfoValue.size()) {
-                    value.append("\n");
+    private final String getCellInfoDisplayString(int i) {
+        return (i != Integer.MAX_VALUE) ? Integer.toString(i) : "";
+    }
+
+    private final String getCellInfoDisplayString(long i) {
+        return (i != Long.MAX_VALUE) ? Long.toString(i) : "";
+    }
+
+    private final String buildCdmaInfoString(CellInfoCdma ci) {
+        CellIdentityCdma cidCdma = ci.getCellIdentity();
+        CellSignalStrengthCdma ssCdma = ci.getCellSignalStrength();
+
+        return String.format("%-3.3s %-5.5s %-5.5s %-5.5s %-6.6s %-6.6s %-6.6s %-6.6s %-5.5s",
+                ci.isRegistered() ? "S  " : "   ",
+                getCellInfoDisplayString(cidCdma.getSystemId()),
+                getCellInfoDisplayString(cidCdma.getNetworkId()),
+                getCellInfoDisplayString(cidCdma.getBasestationId()),
+                getCellInfoDisplayString(ssCdma.getCdmaDbm()),
+                getCellInfoDisplayString(ssCdma.getCdmaEcio()),
+                getCellInfoDisplayString(ssCdma.getEvdoDbm()),
+                getCellInfoDisplayString(ssCdma.getEvdoEcio()),
+                getCellInfoDisplayString(ssCdma.getEvdoSnr()));
+    }
+
+    private final String buildGsmInfoString(CellInfoGsm ci) {
+        CellIdentityGsm cidGsm = ci.getCellIdentity();
+        CellSignalStrengthGsm ssGsm = ci.getCellSignalStrength();
+
+        return String.format("%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-4.4s %-4.4s\n",
+                ci.isRegistered() ? "S  " : "   ",
+                getCellInfoDisplayString(cidGsm.getMcc()),
+                getCellInfoDisplayString(cidGsm.getMnc()),
+                getCellInfoDisplayString(cidGsm.getLac()),
+                getCellInfoDisplayString(cidGsm.getCid()),
+                // TODO: Add BSIC support once integrated
+                // getCellInfoDisplayString(cidGsm.getBsic()),
+                "    ",
+                getCellInfoDisplayString(ssGsm.getDbm()));
+    }
+
+    private final String buildLteInfoString(CellInfoLte ci) {
+        CellIdentityLte cidLte = ci.getCellIdentity();
+        CellSignalStrengthLte ssLte = ci.getCellSignalStrength();
+
+        return String.format(
+                "%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-3.3s %-4.4s %-4.4s %-2.2s\n",
+                ci.isRegistered() ? "S  " : "   ",
+                getCellInfoDisplayString(cidLte.getMcc()),
+                getCellInfoDisplayString(cidLte.getMnc()),
+                getCellInfoDisplayString(cidLte.getTac()),
+                getCellInfoDisplayString(cidLte.getCi()),
+                getCellInfoDisplayString(cidLte.getPci()),
+                getCellInfoDisplayString(ssLte.getDbm()),
+                getCellInfoDisplayString(ssLte.getRsrq()),
+                getCellInfoDisplayString(ssLte.getTimingAdvance()));
+    }
+
+    private final String buildWcdmaInfoString(CellInfoWcdma ci) {
+        CellIdentityWcdma cidWcdma = ci.getCellIdentity();
+        CellSignalStrengthWcdma ssWcdma = ci.getCellSignalStrength();
+
+        return String.format("%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-5.5s %-4.4s\n",
+                ci.isRegistered() ? "S  " : "   ",
+                getCellInfoDisplayString(cidWcdma.getMcc()),
+                getCellInfoDisplayString(cidWcdma.getMnc()),
+                getCellInfoDisplayString(cidWcdma.getLac()),
+                getCellInfoDisplayString(cidWcdma.getCid()),
+                getCellInfoDisplayString(cidWcdma.getPsc()),
+                getCellInfoDisplayString(ssWcdma.getDbm()));
+    }
+
+    private final String buildCellInfoString(List<CellInfo> arrayCi) {
+        String value = new String();
+        StringBuilder cdmaCells = new StringBuilder(),
+                gsmCells = new StringBuilder(),
+                lteCells = new StringBuilder(),
+                wcdmaCells = new StringBuilder();
+
+        if (arrayCi != null) {
+            for (CellInfo ci : arrayCi) {
+
+                if (ci instanceof CellInfoLte) {
+                    lteCells.append(buildLteInfoString((CellInfoLte) ci));
+                } else if (ci instanceof CellInfoWcdma) {
+                    wcdmaCells.append(buildWcdmaInfoString((CellInfoWcdma) ci));
+                } else if (ci instanceof CellInfoGsm) {
+                    gsmCells.append(buildGsmInfoString((CellInfoGsm) ci));
+                } else if (ci instanceof CellInfoCdma) {
+                    cdmaCells.append(buildCdmaInfoString((CellInfoCdma) ci));
                 }
             }
+            if (lteCells.length() != 0) {
+                value += String.format(
+                        "LTE\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-3.3s %-4.4s %-4.4s %-2.2s\n",
+                        "SRV", "MCC", "MNC", "TAC", "CID", "PCI", "RSRP", "RSRQ", "TA");
+                value += lteCells.toString();
+            }
+            if (wcdmaCells.length() != 0) {
+                value += String.format("WCDMA\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-5.5s %-4.4s\n",
+                        "SRV", "MCC", "MNC", "LAC", "CID", "PSC", "RSCP");
+                value += wcdmaCells.toString();
+            }
+            if (gsmCells.length() != 0) {
+                value += String.format("GSM\n%-3.3s %-3.3s %-3.3s %-5.5s %-5.5s %-4.4s %-4.4s\n",
+                        "SRV", "MCC", "MNC", "LAC", "CID", "BSIC", "RSSI");
+                value += gsmCells.toString();
+            }
+            if (cdmaCells.length() != 0) {
+                value += String.format(
+                        "CDMA/EVDO\n%-3.3s %-5.5s %-5.5s %-5.5s %-6.6s %-6.6s %-6.6s %-6.6s %-5.5s\n",
+                        "SRV", "SID", "NID", "BSID", "C-RSSI", "C-ECIO", "E-RSSI", "E-ECIO", "E-SNR");
+                value += cdmaCells.toString();
+            }
+        } else {
+            value ="unknown";
         }
-        mCellInfo.setText(value.toString());
+
+        return value.toString();
+    }
+
+    private final void updateCellInfo(List<CellInfo> arrayCi) {
+        mCellInfo.setText(buildCellInfoString(arrayCi));
     }
 
     private final void updateDcRtInfoTv(DataConnectionRealTimeInfo dcRtInfo) {
@@ -664,7 +839,7 @@
         if (s == null) s = r.getString(R.string.radioInfo_unknown);
         mDeviceId.setText(s);
 
-
+        //FIXME: Replace with a TelephonyManager call
         s = phone.getLine1Number();
         if (s == null) s = r.getString(R.string.radioInfo_unknown);
         number.setText(s);
@@ -705,45 +880,34 @@
     }
 
     /**
-     * Ping a IP address.
-     */
-    private final void pingIpAddr() {
-        try {
-            // This is hardcoded IP addr. This is for testing purposes.
-            // We would need to get rid of this before release.
-            String ipAddress = "74.125.47.104";
-            Process p = Runtime.getRuntime().exec("ping -c 1 " + ipAddress);
-            int status = p.waitFor();
-            if (status == 0) {
-                mPingIpAddrResult = "Pass";
-            } else {
-                mPingIpAddrResult = "Fail: IP addr not reachable";
-            }
-        } catch (IOException e) {
-            mPingIpAddrResult = "Fail: IOException";
-        } catch (InterruptedException e) {
-            mPingIpAddrResult = "Fail: InterruptedException";
-        }
-    }
-
-    /**
      *  Ping a host name
      */
     private final void pingHostname() {
         try {
-            Process p = Runtime.getRuntime().exec("ping -c 1 www.google.com");
-            int status = p.waitFor();
-            if (status == 0) {
-                mPingHostnameResult = "Pass";
-            } else {
-                mPingHostnameResult = "Fail: Host unreachable";
+            try {
+                Process p4 = Runtime.getRuntime().exec("ping -c 1 www.google.com");
+                int status4 = p4.waitFor();
+                if (status4 == 0) {
+                    mPingHostnameResultV4 = "Pass";
+                } else {
+                    mPingHostnameResultV4 = String.format("Fail(%d)", status4);
+                }
+            } catch (IOException e) {
+                mPingHostnameResultV4 = "Fail: IOException";
             }
-        } catch (UnknownHostException e) {
-            mPingHostnameResult = "Fail: Unknown Host";
-        } catch (IOException e) {
-            mPingHostnameResult= "Fail: IOException";
+            try {
+                Process p6 = Runtime.getRuntime().exec("ping6 -c 1 www.google.com");
+                int status6 = p6.waitFor();
+                if (status6 == 0) {
+                    mPingHostnameResultV6 = "Pass";
+                } else {
+                    mPingHostnameResultV6 = String.format("Fail(%d)", status6);
+                }
+            } catch (IOException e) {
+                mPingHostnameResultV6 = "Fail: IOException";
+            }
         } catch (InterruptedException e) {
-            mPingHostnameResult = "Fail: InterruptedException";
+            mPingHostnameResultV4 = mPingHostnameResultV6 = "Fail: InterruptedException";
         }
     }
 
@@ -771,41 +935,60 @@
     }
 
     private void refreshSmsc() {
+        //FIXME: Replace with a TelephonyManager call
         phone.getSmscAddress(mHandler.obtainMessage(EVENT_QUERY_SMSC_DONE));
     }
 
+    private final void updateAllCellInfo() {
+
+        mCellInfo.setText("");
+        mNeighboringCids.setText("");
+        mLocation.setText("");
+
+        final Runnable updateAllCellInfoResults = new Runnable() {
+            public void run() {
+                updateNeighboringCids(mNeighboringCellResult);
+                updateLocation(mCellLocationResult);
+                updateCellInfo(mCellInfoResult);
+            }
+        };
+
+        Thread locThread = new Thread() {
+            @Override
+            public void run() {
+                mCellInfoResult = mTelephonyManager.getAllCellInfo();
+                mCellLocationResult = mTelephonyManager.getCellLocation();
+                mNeighboringCellResult = mTelephonyManager.getNeighboringCellInfo();
+
+                mHandler.post(updateAllCellInfoResults);
+            }
+        };
+        locThread.start();
+    }
+
     private final void updatePingState() {
-        final Handler handler = new Handler();
         // Set all to unknown since the threads will take a few secs to update.
-        mPingIpAddrResult = getResources().getString(R.string.radioInfo_unknown);
-        mPingHostnameResult = getResources().getString(R.string.radioInfo_unknown);
+        mPingHostnameResultV4 = getResources().getString(R.string.radioInfo_unknown);
+        mPingHostnameResultV6 = getResources().getString(R.string.radioInfo_unknown);
         mHttpClientTestResult = getResources().getString(R.string.radioInfo_unknown);
 
-        mPingIpAddr.setText(mPingIpAddrResult);
-        mPingHostname.setText(mPingHostnameResult);
+        mPingHostnameV4.setText(mPingHostnameResultV4);
+        mPingHostnameV6.setText(mPingHostnameResultV6);
         mHttpClientTest.setText(mHttpClientTestResult);
 
         final Runnable updatePingResults = new Runnable() {
             public void run() {
-                mPingIpAddr.setText(mPingIpAddrResult);
-                mPingHostname.setText(mPingHostnameResult);
+                mPingHostnameV4.setText(mPingHostnameResultV4);
+                mPingHostnameV6.setText(mPingHostnameResultV6);
                 mHttpClientTest.setText(mHttpClientTestResult);
             }
         };
-        Thread ipAddr = new Thread() {
-            @Override
-            public void run() {
-                pingIpAddr();
-                handler.post(updatePingResults);
-            }
-        };
-        ipAddr.start();
 
         Thread hostname = new Thread() {
             @Override
             public void run() {
                 pingHostname();
-                handler.post(updatePingResults);
+                mHandler.post(updatePingResults);
             }
         };
         hostname.start();
@@ -814,7 +997,7 @@
             @Override
             public void run() {
                 httpClientTest();
-                handler.post(updatePingResults);
+                mHandler.post(updatePingResults);
             }
         };
         httpClient.start();
@@ -910,6 +1093,7 @@
 
     private MenuItem.OnMenuItemClickListener mGetPdpList = new MenuItem.OnMenuItemClickListener() {
         public boolean onMenuItemClick(MenuItem item) {
+            //FIXME: Replace with a TelephonyManager call
             phone.getDataCallList(null);
             return true;
         }
@@ -929,9 +1113,11 @@
             int state = mTelephonyManager.getDataState();
             switch (state) {
                 case TelephonyManager.DATA_CONNECTED:
+                    //FIXME: Replace with a TelephonyManager call
                     phone.setDataEnabled(false);
                     break;
                 case TelephonyManager.DATA_DISCONNECTED:
+                    //FIXME: Replace with a TelephonyManager call
                     phone.setDataEnabled(true);
                     break;
                 default:
@@ -945,12 +1131,13 @@
     OnClickListener mPowerButtonHandler = new OnClickListener() {
         public void onClick(View v) {
             //log("toggle radio power: currently " + (isRadioOn()?"on":"off"));
+            //FIXME: Replace with a TelephonyManager call
             phone.setRadioPower(!isRadioOn());
         }
     };
 
     class CellInfoListRateHandler implements OnClickListener {
-        int rates[] = {Integer.MAX_VALUE, 0, 1000};
+        int rates[] = {Integer.MAX_VALUE, 0, 5000};
         int index = 0;
 
         public int getRate() {
@@ -960,11 +1147,13 @@
         @Override
         public void onClick(View v) {
             index += 1;
-            if (index >= rates.length) {
-                index = 0;
-            }
+            index %= rates.length;
+
+            // FIXME: Replace with a TelephonyManager call
             phone.setCellInfoListRate(rates[index]);
             updateCellInfoListRate();
+
+            updateAllCellInfo();
         }
     }
     CellInfoListRateHandler mCellInfoListRateHandler = new CellInfoListRateHandler();
@@ -1020,12 +1209,12 @@
                     (isImsVoLteProvisioned() ? "on":"off")));
             final boolean newValue = !isImsVoLteProvisioned();
             if (phone != null) {
-                final ImsManager imsManager = ImsManager.getInstance(phone.getContext(), phone.getSubId());
-                if (imsManager != null) {
+                //TODO: Why does this have to be called within the phone's context?
+                if (mImsManager != null) {
                     QueuedWork.singleThreadExecutor().submit(new Runnable() {
                         public void run() {
                             try {
-                                imsManager.getConfigInterface().setProvisionedValue(
+                                mImsManager.getConfigInterface().setProvisionedValue(
                                         ImsConfig.ConfigConstants.VLT_SETTING_ENABLED,
                                         newValue? 1 : 0);
                             } catch (ImsException e) {
@@ -1041,8 +1230,10 @@
 
     private boolean isImsVoLteProvisioned() {
         if (phone != null) {
-            ImsManager imsManager = ImsManager.getInstance(phone.getContext(), phone.getSubId());
-            return imsManager.isVolteProvisionedOnDevice(phone.getContext());
+            //TODO: Why does this have to be called within the phone's context?
+            if(mImsManager != null ) {
+              return mImsManager.isVolteProvisionedOnDevice(phone.getContext());
+            }
         }
         return false;
     }
@@ -1090,6 +1281,7 @@
 
     OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
         public void onClick(View v) {
+            //FIXME: Replace with a TelephonyManager call
             phone.disableDnsCheck(!phone.isDnsCheckDisabled());
             updateDnsCheckState();
         }
@@ -1128,12 +1320,15 @@
         }
     };
 
-    AdapterView.OnItemSelectedListener
-            mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() {
+    AdapterView.OnItemSelectedListener mPreferredNetworkHandler =
+            new AdapterView.OnItemSelectedListener() {
+
         public void onItemSelected(AdapterView parent, View v, int pos, long id) {
-            Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
-            if (pos>=0 && pos<=(mPreferredNetworkLabels.length - 2)) {
-                phone.setPreferredNetworkType(pos, msg);
+            if (mPreferredNetworkTypeResult != pos && pos >= 0
+                    && pos <= mPreferredNetworkLabels.length - 2) {
+                mPreferredNetworkTypeResult = pos;
+                Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
+                phone.setPreferredNetworkType(mPreferredNetworkTypeResult, msg);
             }
         }
 
@@ -1149,11 +1344,21 @@
             "CDMA auto (PRL)",
             "CDMA only",
             "EvDo only",
-            "GSM/CDMA auto (PRL)",
+            "Global auto (PRL)",
             "LTE/CDMA auto (PRL)",
-            "LTE/GSM auto (PRL)",
-            "LTE/GSM/CDMA auto (PRL)",
+            "LTE/UMTS auto (PRL)",
+            "LTE/CDMA/UMTS auto (PRL)",
             "LTE only",
+            "LTE/WCDMA",
+            "TD-SCDMA only",
+            "TD-SCDMA/WCDMA",
+            "LTE/TD-SCDMA",
+            "TD-SCDMA/GSM",
+            "TD-SCDMA/UMTS",
+            "LTE/TD-SCDMA/WCDMA",
+            "LTE/TD-SCDMA/UMTS",
+            "TD-SCDMA/CDMA/UMTS",
+            "Global/TD-SCDMA",
             "Unknown"};
 
     private void log(String s) {
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 9050448..4615a99 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -31,6 +31,7 @@
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.android.ims.ImsManager;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
 
@@ -94,6 +95,8 @@
                 btManager.getAdapter().factoryReset();
             }
 
+            ImsManager.factoryReset(context);
+
             Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
         }
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index ee95839..838fcf3 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -214,13 +214,17 @@
 
         mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
         if (mOwnerInfoPref != null) {
-            mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    OwnerInfoSettings.show(SecuritySettings.this);
-                    return true;
-                }
-            });
+            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isDeviceOwnerInfoEnabled());
+
+            if (mOwnerInfoPref.isEnabled()) {
+                mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        OwnerInfoSettings.show(SecuritySettings.this);
+                        return true;
+                    }
+                });
+            }
         }
 
         if (mIsAdmin) {
@@ -630,9 +634,13 @@
 
     public void updateOwnerInfo() {
         if (mOwnerInfoPref != null) {
-            mOwnerInfoPref.setSummary(mLockPatternUtils.isOwnerInfoEnabled(MY_USER_ID)
-                    ? mLockPatternUtils.getOwnerInfo(MY_USER_ID)
-                    : getString(R.string.owner_info_settings_summary));
+            if (mLockPatternUtils.isDeviceOwnerInfoEnabled()) {
+                mOwnerInfoPref.setSummary(R.string.disabled_by_administrator_summary);
+            } else {
+                mOwnerInfoPref.setSummary(mLockPatternUtils.isOwnerInfoEnabled(MY_USER_ID)
+                        ? mLockPatternUtils.getOwnerInfo(MY_USER_ID)
+                        : getString(R.string.owner_info_settings_summary));
+            }
         }
     }
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 7b94d79..149ef45 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -61,6 +61,7 @@
             return super.isValidFragment(className);
             }
     }
+    public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }
     public static class StorageUseActivity extends SettingsActivity { /* empty */ }
     public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }
@@ -104,7 +105,9 @@
     public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
-    public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeVisualInterruptionSettingsActivity extends SettingsActivity { /* empty */}
+    public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
     public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ }
@@ -118,4 +121,10 @@
     public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }
+
+    // Categories.
+    public static class WirelessSettings extends SettingsActivity { /* empty */ }
+    public static class DeviceSettings extends SettingsActivity { /* empty */ }
+    public static class PersonalSettings extends SettingsActivity { /* empty */ }
+    public static class SystemSettings extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index c979f76..f98d2a6 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -17,7 +17,6 @@
 package com.android.settings;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
@@ -32,12 +31,9 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
 import android.nfc.NfcAdapter;
+import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v14.preference.PreferenceFragment;
@@ -45,12 +41,7 @@
 import android.support.v7.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.transition.TransitionManager;
-import android.util.ArrayMap;
-import android.util.AttributeSet;
 import android.util.Log;
-import android.util.Pair;
-import android.util.TypedValue;
-import android.util.Xml;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -59,10 +50,9 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.SearchView;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ArrayUtils;
-import com.android.internal.util.XmlUtils;
+import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.CaptionPropertiesFragment;
 import com.android.settings.accounts.AccountSettings;
@@ -76,10 +66,7 @@
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.WriteSettingsDetails;
 import com.android.settings.bluetooth.BluetoothSettings;
-import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardSummary;
-import com.android.settings.dashboard.DashboardTile;
-import com.android.settings.dashboard.NoHomeDialogFragment;
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.deviceinfo.PrivateVolumeForget;
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
@@ -96,8 +83,9 @@
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationAccessSettings;
-import com.android.settings.notification.NotificationSettings;
+import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.NotificationStation;
 import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.ZenAccessSettings;
@@ -106,6 +94,7 @@
 import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeScheduleRuleSettings;
 import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.ZenModeVisualInterruptionSettings;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.search.DynamicIndexableContentMonitor;
@@ -120,19 +109,15 @@
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.DashboardTile;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import static com.android.settings.dashboard.DashboardTile.TILE_ID_UNDEFINED;
-
-public class SettingsActivity extends Activity
+public class SettingsActivity extends SettingsDrawerActivity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
         ButtonBarHandler, FragmentManager.OnBackStackChangedListener,
@@ -206,77 +191,45 @@
     public static final String EXTRA_SHOW_FRAGMENT_AS_SUBSETTING =
             ":settings:show_fragment_as_subsetting";
 
-    private static final String META_DATA_KEY_FRAGMENT_CLASS =
+    public static final String META_DATA_KEY_FRAGMENT_CLASS =
         "com.android.settings.FRAGMENT_CLASS";
 
     private static final String EXTRA_UI_OPTIONS = "settings:ui_options";
 
     private static final String EMPTY_QUERY = "";
 
-    /**
-     * Settings will search for system activities of this action and add them as a top level
-     * settings tile using the following parameters.
-     *
-     * <p>A category must be specified in the meta-data for the activity named
-     * {@link #EXTRA_CATEGORY_KEY}
-     *
-     * <p>The title may be defined by meta-data named {@link Utils#META_DATA_PREFERENCE_TITLE}
-     * otherwise the label for the activity will be used.
-     *
-     * <p>The icon may be defined by meta-data named {@link Utils#META_DATA_PREFERENCE_ICON}
-     * otherwise the icon for the activity will be used.
-     *
-     * <p>A summary my be defined by meta-data named {@link Utils#META_DATA_PREFERENCE_SUMMARY}
-     */
-    private static final String EXTRA_SETTINGS_ACTION =
-            "com.android.settings.action.EXTRA_SETTINGS";
-
-    /**
-     * The key used to get the category from metadata of activities of action
-     * {@link #EXTRA_SETTINGS_ACTION}
-     * The value must be one of:
-     * <li>com.android.settings.category.wireless</li>
-     * <li>com.android.settings.category.device</li>
-     * <li>com.android.settings.category.personal</li>
-     * <li>com.android.settings.category.system</li>
-     */
-    private static final String EXTRA_CATEGORY_KEY = "com.android.settings.category";
-
-    private static boolean sShowNoHomeNotice = false;
-
     private String mFragmentClass;
 
     private CharSequence mInitialTitle;
     private int mInitialTitleResId;
 
     // Show only these settings for restricted users
-    private int[] SETTINGS_FOR_RESTRICTED = {
-            R.id.wireless_section,
-            R.id.wifi_settings,
-            R.id.bluetooth_settings,
-            R.id.data_usage_settings,
-            R.id.sim_settings,
-            R.id.wireless_settings,
-            R.id.device_section,
-            R.id.notification_settings,
-            R.id.display_settings,
-            R.id.storage_settings,
-            R.id.application_settings,
-            R.id.battery_settings,
-            R.id.personal_section,
-            R.id.location_settings,
-            R.id.security_settings,
-            R.id.language_settings,
-            R.id.user_settings,
-            R.id.account_settings,
-            R.id.system_section,
-            R.id.date_time_settings,
-            R.id.about_settings,
-            R.id.accessibility_settings,
-            R.id.print_settings,
-            R.id.nfc_payment_settings,
-            R.id.home_settings,
-            R.id.dashboard
+    private String[] SETTINGS_FOR_RESTRICTED = {
+            //wireless_section
+            WifiSettingsActivity.class.getName(),
+            Settings.BluetoothSettingsActivity.class.getName(),
+            Settings.DataUsageSummaryActivity.class.getName(),
+            Settings.SimSettingsActivity.class.getName(),
+            Settings.WirelessSettingsActivity.class.getName(),
+            //device_section
+            Settings.HomeSettingsActivity.class.getName(),
+            Settings.SoundSettingsActivity.class.getName(),
+            Settings.DisplaySettingsActivity.class.getName(),
+            Settings.StorageSettingsActivity.class.getName(),
+            Settings.ManageApplicationsActivity.class.getName(),
+            Settings.PowerUsageSummaryActivity.class.getName(),
+            //personal_section
+            Settings.LocationSettingsActivity.class.getName(),
+            Settings.SecuritySettingsActivity.class.getName(),
+            Settings.InputMethodAndLanguageSettingsActivity.class.getName(),
+            Settings.UserSettingsActivity.class.getName(),
+            Settings.AccountSettingsActivity.class.getName(),
+            //system_section
+            Settings.DateTimeSettingsActivity.class.getName(),
+            Settings.DeviceInfoSettingsActivity.class.getName(),
+            Settings.AccessibilitySettingsActivity.class.getName(),
+            Settings.PrintSettingsActivity.class.getName(),
+            Settings.PaymentSettingsActivity.class.getName(),
     };
 
     private static final String[] ENTRY_FRAGMENTS = {
@@ -333,7 +286,8 @@
             PaymentSettings.class.getName(),
             KeyboardLayoutPickerFragment.class.getName(),
             ZenModeSettings.class.getName(),
-            NotificationSettings.class.getName(),
+            SoundSettings.class.getName(),
+            ConfigureNotificationSettings.class.getName(),
             ChooseLockPassword.ChooseLockPasswordFragment.class.getName(),
             ChooseLockPattern.ChooseLockPatternFragment.class.getName(),
             InstalledAppDetails.class.getName(),
@@ -346,6 +300,7 @@
             ZenModeAutomationSettings.class.getName(),
             ZenModeScheduleRuleSettings.class.getName(),
             ZenModeEventRuleSettings.class.getName(),
+            ZenModeVisualInterruptionSettings.class.getName(),
             ProcessStatsUi.class.getName(),
             PowerUsageDetail.class.getName(),
             ProcessStatsSummary.class.getName(),
@@ -371,7 +326,7 @@
 
                 if (mBatteryPresent != batteryPresent) {
                     mBatteryPresent = batteryPresent;
-                    invalidateCategories(true);
+                    updateTilesList();
                 }
             }
         }
@@ -403,20 +358,6 @@
     private ArrayList<DashboardCategory> mCategories = new ArrayList<DashboardCategory>();
 
     private static final String MSG_DATA_FORCE_REFRESH = "msg_data_force_refresh";
-    private static final int MSG_BUILD_CATEGORIES = 1;
-    private Handler mHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_BUILD_CATEGORIES: {
-                    final boolean forceRefresh = msg.getData().getBoolean(MSG_DATA_FORCE_REFRESH);
-                    if (forceRefresh) {
-                        buildDashboardCategories(mCategories);
-                    }
-                } break;
-            }
-        }
-    };
 
     private boolean mNeedToRevertToInitialFragment = false;
     private int mHomeActivitiesCount = 1;
@@ -427,13 +368,6 @@
         return mSwitchBar;
     }
 
-    public List<DashboardCategory> getDashboardCategories(boolean forceRefresh) {
-        if (forceRefresh || mCategories.size() == 0) {
-            buildDashboardCategories(mCategories);
-        }
-        return mCategories;
-    }
-
     @Override
     public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
         // Override the fragment title for Wallpaper settings
@@ -451,14 +385,6 @@
         return false;
     }
 
-    private void invalidateCategories(boolean forceRefresh) {
-        if (!mHandler.hasMessages(MSG_BUILD_CATEGORIES)) {
-            Message msg = new Message();
-            msg.what = MSG_BUILD_CATEGORIES;
-            msg.getData().putBoolean(MSG_DATA_FORCE_REFRESH, forceRefresh);
-        }
-    }
-
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -528,6 +454,7 @@
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
+        long startTime = System.currentTimeMillis();
 
         // Should happen before any call to getIntent()
         getMetaData();
@@ -549,7 +476,11 @@
         final ComponentName cn = intent.getComponent();
         final String className = cn.getClassName();
 
-        mIsShowingDashboard = className.equals(Settings.class.getName());
+        mIsShowingDashboard = className.equals(Settings.class.getName())
+                || className.equals(Settings.WirelessSettings.class.getName())
+                || className.equals(Settings.DeviceSettings.class.getName())
+                || className.equals(Settings.PersonalSettings.class.getName())
+                || className.equals(Settings.WirelessSettings.class.getName());
 
         // This is a "Sub Settings" when:
         // - this is a real SubSettings
@@ -577,7 +508,15 @@
         if (mIsShowingDashboard) {
             // Run the Index update only if we have some space
             if (!Utils.isLowStorage(this)) {
-                Index.getInstance(getApplicationContext()).update();
+                long indexStartTime = System.currentTimeMillis();
+                AsyncTask.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        Index.getInstance(getApplicationContext()).update();
+                    }
+                });
+                if (DEBUG_TIMING) Log.d(LOG_TAG, "Index.update() took "
+                        + (System.currentTimeMillis() - indexStartTime) + " ms");
             } else {
                 Log.w(LOG_TAG, "Cannot update the Indexer as we are running low on storage space!");
             }
@@ -692,6 +631,8 @@
         }
 
         mHomeActivitiesCount = getHomeActivitiesCount();
+        if (DEBUG_TIMING) Log.d(LOG_TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+                + " ms");
     }
 
     private int getHomeActivitiesCount() {
@@ -796,20 +737,11 @@
     @Override
     protected void onResume() {
         super.onResume();
-        if (mIsShowingDashboard) {
-            MetricsLogger.visible(this, MetricsLogger.MAIN_SETTINGS);
-        }
-
-        final int newHomeActivityCount = getHomeActivitiesCount();
-        if (newHomeActivityCount != mHomeActivitiesCount) {
-            mHomeActivitiesCount = newHomeActivityCount;
-            invalidateCategories(true);
-        }
 
         mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-                invalidateCategories(true);
+                updateTilesList();
             }
         };
         mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
@@ -822,14 +754,12 @@
         if(mDisplaySearch && !TextUtils.isEmpty(mSearchQuery)) {
             onQueryTextSubmit(mSearchQuery);
         }
+        updateTilesList();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        if (mIsShowingDashboard) {
-            MetricsLogger.hidden(this, MetricsLogger.MAIN_SETTINGS);
-        }
         unregisterReceiver(mBatteryInfoReceiver);
         mDynamicIndexableContentMonitor.unregister();
     }
@@ -1030,346 +960,104 @@
         return f;
     }
 
-    /**
-     * Called when the activity needs its list of categories/tiles built.
-     *
-     * @param categories The list in which to place the tiles categories.
-     */
-    private void buildDashboardCategories(List<DashboardCategory> categories) {
-        categories.clear();
-        loadCategoriesFromResource(R.xml.dashboard_categories, categories, this);
-        updateTilesList(categories);
+    private void updateTilesList() {
+        // Generally the items that are will be changing from these updates will
+        // not be in the top list of tiles, so run it in the background and the
+        // SettingsDrawerActivity will pick up on the updates automatically.
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                doUpdateTilesList();
+            }
+        });
     }
 
-    /**
-     * Parse the given XML file as a categories description, adding each
-     * parsed categories and tiles into the target list.
-     *
-     * @param resid The XML resource to load and parse.
-     * @param target The list in which the parsed categories and tiles should be placed.
-     */
-    public static void loadCategoriesFromResource(int resid, List<DashboardCategory> target,
-            Context context) {
-        XmlResourceParser parser = null;
-        try {
-            parser = context.getResources().getXml(resid);
-            AttributeSet attrs = Xml.asAttributeSet(parser);
-
-            int type;
-            while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-                // Parse next until start tag is found
-            }
-
-            String nodeName = parser.getName();
-            if (!"dashboard-categories".equals(nodeName)) {
-                throw new RuntimeException(
-                        "XML document must start with <preference-categories> tag; found"
-                                + nodeName + " at " + parser.getPositionDescription());
-            }
-
-            Bundle curBundle = null;
-
-            final int outerDepth = parser.getDepth();
-            while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
-                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
-                if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
-                    continue;
-                }
-
-                nodeName = parser.getName();
-                if ("dashboard-category".equals(nodeName)) {
-                    DashboardCategory category = new DashboardCategory();
-
-                    TypedArray sa = context.obtainStyledAttributes(
-                            attrs, com.android.internal.R.styleable.PreferenceHeader);
-                    category.id = sa.getResourceId(
-                            com.android.internal.R.styleable.PreferenceHeader_id,
-                            (int)DashboardCategory.CAT_ID_UNDEFINED);
-
-                    TypedValue tv = sa.peekValue(
-                            com.android.internal.R.styleable.PreferenceHeader_title);
-                    if (tv != null && tv.type == TypedValue.TYPE_STRING) {
-                        if (tv.resourceId != 0) {
-                            category.titleRes = tv.resourceId;
-                        } else {
-                            category.title = tv.string;
-                        }
-                    }
-                    sa.recycle();
-                    sa = context.obtainStyledAttributes(attrs,
-                            com.android.internal.R.styleable.Preference);
-                    tv = sa.peekValue(
-                            com.android.internal.R.styleable.Preference_key);
-                    if (tv != null && tv.type == TypedValue.TYPE_STRING) {
-                        if (tv.resourceId != 0) {
-                            category.key = context.getString(tv.resourceId);
-                        } else {
-                            category.key = tv.string.toString();
-                        }
-                    }
-                    sa.recycle();
-
-                    final int innerDepth = parser.getDepth();
-                    while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
-                            && (type != XmlPullParser.END_TAG || parser.getDepth() > innerDepth)) {
-                        if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
-                            continue;
-                        }
-
-                        String innerNodeName = parser.getName();
-                        if (innerNodeName.equals("dashboard-tile")) {
-                            DashboardTile tile = new DashboardTile();
-
-                            sa = context.obtainStyledAttributes(
-                                    attrs, com.android.internal.R.styleable.PreferenceHeader);
-                            tile.id = sa.getResourceId(
-                                    com.android.internal.R.styleable.PreferenceHeader_id,
-                                    (int)TILE_ID_UNDEFINED);
-                            tv = sa.peekValue(
-                                    com.android.internal.R.styleable.PreferenceHeader_title);
-                            if (tv != null && tv.type == TypedValue.TYPE_STRING) {
-                                if (tv.resourceId != 0) {
-                                    tile.titleRes = tv.resourceId;
-                                } else {
-                                    tile.title = tv.string;
-                                }
-                            }
-                            tv = sa.peekValue(
-                                    com.android.internal.R.styleable.PreferenceHeader_summary);
-                            if (tv != null && tv.type == TypedValue.TYPE_STRING) {
-                                if (tv.resourceId != 0) {
-                                    tile.summaryRes = tv.resourceId;
-                                } else {
-                                    tile.summary = tv.string;
-                                }
-                            }
-                            tile.iconRes = sa.getResourceId(
-                                    com.android.internal.R.styleable.PreferenceHeader_icon, 0);
-                            tile.fragment = sa.getString(
-                                    com.android.internal.R.styleable.PreferenceHeader_fragment);
-                            sa.recycle();
-
-                            if (curBundle == null) {
-                                curBundle = new Bundle();
-                            }
-
-                            final int innerDepth2 = parser.getDepth();
-                            while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
-                                    && (type != XmlPullParser.END_TAG || parser.getDepth() > innerDepth2)) {
-                                if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
-                                    continue;
-                                }
-
-                                String innerNodeName2 = parser.getName();
-                                if (innerNodeName2.equals("extra")) {
-                                    context.getResources().parseBundleExtra("extra", attrs,
-                                            curBundle);
-                                    XmlUtils.skipCurrentTag(parser);
-
-                                } else if (innerNodeName2.equals("intent")) {
-                                    tile.intent = Intent.parseIntent(context.getResources(), parser,
-                                            attrs);
-
-                                } else {
-                                    XmlUtils.skipCurrentTag(parser);
-                                }
-                            }
-
-                            if (curBundle.size() > 0) {
-                                tile.fragmentArguments = curBundle;
-                                curBundle = null;
-                            }
-
-                            // Show the SIM Cards setting if there are more than 2 SIMs installed.
-                            if(tile.id != R.id.sim_settings || Utils.showSimCardTile(context)){
-                                category.addTile(tile);
-                            }
-
-                        } else if (innerNodeName.equals("external-tiles")) {
-                            category.externalIndex = category.getTilesCount();
-                        } else {
-                            XmlUtils.skipCurrentTag(parser);
-                        }
-                    }
-
-                    target.add(category);
-                } else {
-                    XmlUtils.skipCurrentTag(parser);
-                }
-            }
-
-        } catch (XmlPullParserException e) {
-            throw new RuntimeException("Error parsing categories", e);
-        } catch (IOException e) {
-            throw new RuntimeException("Error parsing categories", e);
-        } finally {
-            if (parser != null) parser.close();
-        }
-    }
-
-    private void updateTilesList(List<DashboardCategory> target) {
-        final boolean showDev = mDevelopmentPreferences.getBoolean(
-                DevelopmentSettings.PREF_SHOW,
-                android.os.Build.TYPE.equals("eng"));
-
+    private void doUpdateTilesList() {
+        PackageManager pm = getPackageManager();
         final UserManager um = UserManager.get(this);
         final boolean isAdmin = um.isAdminUser();
 
-        final int size = target.size();
-        for (int i = 0; i < size; i++) {
+        String packageName = getPackageName();
+        setTileEnabled(new ComponentName(packageName, WifiSettingsActivity.class.getName()),
+                pm.hasSystemFeature(PackageManager.FEATURE_WIFI), isAdmin, pm);
 
-            DashboardCategory category = target.get(i);
+        setTileEnabled(new ComponentName(packageName,
+                Settings.BluetoothSettingsActivity.class.getName()),
+                pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin, pm);
 
-            // Ids are integers, so downcasting is ok
-            int id = (int) category.id;
-            int n = category.getTilesCount() - 1;
-            while (n >= 0) {
+        setTileEnabled(new ComponentName(packageName,
+                Settings.DataUsageSummaryActivity.class.getName()),
+                Utils.isBandwidthControlEnabled(), isAdmin, pm);
 
-                DashboardTile tile = category.getTile(n);
-                boolean removeTile = false;
-                id = (int) tile.id;
-                if (id == R.id.operator_settings || id == R.id.manufacturer_settings) {
-                    if (!Utils.updateTileToSpecificActivityFromMetaDataOrRemove(this, tile)) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.wifi_settings) {
-                    // Remove WiFi Settings if WiFi service is not available.
-                    if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.bluetooth_settings) {
-                    // Remove Bluetooth Settings if Bluetooth service is not available.
-                    if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.data_usage_settings) {
-                    // Remove data usage when kernel module not enabled
-                    if (!Utils.isBandwidthControlEnabled()) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.battery_settings) {
-                    // Remove battery settings when battery is not available. (e.g. TV)
+        setTileEnabled(new ComponentName(packageName,
+                Settings.SimSettingsActivity.class.getName()),
+                Utils.showSimCardTile(this), isAdmin, pm);
 
-                    if (!mBatteryPresent) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.home_settings) {
-                    if (!updateHomeSettingTiles(tile)) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.user_settings) {
-                    if (!UserHandle.MU_ENABLED
-                            || !UserManager.supportsMultipleUsers()
-                            || Utils.isMonkeyRunning()) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.nfc_payment_settings) {
-                    if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) {
-                        removeTile = true;
-                    } else {
-                        // Only show if NFC is on and we have the HCE feature
-                        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
-                        if (adapter == null || !adapter.isEnabled() ||
-                                !getPackageManager().hasSystemFeature(
-                                        PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
-                            removeTile = true;
-                        }
-                    }
-                } else if (id == R.id.print_settings) {
-                    boolean hasPrintingSupport = getPackageManager().hasSystemFeature(
-                            PackageManager.FEATURE_PRINTING);
-                    if (!hasPrintingSupport) {
-                        removeTile = true;
-                    }
-                } else if (id == R.id.development_settings) {
-                    if (!showDev || um.hasUserRestriction(
-                            UserManager.DISALLOW_DEBUGGING_FEATURES)) {
-                        removeTile = true;
+        setTileEnabled(new ComponentName(packageName,
+                Settings.PowerUsageSummaryActivity.class.getName()),
+                mBatteryPresent, isAdmin, pm);
+
+        setTileEnabled(new ComponentName(packageName,
+                Settings.HomeSettingsActivity.class.getName()),
+                updateHomeSettingTiles(), isAdmin, pm);
+
+        setTileEnabled(new ComponentName(packageName,
+                Settings.UserSettingsActivity.class.getName()),
+                UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()
+                && !Utils.isMonkeyRunning(), isAdmin, pm);
+
+        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
+        setTileEnabled(new ComponentName(packageName,
+                        Settings.PaymentSettingsActivity.class.getName()),
+                pm.hasSystemFeature(PackageManager.FEATURE_NFC)
+                        && pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
+                        && adapter != null && adapter.isEnabled(), isAdmin, pm);
+
+        setTileEnabled(new ComponentName(packageName,
+                Settings.PrintSettingsActivity.class.getName()),
+                pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin, pm);
+
+        final boolean showDev = mDevelopmentPreferences.getBoolean(
+                DevelopmentSettings.PREF_SHOW,
+                android.os.Build.TYPE.equals("eng"));
+        setTileEnabled(new ComponentName(packageName,
+                        Settings.DevelopmentSettingsActivity.class.getName()),
+                showDev && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES),
+                isAdmin, pm);
+
+        if (UserHandle.MU_ENABLED && !isAdmin) {
+            // When on restricted users, disable all extra categories (but only the settings ones).
+            List<DashboardCategory> categories = getDashboardCategories();
+            for (DashboardCategory category : categories) {
+                for (DashboardTile tile : category.tiles) {
+                    ComponentName component = tile.intent.getComponent();
+                    if (packageName.equals(component)&& !ArrayUtils.contains(
+                            SETTINGS_FOR_RESTRICTED, component.getClassName())) {
+                        setTileEnabled(component, false, isAdmin, pm);
                     }
                 }
-
-                if (UserHandle.MU_ENABLED && !isAdmin
-                        && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
-                    removeTile = true;
-                }
-
-                if (removeTile && n < category.getTilesCount()) {
-                    category.removeTile(n);
-                }
-                n--;
             }
         }
-        addExternalTiles(target);
-    }
-
-    private void addExternalTiles(List<DashboardCategory> target) {
-        Map<Pair<String, String>, DashboardTile> addedCache =
-                new ArrayMap<Pair<String, String>, DashboardTile>();
-        UserManager userManager = UserManager.get(this);
-        for (UserHandle user : userManager.getUserProfiles()) {
-            addExternalTiles(target, user, addedCache);
-        }
     }
 
-    private void addExternalTiles(List<DashboardCategory> target, UserHandle user,
-            Map<Pair<String, String>, DashboardTile> addedCache) {
-        PackageManager pm = getPackageManager();
-        Intent intent = new Intent(EXTRA_SETTINGS_ACTION);
-        List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent,
-                PackageManager.GET_META_DATA, user.getIdentifier());
-        for (ResolveInfo resolved : results) {
-            if (!resolved.system) {
-                // Do not allow any app to add to settings, only system ones.
-                continue;
-            }
-            ActivityInfo activityInfo = resolved.activityInfo;
-            Bundle metaData = activityInfo.metaData;
-            if ((metaData == null) || !metaData.containsKey(EXTRA_CATEGORY_KEY)) {
-                Log.w(LOG_TAG, "Found " + resolved.activityInfo.name + " for action "
-                        + EXTRA_SETTINGS_ACTION + " missing metadata " +
-                        (metaData == null ? "" : EXTRA_CATEGORY_KEY));
-                continue;
-            }
-            String categoryKey = metaData.getString(EXTRA_CATEGORY_KEY);
-            DashboardCategory category = getCategory(target, categoryKey);
-            if (category == null) {
-                Log.w(LOG_TAG, "Activity " + resolved.activityInfo.name + " has unknown "
-                        + "category key " + categoryKey);
-                continue;
-            }
-            Pair<String, String> key = new Pair<String, String>(activityInfo.packageName,
-                    activityInfo.name);
-            DashboardTile tile = addedCache.get(key);
-            if (tile == null) {
-                tile = new DashboardTile();
-                tile.intent = new Intent().setClassName(
-                        activityInfo.packageName, activityInfo.name);
-                Utils.updateTileToSpecificActivityFromMetaDataOrRemove(this, tile);
-
-                if (category.externalIndex == -1) {
-                    // If no location for external tiles has been specified for this category,
-                    // then just put them at the end.
-                    category.addTile(tile);
-                } else {
-                    category.addTile(category.externalIndex, tile);
-                }
-                addedCache.put(key, tile);
-            }
-            tile.userHandle.add(user);
+    private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,
+                                PackageManager pm) {
+        if (UserHandle.MU_ENABLED && !isAdmin
+                && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, component.getClassName())) {
+            enabled = false;
+        }
+        int state = pm.getComponentEnabledSetting(component);
+        boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
+                || state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+        if (isEnabled != enabled) {
+            pm.setComponentEnabledSetting(component, enabled
+                    ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                    : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
         }
     }
 
-    private DashboardCategory getCategory(List<DashboardCategory> target, String categoryKey) {
-        for (DashboardCategory category : target) {
-            if (categoryKey.equals(category.key)) {
-                return category;
-            }
-        }
-        return null;
-    }
-
-    private boolean updateHomeSettingTiles(DashboardTile tile) {
+    private boolean updateHomeSettingTiles() {
         // Once we decide to show Home settings, keep showing it forever
         SharedPreferences sp = getSharedPreferences(HomeSettings.HOME_PREFS, Context.MODE_PRIVATE);
         if (sp.getBoolean(HomeSettings.HOME_PREFS_DO_SHOW, false)) {
@@ -1379,23 +1067,7 @@
         try {
             mHomeActivitiesCount = getHomeActivitiesCount();
             if (mHomeActivitiesCount < 2) {
-                // When there's only one available home app, omit this settings
-                // category entirely at the top level UI.  If the user just
-                // uninstalled the penultimate home app candidiate, we also
-                // now tell them about why they aren't seeing 'Home' in the list.
-                if (sShowNoHomeNotice) {
-                    sShowNoHomeNotice = false;
-                    NoHomeDialogFragment.show(this);
-                }
                 return false;
-            } else {
-                // Okay, we're allowing the Home settings category.  Tell it, when
-                // invoked via this front door, that we'll need to be told about the
-                // case when the user uninstalls all but one home app.
-                if (tile.fragmentArguments == null) {
-                    tile.fragmentArguments = new Bundle();
-                }
-                tile.fragmentArguments.putBoolean(HomeSettings.HOME_SHOW_NOTICE, true);
             }
         } catch (Exception e) {
             // Can't look up the home activity; bail on configuring the icon
@@ -1432,10 +1104,6 @@
         return super.shouldUpRecreateTask(new Intent(this, SettingsActivity.class));
     }
 
-    public static void requestHomeNotice() {
-        sShowNoHomeNotice = true;
-    }
-
     @Override
     public boolean onQueryTextSubmit(String query) {
         switchToSearchResultsFragmentIfNeeded();
@@ -1475,6 +1143,23 @@
         return true;
     }
 
+    @Override
+    protected void onTileClicked(DashboardTile tile) {
+        if (mIsShowingDashboard) {
+            // If on dashboard, don't finish so the back comes back to here.
+            openTile(tile);
+        } else {
+            super.onTileClicked(tile);
+        }
+    }
+
+    @Override
+    public void onProfileTileOpen() {
+        if (!mIsShowingDashboard) {
+            finish();
+        }
+    }
+
     private void switchToSearchResultsFragmentIfNeeded() {
         if (mSearchResultsFragment != null) {
             return;
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index b7a2447..71501b1 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -41,6 +41,14 @@
         }
     }
 
+    public static int getTransparentTheme(Intent intent) {
+        if (WizardManagerHelper.isLightTheme(intent, true)) {
+            return R.style.SetupWizardTheme_Light_Transparent;
+        } else {
+            return R.style.SetupWizardTheme_Transparent;
+        }
+    }
+
     /**
      * Sets the immersive mode related flags based on the extra in the intent which started the
      * activity.
diff --git a/src/com/android/settings/UserAdapter.java b/src/com/android/settings/UserAdapter.java
deleted file mode 100644
index 2ac908e..0000000
--- a/src/com/android/settings/UserAdapter.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2014 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.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.UserInfo;
-import android.database.DataSetObserver;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import com.android.internal.util.UserIcons;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import java.util.ArrayList;
-
-/**
- * Adapter for a spinner that shows a list of users.
- */
-public class UserAdapter implements SpinnerAdapter, ListAdapter {
-    // TODO: Update UI. See: http://b/16518801
-    /** Holder for user details */
-    public static class UserDetails {
-        private final UserHandle mUserHandle;
-        private final String mName;
-        private final Drawable mIcon;
-
-        public UserDetails(UserHandle userHandle, UserManager um, Context context) {
-            mUserHandle = userHandle;
-            UserInfo userInfo = um.getUserInfo(mUserHandle.getIdentifier());
-            Drawable icon;
-            if (userInfo.isManagedProfile()) {
-                mName = context.getString(R.string.managed_user_title);
-                icon = context.getDrawable(
-                    com.android.internal.R.drawable.ic_corp_icon);
-            } else {
-                mName = userInfo.name;
-                final int userId = userInfo.id;
-                if (um.getUserIcon(userId) != null) {
-                    icon = new BitmapDrawable(context.getResources(), um.getUserIcon(userId));
-                } else {
-                    icon = UserIcons.getDefaultUserIcon(userId, /* light= */ false);
-                }
-            }
-            this.mIcon = encircle(context, icon);
-        }
-
-        private static Drawable encircle(Context context, Drawable icon) {
-            return CircleFramedDrawable.getInstance(context, UserIcons.convertToBitmap(icon));
-        }
-    }
-    private ArrayList<UserDetails> data;
-    private final LayoutInflater mInflater;
-
-    public UserAdapter(Context context, ArrayList<UserDetails> users) {
-        if (users == null) {
-            throw new IllegalArgumentException("A list of user details must be provided");
-        }
-        this.data = users;
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    public UserHandle getUserHandle(int position) {
-        if (position < 0 || position >= data.size()) {
-            return null;
-        }
-        return data.get(position).mUserHandle;
-    }
-
-    @Override
-    public View getDropDownView(int position, View convertView, ViewGroup parent) {
-        final View row = convertView != null ? convertView : createUser(parent);
-
-        UserDetails user = data.get(position);
-        ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(user.mIcon);
-        ((TextView) row.findViewById(android.R.id.title)).setText(getTitle(user));
-        return row;
-    }
-
-    private int getTitle(UserDetails user) {
-        int userHandle = user.mUserHandle.getIdentifier();
-        if (userHandle == UserHandle.USER_CURRENT
-                || userHandle == ActivityManager.getCurrentUser()) {
-            return R.string.category_personal;
-        } else {
-            return R.string.category_work;
-        }
-    }
-
-    private View createUser(ViewGroup parent) {
-        return mInflater.inflate(R.layout.user_preference, parent, false);
-    }
-
-    @Override
-    public void registerDataSetObserver(DataSetObserver observer) {
-        // We don't support observers
-    }
-
-    @Override
-    public void unregisterDataSetObserver(DataSetObserver observer) {
-        // We don't support observers
-    }
-
-    @Override
-    public int getCount() {
-        return data.size();
-    }
-
-    @Override
-    public UserDetails getItem(int position) {
-        return data.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return data.get(position).mUserHandle.getIdentifier();
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return false;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        return getDropDownView(position, convertView, parent);
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return 0;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return data.isEmpty();
-    }
-
-    @Override
-    public boolean areAllItemsEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled(int position) {
-        return true;
-    }
-}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 7129a81..5a54ba4 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -41,12 +41,10 @@
 import android.content.pm.Signature;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
 import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.hardware.usb.IUsbManager;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.Uri;
@@ -84,11 +82,9 @@
 import android.view.animation.AnimationUtils;
 import android.widget.ListView;
 import android.widget.TabWidget;
-
 import com.android.internal.util.UserIcons;
-import com.android.settings.UserAdapter.UserDetails;
-import com.android.settings.dashboard.DashboardTile;
-import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.drawer.UserAdapter;
+import com.android.settingslib.drawer.UserAdapter.UserDetails;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -123,24 +119,6 @@
             0xfffabf2c, 0xff679e37, 0xff0a7f42
     };
 
-    /**
-     * Name of the meta-data item that should be set in the AndroidManifest.xml
-     * to specify the icon that should be displayed for the preference.
-     */
-    public static final String META_DATA_PREFERENCE_ICON = "com.android.settings.icon";
-
-    /**
-     * Name of the meta-data item that should be set in the AndroidManifest.xml
-     * to specify the title that should be displayed for the preference.
-     */
-    public static final String META_DATA_PREFERENCE_TITLE = "com.android.settings.title";
-
-    /**
-     * Name of the meta-data item that should be set in the AndroidManifest.xml
-     * to specify the summary text that should be displayed for the preference.
-     */
-    public static final String META_DATA_PREFERENCE_SUMMARY = "com.android.settings.summary";
-
     private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
 
     private static final int SECONDS_PER_MINUTE = 60;
@@ -206,74 +184,6 @@
         return false;
     }
 
-    public static boolean updateTileToSpecificActivityFromMetaDataOrRemove(Context context,
-            DashboardTile tile) {
-
-        Intent intent = tile.intent;
-        if (intent != null) {
-            // Find the activity that is in the system image
-            PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> list = tile.userHandle.size() != 0
-                    ? pm.queryIntentActivitiesAsUser(intent, PackageManager.GET_META_DATA,
-                            tile.userHandle.get(0).getIdentifier())
-                    : pm.queryIntentActivities(intent, PackageManager.GET_META_DATA);
-            int listSize = list.size();
-            for (int i = 0; i < listSize; i++) {
-                ResolveInfo resolveInfo = list.get(i);
-                if ((resolveInfo.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM)
-                        != 0) {
-                    int icon = 0;
-                    CharSequence title = null;
-                    String summary = null;
-
-                    // Get the activity's meta-data
-                    try {
-                        Resources res = pm.getResourcesForApplication(
-                                resolveInfo.activityInfo.packageName);
-                        Bundle metaData = resolveInfo.activityInfo.metaData;
-
-                        if (res != null && metaData != null) {
-                            if (metaData.containsKey(META_DATA_PREFERENCE_ICON)) {
-                                icon = metaData.getInt(META_DATA_PREFERENCE_ICON);
-                            }
-                            if (metaData.containsKey(META_DATA_PREFERENCE_TITLE)) {
-                                title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));
-                            }
-                            if (metaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {
-                                summary = res.getString(
-                                        metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
-                            }
-                        }
-                    } catch (NameNotFoundException | NotFoundException e) {
-                        // Ignore
-                    }
-
-                    // Set the preference title to the activity's label if no
-                    // meta-data is found
-                    if (TextUtils.isEmpty(title)) {
-                        title = resolveInfo.loadLabel(pm).toString();
-                    }
-                    if (icon == 0) {
-                        icon = resolveInfo.activityInfo.icon;
-                    }
-
-                    // Set icon, title and summary for the preference
-                    tile.iconRes = icon;
-                    tile.iconPkg = resolveInfo.activityInfo.packageName;
-                    tile.title = title;
-                    tile.summary = summary;
-                    // Replace the intent with this specific activity
-                    tile.intent = new Intent().setClassName(resolveInfo.activityInfo.packageName,
-                            resolveInfo.activityInfo.name);
-
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Returns true if Monkey is running.
      */
@@ -723,39 +633,6 @@
     }
 
     /**
-     * Creates a {@link UserAdapter} if there is more than one profile on the device.
-     *
-     * <p> The adapter can be used to populate a spinner that switches between the Settings
-     * app on the different profiles.
-     *
-     * @return a {@link UserAdapter} or null if there is only one profile.
-     */
-    public static UserAdapter createUserSpinnerAdapter(UserManager userManager,
-            Context context) {
-        List<UserHandle> userProfiles = userManager.getUserProfiles();
-        if (userProfiles.size() < 2) {
-            return null;
-        }
-
-        UserHandle myUserHandle = new UserHandle(UserHandle.myUserId());
-        // The first option should be the current profile
-        userProfiles.remove(myUserHandle);
-        userProfiles.add(0, myUserHandle);
-
-        return createUserAdapter(userManager, context, userProfiles);
-    }
-
-    public static UserAdapter createUserAdapter(UserManager userManager,
-            Context context, List<UserHandle> userProfiles) {
-        ArrayList<UserDetails> userDetails = new ArrayList<UserDetails>(userProfiles.size());
-        final int count = userProfiles.size();
-        for (int i = 0; i < count; i++) {
-            userDetails.add(new UserDetails(userProfiles.get(i), userManager, context));
-        }
-        return new UserAdapter(context, userDetails);
-    }
-
-    /**
      * Returns the target user for a Settings activity.
      *
      * The target user can be either the current user, the user that launched this activity or
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index 0ee3c9d..77bb532 100644
--- a/src/com/android/settings/WallpaperTypeSettings.java
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -65,6 +65,7 @@
         // Add Preference items for each of the matching activities
         for (ResolveInfo info : rList) {
             Preference pref = new Preference(getPrefContext());
+            pref.setLayoutResource(R.layout.preference_wallpaper_type);
             Intent prefIntent = new Intent(intent);
             prefIntent.setComponent(new ComponentName(
                     info.activityInfo.packageName, info.activityInfo.name));
@@ -72,6 +73,7 @@
             CharSequence label = info.loadLabel(pm);
             if (label == null) label = info.activityInfo.packageName;
             pref.setTitle(label);
+            pref.setIcon(info.loadIcon(pm));
             parent.addPreference(pref);
         }
     }
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 55a2c32..27ab6a2 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -68,7 +68,6 @@
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
-    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
@@ -327,26 +326,6 @@
             p.setEnabled(!TetherSettings
                     .isProvisioningNeededButUnavailable(getActivity()));
         }
-
-        // Enable link to CMAS app settings depending on the value in config.xml.
-        boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
-                com.android.internal.R.bool.config_cellBroadcastAppLinks);
-        try {
-            if (isCellBroadcastAppLinkEnabled) {
-                if (mPm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
-                        == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
-                    isCellBroadcastAppLinkEnabled = false;  // CMAS app disabled
-                }
-            }
-        } catch (IllegalArgumentException ignored) {
-            isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
-        }
-        if (!isAdmin || !isCellBroadcastAppLinkEnabled
-                || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS)) {
-            PreferenceScreen root = getPreferenceScreen();
-            Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS);
-            if (ps != null) root.removePreference(ps);
-        }
     }
 
     @Override
@@ -478,23 +457,6 @@
                     result.add(KEY_TETHER_SETTINGS);
                 }
 
-                // Enable link to CMAS app settings depending on the value in config.xml.
-                boolean isCellBroadcastAppLinkEnabled = context.getResources().getBoolean(
-                        com.android.internal.R.bool.config_cellBroadcastAppLinks);
-                try {
-                    if (isCellBroadcastAppLinkEnabled) {
-                        if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
-                                == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
-                            isCellBroadcastAppLinkEnabled = false;  // CMAS app disabled
-                        }
-                    }
-                } catch (IllegalArgumentException ignored) {
-                    isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
-                }
-                if (isSecondaryUser || !isCellBroadcastAppLinkEnabled) {
-                    result.add(KEY_CELL_BROADCAST_SETTINGS);
-                }
-
                 return result;
             }
         };
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 1dcbaa5..672582d 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -22,7 +22,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.res.Configuration;
 import android.net.Uri;
@@ -38,11 +37,9 @@
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.text.TextUtils.SimpleStringSplitter;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityManager;
-
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
@@ -54,6 +51,7 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -70,8 +68,6 @@
 
     private static final float LARGE_FONT_SCALE = 1.3f;
 
-    static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
-
     // Preference categories
     private static final String SERVICES_CATEGORY = "services_category";
     private static final String SYSTEM_CATEGORY = "system_category";
@@ -89,6 +85,8 @@
             "toggle_lock_screen_rotation_preference";
     private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
             "toggle_speak_password_preference";
+    private static final String TOGGLE_LARGE_POINTER_ICON =
+            "toggle_large_pointer_icon";
     private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
             "select_long_press_timeout_preference";
     private static final String ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN =
@@ -118,13 +116,9 @@
     private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
 
     // Auxiliary members.
-    final static SimpleStringSplitter sStringColonSplitter =
-            new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+    static final Set<ComponentName> sInstalledServices = new HashSet<>();
 
-    static final Set<ComponentName> sInstalledServices = new HashSet<ComponentName>();
-
-    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
-            new HashMap<String, String>();
+    private final Map<String, String> mLongPressTimeoutValuetoTitleMap = new HashMap<>();
 
     private final Configuration mCurConfig = new Configuration();
 
@@ -133,8 +127,9 @@
     private final Runnable mUpdateRunnable = new Runnable() {
         @Override
         public void run() {
-            loadInstalledServices();
-            updateServicesPreferences();
+            if (getActivity() != null) {
+                updateServicesPreferences();
+            }
         }
     };
 
@@ -168,7 +163,6 @@
             new SettingsContentObserver(mHandler) {
                 @Override
                 public void onChange(boolean selfChange, Uri uri) {
-                    loadInstalledServices();
                     updateServicesPreferences();
                 }
             };
@@ -189,6 +183,7 @@
     private SwitchPreference mTogglePowerButtonEndsCallPreference;
     private SwitchPreference mToggleLockScreenRotationPreference;
     private SwitchPreference mToggleSpeakPasswordPreference;
+    private SwitchPreference mToggleLargePointerIconPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
     private Preference mNoServicesMessagePreference;
     private PreferenceScreen mCaptioningPreferenceScreen;
@@ -224,7 +219,6 @@
     @Override
     public void onResume() {
         super.onResume();
-        loadInstalledServices();
         updateAllPreferences();
 
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
@@ -287,6 +281,9 @@
         } else if (mToggleSpeakPasswordPreference == preference) {
             handleToggleSpeakPasswordPreferenceClick();
             return true;
+        } else if (mToggleLargePointerIconPreference == preference) {
+            handleToggleLargePointerIconPreferenceClick();
+            return true;
         } else if (mGlobalGesturePreferenceScreen == preference) {
             handleToggleEnableAccessibilityGesturePreferenceClick();
             return true;
@@ -331,6 +328,12 @@
                 mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
     }
 
+    private void handleToggleLargePointerIconPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
+                mToggleLargePointerIconPreference.isChecked() ? 1 : 0);
+    }
+
     private void handleToggleEnableAccessibilityGesturePreferenceClick() {
         Bundle extras = mGlobalGesturePreferenceScreen.getExtras();
         extras.putString(EXTRA_TITLE, getString(
@@ -388,6 +391,10 @@
         mToggleSpeakPasswordPreference =
                 (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
 
+        // Large pointer icon.
+        mToggleLargePointerIconPreference =
+                (SwitchPreference) findPreference(TOGGLE_LARGE_POINTER_ICON);
+
         // Long press timeout.
         mSelectLongPressTimeoutPreference =
                 (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
@@ -574,6 +581,10 @@
                 Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
         mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
 
+        // Large pointer icon.
+        mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0) != 0);
+
         // Long press timeout.
         final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
@@ -630,27 +641,6 @@
         }
     }
 
-    private void loadInstalledServices() {
-        Set<ComponentName> installedServices = sInstalledServices;
-        installedServices.clear();
-
-        List<AccessibilityServiceInfo> installedServiceInfos =
-                AccessibilityManager.getInstance(getActivity())
-                        .getInstalledAccessibilityServiceList();
-        if (installedServiceInfos == null) {
-            return;
-        }
-
-        final int installedServiceInfoCount = installedServiceInfos.size();
-        for (int i = 0; i < installedServiceInfoCount; i++) {
-            ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
-            ComponentName installedService = new ComponentName(
-                    resolveInfo.serviceInfo.packageName,
-                    resolveInfo.serviceInfo.name);
-            installedServices.add(installedService);
-        }
-    }
-
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
         @Override
diff --git a/src/com/android/settings/accessibility/AccessibilityUtils.java b/src/com/android/settings/accessibility/AccessibilityUtils.java
deleted file mode 100644
index 7282bce..0000000
--- a/src/com/android/settings/accessibility/AccessibilityUtils.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.provider.Settings;
-import android.text.TextUtils.SimpleStringSplitter;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
-
-/**
- * Utility methods used within accessibility settings.
- */
-class AccessibilityUtils {
-    /**
-     * @return the set of enabled accessibility services. If there are not services
-     * it returned the unmodifiable {@link Collections#emptySet()}.
-     */
-    static Set<ComponentName> getEnabledServicesFromSettings(Context context) {
-        final String enabledServicesSetting = Settings.Secure.getString(
-                context.getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        if (enabledServicesSetting == null) {
-            return Collections.emptySet();
-        }
-
-        final Set<ComponentName> enabledServices = new HashSet<ComponentName>();
-        final SimpleStringSplitter colonSplitter = AccessibilitySettings.sStringColonSplitter;
-        colonSplitter.setString(enabledServicesSetting);
-
-        while (colonSplitter.hasNext()) {
-            final String componentNameString = colonSplitter.next();
-            final ComponentName enabledService = ComponentName.unflattenFromString(
-                    componentNameString);
-            if (enabledService != null) {
-                enabledServices.add(enabledService);
-            }
-        }
-
-        return enabledServices;
-    }
-
-    /**
-     * @return a localized version of the text resource specified by resId
-     */
-    static CharSequence getTextForLocale(Context context, Locale locale, int resId) {
-        final Resources res = context.getResources();
-        final Configuration config = res.getConfiguration();
-        final Locale prevLocale = config.locale;
-        try {
-            config.locale = locale;
-            res.updateConfiguration(config, null);
-            return res.getText(resId);
-        } finally {
-            config.locale = prevLocale;
-            res.updateConfiguration(config, null);
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 7469fa3..83f3ecb 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -44,6 +44,7 @@
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
+import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.Locale;
 
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 16389cb..c19e220 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -47,11 +47,9 @@
 import com.android.settings.R;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
+import com.android.settingslib.accessibility.AccessibilityUtils;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class ToggleAccessibilityServicePreferenceFragment
         extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
@@ -101,56 +99,8 @@
 
     @Override
     public void onPreferenceToggled(String preferenceKey, boolean enabled) {
-        // Parse the enabled services.
-        Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings(
-                getActivity());
-
-        if (enabledServices == (Set<?>) Collections.emptySet()) {
-            enabledServices = new HashSet<ComponentName>();
-        }
-
-        // Determine enabled services and accessibility state.
         ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
-        boolean accessibilityEnabled = false;
-        if (enabled) {
-            enabledServices.add(toggledService);
-            // Enabling at least one service enables accessibility.
-            accessibilityEnabled = true;
-        } else {
-            enabledServices.remove(toggledService);
-            // Check how many enabled and installed services are present.
-            Set<ComponentName> installedServices = AccessibilitySettings.sInstalledServices;
-            for (ComponentName enabledService : enabledServices) {
-                if (installedServices.contains(enabledService)) {
-                    // Disabling the last service disables accessibility.
-                    accessibilityEnabled = true;
-                    break;
-                }
-            }
-        }
-
-        // Update the enabled services setting.
-        StringBuilder enabledServicesBuilder = new StringBuilder();
-        // Keep the enabled services even if they are not installed since we
-        // have no way to know whether the application restore process has
-        // completed. In general the system should be responsible for the
-        // clean up not settings.
-        for (ComponentName enabledService : enabledServices) {
-            enabledServicesBuilder.append(enabledService.flattenToString());
-            enabledServicesBuilder.append(
-                    AccessibilitySettings.ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
-        }
-        final int enabledServicesBuilderLength = enabledServicesBuilder.length();
-        if (enabledServicesBuilderLength > 0) {
-            enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
-        }
-        Settings.Secure.putString(getContentResolver(),
-                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                enabledServicesBuilder.toString());
-
-        // Update accessibility enabled.
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
+        AccessibilityUtils.setAccessibilityServiceState(getActivity(), toggledService, enabled);
     }
 
     // IMPORTANT: Refresh the info since there are dynamically changing
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 6bb5b28..65d5887 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -37,6 +37,7 @@
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -66,7 +67,7 @@
         final Activity activity = getActivity();
         mUserHandle = Utils.getSecureTargetUser(activity.getActivityToken(), mUm, getArguments(),
                 activity.getIntent().getExtras());
-        mAuthenticatorHelper = new AuthenticatorHelper(activity, mUserHandle, mUm, this);
+        mAuthenticatorHelper = new AuthenticatorHelper(activity, mUserHandle, this);
     }
 
     /**
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 2f47eb7..3942fbb 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -59,6 +59,7 @@
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.users.UserDialogs;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -297,7 +298,7 @@
         }
         if (userInfo.isEnabled()) {
             profileData.authenticatorHelper = new AuthenticatorHelper(context,
-                    userInfo.getUserHandle(), mUm, this);
+                    userInfo.getUserHandle(), this);
             if (!mUm.hasUserRestriction(DISALLOW_MODIFY_ACCOUNTS, userInfo.getUserHandle())) {
                 profileData.addAccountPreference = newAddAccountPreference(context);
             }
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 5cb1c4a..0590cbd 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -161,8 +161,10 @@
             Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.account_sync_screen, container, false);
 
-        final ListView list = (ListView) view.findViewById(android.R.id.list);
-        Utils.prepareCustomPreferencesList(container, view, list, false);
+        final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
+        Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
+        View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
+        prefs_container.addView(prefs);
 
         initializeUi(view);
 
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
deleted file mode 100644
index a0ded04..0000000
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (C) 2012 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.accounts;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SyncAdapterType;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.Log;
-
-import com.google.android.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Helper class for monitoring accounts on the device for a given user.
- *
- * Classes using this helper should implement {@link OnAccountsUpdateListener}.
- * {@link OnAccountsUpdateListener#onAccountsUpdate(UserHandle)} will then be
- * called once accounts get updated. For setting up listening for account
- * updates, {@link #listenToAccountUpdates()} and
- * {@link #stopListeningToAccountUpdates()} should be used.
- */
-final public class AuthenticatorHelper extends BroadcastReceiver {
-    private static final String TAG = "AuthenticatorHelper";
-
-    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
-            = new HashMap<String, AuthenticatorDescription>();
-    private AuthenticatorDescription[] mAuthDescs;
-    private ArrayList<String> mEnabledAccountTypes = new ArrayList<String>();
-    private Map<String, Drawable> mAccTypeIconCache = new HashMap<String, Drawable>();
-    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = Maps.newHashMap();
-
-    private final UserHandle mUserHandle;
-    private final UserManager mUm;
-    private final Context mContext;
-    private final OnAccountsUpdateListener mListener;
-    private boolean mListeningToAccountUpdates;
-
-    public interface OnAccountsUpdateListener {
-        void onAccountsUpdate(UserHandle userHandle);
-    }
-
-    public AuthenticatorHelper(Context context, UserHandle userHandle, UserManager userManager,
-            OnAccountsUpdateListener listener) {
-        mContext = context;
-        mUm = userManager;
-        mUserHandle = userHandle;
-        mListener = listener;
-        // This guarantees that the helper is ready to use once constructed: the account types and
-        // authorities are initialized
-        onAccountsUpdated(null);
-    }
-
-    public String[] getEnabledAccountTypes() {
-        return mEnabledAccountTypes.toArray(new String[mEnabledAccountTypes.size()]);
-    }
-
-    public void preloadDrawableForType(final Context context, final String accountType) {
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                getDrawableForType(context, accountType);
-                return null;
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-    }
-
-    /**
-     * Gets an icon associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return a drawable for the icon or a default icon returned by
-     * {@link PackageManager#getDefaultActivityIcon} if one cannot be found.
-     */
-    public Drawable getDrawableForType(Context context, final String accountType) {
-        Drawable icon = null;
-        synchronized (mAccTypeIconCache) {
-            if (mAccTypeIconCache.containsKey(accountType)) {
-                return mAccTypeIconCache.get(accountType);
-            }
-        }
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            try {
-                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
-                        mUserHandle);
-                icon = mContext.getPackageManager().getUserBadgedIcon(
-                        authContext.getDrawable(desc.iconId), mUserHandle);
-                synchronized (mAccTypeIconCache) {
-                    mAccTypeIconCache.put(accountType, icon);
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-            } catch (Resources.NotFoundException e) {
-            }
-        }
-        if (icon == null) {
-            icon = context.getPackageManager().getDefaultActivityIcon();
-        }
-        return icon;
-    }
-
-    /**
-     * Gets the label associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return a CharSequence for the label or null if one cannot be found.
-     */
-    public CharSequence getLabelForType(Context context, final String accountType) {
-        CharSequence label = null;
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            try {
-                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
-                        mUserHandle);
-                label = authContext.getResources().getText(desc.labelId);
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No label name for account type " + accountType);
-            } catch (Resources.NotFoundException e) {
-                Log.w(TAG, "No label icon for account type " + accountType);
-            }
-        }
-        return label;
-    }
-
-    /**
-     * Gets the package associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return the package name or null if one cannot be found.
-     */
-    public String getPackageForType(final String accountType) {
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-            return desc.packageName;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the resource id of the label associated with a particular account type. If none found,
-     * return -1.
-     * @param accountType the type of account
-     * @return a resource id for the label or -1 if none found;
-     */
-    public int getLabelIdForType(final String accountType) {
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-            return desc.labelId;
-        }
-        return -1;
-    }
-
-    /**
-     * Updates provider icons. Subclasses should call this in onCreate()
-     * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
-     */
-    public void updateAuthDescriptions(Context context) {
-        mAuthDescs = AccountManager.get(context)
-                .getAuthenticatorTypesAsUser(mUserHandle.getIdentifier());
-        for (int i = 0; i < mAuthDescs.length; i++) {
-            mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
-        }
-    }
-
-    public boolean containsAccountType(String accountType) {
-        return mTypeToAuthDescription.containsKey(accountType);
-    }
-
-    public AuthenticatorDescription getAccountTypeDescription(String accountType) {
-        return mTypeToAuthDescription.get(accountType);
-    }
-
-    public boolean hasAccountPreferences(final String accountType) {
-        if (containsAccountType(accountType)) {
-            AuthenticatorDescription desc = getAccountTypeDescription(accountType);
-            if (desc != null && desc.accountPreferencesId != 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void onAccountsUpdated(Account[] accounts) {
-        updateAuthDescriptions(mContext);
-        if (accounts == null) {
-            accounts = AccountManager.get(mContext).getAccountsAsUser(mUserHandle.getIdentifier());
-        }
-        mEnabledAccountTypes.clear();
-        mAccTypeIconCache.clear();
-        for (int i = 0; i < accounts.length; i++) {
-            final Account account = accounts[i];
-            if (!mEnabledAccountTypes.contains(account.type)) {
-                mEnabledAccountTypes.add(account.type);
-            }
-        }
-        buildAccountTypeToAuthoritiesMap();
-        if (mListeningToAccountUpdates) {
-            mListener.onAccountsUpdate(mUserHandle);
-        }
-    }
-
-    @Override
-    public void onReceive(final Context context, final Intent intent) {
-        // TODO: watch for package upgrades to invalidate cache; see http://b/7206643
-        final Account[] accounts = AccountManager.get(mContext)
-                .getAccountsAsUser(mUserHandle.getIdentifier());
-        onAccountsUpdated(accounts);
-    }
-
-    public void listenToAccountUpdates() {
-        if (!mListeningToAccountUpdates) {
-            IntentFilter intentFilter = new IntentFilter();
-            intentFilter.addAction(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
-            // At disk full, certain actions are blocked (such as writing the accounts to storage).
-            // It is useful to also listen for recovery from disk full to avoid bugs.
-            intentFilter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);
-            mContext.registerReceiverAsUser(this, mUserHandle, intentFilter, null, null);
-            mListeningToAccountUpdates = true;
-        }
-    }
-
-    public void stopListeningToAccountUpdates() {
-        if (mListeningToAccountUpdates) {
-            mContext.unregisterReceiver(this);
-            mListeningToAccountUpdates = false;
-        }
-    }
-
-    public ArrayList<String> getAuthoritiesForAccountType(String type) {
-        return mAccountTypeToAuthorities.get(type);
-    }
-
-    private void buildAccountTypeToAuthoritiesMap() {
-        mAccountTypeToAuthorities.clear();
-        SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(
-                mUserHandle.getIdentifier());
-        for (int i = 0, n = syncAdapters.length; i < n; i++) {
-            final SyncAdapterType sa = syncAdapters[i];
-            ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
-            if (authorities == null) {
-                authorities = new ArrayList<String>();
-                mAccountTypeToAuthorities.put(sa.accountType, authorities);
-            }
-            if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                Log.d(TAG, "Added authority " + sa.authority + " to accountType "
-                        + sa.accountType);
-            }
-            authorities.add(sa.authority);
-        }
-    }
-}
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 351ab12..d2f9174 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -44,15 +44,14 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ListView;
 import android.widget.TextView;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.AccountPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.location.LocationSettings;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -117,8 +116,10 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false);
-        final ListView list = (ListView) view.findViewById(android.R.id.list);
-        Utils.prepareCustomPreferencesList(container, view, list, false);
+        final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
+        Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
+        View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
+        prefs_container.addView(prefs);
         return view;
     }
 
diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
index 5800fc2..34663e6 100644
--- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java
+++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
@@ -27,7 +27,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.widget.AnimatedImageView;
+import com.android.settingslib.widget.AnimatedImageView;
 
 public class SyncStateSwitchPreference extends SwitchPreference {
 
@@ -69,7 +69,7 @@
         final boolean failedVisible = mFailed && !activeVisible;
         syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
 
-        View switchView = view.findViewById(com.android.internal.R.id.switchWidget);
+        View switchView = view.findViewById(com.android.internal.R.id.switch_widget);
         if (mOneTimeSyncMode) {
             switchView.setVisibility(View.GONE);
 
diff --git a/src/com/android/settings/applications/AppOpsCategory.java b/src/com/android/settings/applications/AppOpsCategory.java
index 3ccd6bb..4b54891 100644
--- a/src/com/android/settings/applications/AppOpsCategory.java
+++ b/src/com/android/settings/applications/AppOpsCategory.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.app.AppOpsManager;
 import android.app.ListFragment;
 import android.app.LoaderManager;
 import android.content.AsyncTaskLoader;
@@ -34,6 +35,7 @@
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.settings.R;
@@ -48,6 +50,7 @@
     private static final int RESULT_APP_DETAILS = 1;
 
     AppOpsState mState;
+    boolean mUserControlled;
 
     // This is the Adapter being used to display the list's data.
     AppListAdapter mAdapter;
@@ -58,8 +61,13 @@
     }
 
     public AppOpsCategory(AppOpsState.OpsTemplate template) {
+        this(template, false);
+    }
+
+    public AppOpsCategory(AppOpsState.OpsTemplate template, boolean userControlled) {
         Bundle args = new Bundle();
         args.putParcelable("template", template);
+        args.putBoolean("userControlled", userControlled);
         setArguments(args);
     }
 
@@ -117,18 +125,22 @@
         final InterestingConfigChanges mLastConfig = new InterestingConfigChanges();
         final AppOpsState mState;
         final AppOpsState.OpsTemplate mTemplate;
+        final boolean mUserControlled;
 
         List<AppOpEntry> mApps;
         PackageIntentReceiver mPackageObserver;
 
-        public AppListLoader(Context context, AppOpsState state, AppOpsState.OpsTemplate template) {
+        public AppListLoader(Context context, AppOpsState state, AppOpsState.OpsTemplate template,
+                boolean userControlled) {
             super(context);
             mState = state;
             mTemplate = template;
+            mUserControlled = userControlled;
         }
 
         @Override public List<AppOpEntry> loadInBackground() {
-            return mState.buildState(mTemplate);
+            return mState.buildState(mTemplate, 0, null,
+                    mUserControlled ? AppOpsState.LABEL_COMPARATOR : AppOpsState.RECENCY_COMPARATOR);
         }
 
         /**
@@ -247,13 +259,15 @@
         private final Resources mResources;
         private final LayoutInflater mInflater;
         private final AppOpsState mState;
+        private final boolean mUserControlled;
 
         List<AppOpEntry> mList;
 
-        public AppListAdapter(Context context, AppOpsState state) {
+        public AppListAdapter(Context context, AppOpsState state, boolean userControlled) {
             mResources = context.getResources();
             mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             mState = state;
+            mUserControlled = userControlled;
         }
 
         public void setData(List<AppOpEntry> data) {
@@ -292,9 +306,18 @@
             ((ImageView)view.findViewById(R.id.app_icon)).setImageDrawable(
                     item.getAppEntry().getIcon());
             ((TextView)view.findViewById(R.id.app_name)).setText(item.getAppEntry().getLabel());
-            ((TextView)view.findViewById(R.id.op_name)).setText(item.getSummaryText(mState));
-            ((TextView)view.findViewById(R.id.op_time)).setText(
-                    item.getTimeText(mResources, false));
+            if (mUserControlled) {
+                ((TextView) view.findViewById(R.id.op_name)).setText(
+                        item.getTimeText(mResources, false));
+                view.findViewById(R.id.op_time).setVisibility(View.GONE);
+                ((Switch) view.findViewById(R.id.op_switch)).setChecked(
+                        item.getPrimaryOpMode() == AppOpsManager.MODE_ALLOWED);
+            } else {
+                ((TextView) view.findViewById(R.id.op_name)).setText(item.getSummaryText(mState));
+                ((TextView) view.findViewById(R.id.op_time)).setText(
+                        item.getTimeText(mResources, false));
+                view.findViewById(R.id.op_switch).setVisibility(View.GONE);
+            }
 
             return view;
         }
@@ -304,6 +327,7 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mState = new AppOpsState(getActivity());
+        mUserControlled = getArguments().getBoolean("userControlled");
     }
 
     @Override public void onActivityCreated(Bundle savedInstanceState) {
@@ -317,7 +341,7 @@
         setHasOptionsMenu(true);
 
         // Create an empty adapter we will use to display the loaded data.
-        mAdapter = new AppListAdapter(getActivity(), mState);
+        mAdapter = new AppListAdapter(getActivity(), mState, mUserControlled);
         setListAdapter(mAdapter);
 
         // Start out with a progress indicator.
@@ -341,8 +365,22 @@
     @Override public void onListItemClick(ListView l, View v, int position, long id) {
         AppOpEntry entry = mAdapter.getItem(position);
         if (entry != null) {
-            mCurrentPkgName = entry.getAppEntry().getApplicationInfo().packageName;
-            startApplicationDetailsActivity();
+            if (mUserControlled) {
+                // We treat this as tapping on the check box, toggling the app op state.
+                Switch sw = ((Switch) v.findViewById(R.id.op_switch));
+                boolean checked = !sw.isChecked();
+                sw.setChecked(checked);
+                AppOpsManager.OpEntry op = entry.getOpEntry(0);
+                int mode = checked ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
+                mState.getAppOpsManager().setMode(op.getOp(),
+                        entry.getAppEntry().getApplicationInfo().uid,
+                        entry.getAppEntry().getApplicationInfo().packageName,
+                        mode);
+                entry.overridePrimaryOpMode(mode);
+            } else {
+                mCurrentPkgName = entry.getAppEntry().getApplicationInfo().packageName;
+                startApplicationDetailsActivity();
+            }
         }
     }
 
@@ -352,7 +390,7 @@
         if (fargs != null) {
             template = (AppOpsState.OpsTemplate)fargs.getParcelable("template");
         }
-        return new AppListLoader(getActivity(), mState, template);
+        return new AppListLoader(getActivity(), mState, template, mUserControlled);
     }
 
     @Override public void onLoadFinished(Loader<List<AppOpEntry>> loader, List<AppOpEntry> data) {
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index c3189d6..237eac6 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -180,6 +180,7 @@
                     false,
                     false,
                     false,
+                    false,
                     false }
             );
 
@@ -206,9 +207,14 @@
                     false }
             );
 
+    public static final OpsTemplate RUN_IN_BACKGROUND_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_RUN_IN_BACKGROUND },
+            new boolean[] { false }
+            );
+
     public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
             LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE,
-            MEDIA_TEMPLATE, DEVICE_TEMPLATE
+            MEDIA_TEMPLATE, DEVICE_TEMPLATE, RUN_IN_BACKGROUND_TEMPLATE
     };
 
     /**
@@ -306,6 +312,7 @@
                 = new ArrayList<AppOpsManager.OpEntry>();
         private final AppEntry mApp;
         private final int mSwitchOrder;
+        private int mOverriddenPrimaryMode = -1;
 
         public AppOpEntry(AppOpsManager.PackageOps pkg, AppOpsManager.OpEntry op, AppEntry app,
                 int switchOrder) {
@@ -363,6 +370,14 @@
             return mOps.get(pos);
         }
 
+        public int getPrimaryOpMode() {
+            return mOverriddenPrimaryMode >= 0 ? mOverriddenPrimaryMode : mOps.get(0).getMode();
+        }
+
+        public void overridePrimaryOpMode(int mode) {
+            mOverriddenPrimaryMode = mode;
+        }
+
         private CharSequence getCombinedText(ArrayList<AppOpsManager.OpEntry> ops,
                 CharSequence[] items) {
             if (ops.size() == 1) {
@@ -418,9 +433,9 @@
     }
 
     /**
-     * Perform alphabetical comparison of application entry objects.
+     * Perform app op state comparison of application entry objects.
      */
-    public static final Comparator<AppOpEntry> APP_OP_COMPARATOR = new Comparator<AppOpEntry>() {
+    public static final Comparator<AppOpEntry> RECENCY_COMPARATOR = new Comparator<AppOpEntry>() {
         private final Collator sCollator = Collator.getInstance();
         @Override
         public int compare(AppOpEntry object1, AppOpEntry object2) {
@@ -440,6 +455,18 @@
         }
     };
 
+    /**
+     * Perform alphabetical comparison of application entry objects.
+     */
+    public static final Comparator<AppOpEntry> LABEL_COMPARATOR = new Comparator<AppOpEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppOpEntry object1, AppOpEntry object2) {
+            return sCollator.compare(object1.getAppEntry().getLabel(),
+                    object2.getAppEntry().getLabel());
+        }
+    };
+
     private void addOp(List<AppOpEntry> entries, AppOpsManager.PackageOps pkgOps,
             AppEntry appEntry, AppOpsManager.OpEntry opEntry, boolean allowMerge, int switchOrder) {
         if (allowMerge && entries.size() > 0) {
@@ -466,8 +493,12 @@
         entries.add(entry);
     }
 
+    public AppOpsManager getAppOpsManager() {
+        return mAppOps;
+    }
+
     public List<AppOpEntry> buildState(OpsTemplate tpl) {
-        return buildState(tpl, 0, null);
+        return buildState(tpl, 0, null, RECENCY_COMPARATOR);
     }
 
     private AppEntry getAppEntry(final Context context, final HashMap<String, AppEntry> appEntries,
@@ -492,6 +523,11 @@
     }
 
     public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName) {
+        return buildState(tpl, uid, packageName, RECENCY_COMPARATOR);
+    }
+
+    public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName,
+            Comparator<AppOpEntry> comparator) {
         final Context context = mContext;
 
         final HashMap<String, AppEntry> appEntries = new HashMap<String, AppEntry>();
@@ -593,7 +629,7 @@
         }
 
         // Sort the list.
-        Collections.sort(entries, APP_OP_COMPARATOR);
+        Collections.sort(entries, comparator);
 
         // Done!
         return entries;
diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
index 5a8e811..6d057b3 100644
--- a/src/com/android/settings/applications/AppStateNotificationBridge.java
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -66,37 +66,4 @@
             return info.extraInfo != null && ((AppRow) info.extraInfo).banned;
         }
     };
-
-    public static final AppFilter FILTER_APP_NOTIFICATION_PRIORITY = new AppFilter() {
-        @Override
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(AppEntry info) {
-            return info.extraInfo != null && ((AppRow) info.extraInfo).priority;
-        }
-    };
-
-    public static final AppFilter FILTER_APP_NOTIFICATION_SENSITIVE = new AppFilter() {
-        @Override
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(AppEntry info) {
-            return info.extraInfo != null && ((AppRow) info.extraInfo).sensitive;
-        }
-    };
-
-    public static final AppFilter FILTER_APP_NOTIFICATION_NO_PEEK = new AppFilter() {
-        @Override
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(AppEntry info) {
-            return info.extraInfo != null && !((AppRow) info.extraInfo).peekable;
-        }
-    };
 }
diff --git a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
index 7851598..3e96323 100644
--- a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
+++ b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
@@ -33,11 +33,9 @@
     private static final String TAG = "AppStateWriteSettingsBridge";
     private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS;
     private static final String PM_WRITE_SETTINGS = Manifest.permission.WRITE_SETTINGS;
-    private static final String PM_CHANGE_NETWORK_STATE = Manifest.permission.CHANGE_NETWORK_STATE;
-    // CHANGE_NETWORK_STATE is now merged with WRITE_SETTINGS
+
     private static final String[] PM_PERMISSIONS = {
-            PM_WRITE_SETTINGS,
-            PM_CHANGE_NETWORK_STATE
+            PM_WRITE_SETTINGS
     };
 
     public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 355ed72..01780f9 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -30,6 +30,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.support.v7.preference.Preference;
@@ -192,12 +193,13 @@
     }
 
     private boolean isMoveInProgress() {
-        final IPackageManager pm = AppGlobals.getPackageManager();
         try {
             // TODO: define a cleaner API for this
-            return pm.isPackageFrozen(mPackageName);
-        } catch (RemoteException e) {
+            AppGlobals.getPackageManager().checkPackageStartable(mPackageName,
+                    UserHandle.myUserId());
             return false;
+        } catch (RemoteException | SecurityException e) {
+            return true;
         }
     }
 
diff --git a/src/com/android/settings/applications/BackgroundCheckSummary.java b/src/com/android/settings/applications/BackgroundCheckSummary.java
new file mode 100644
index 0000000..dfd4c49
--- /dev/null
+++ b/src/com/android/settings/applications/BackgroundCheckSummary.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright (C) 2015 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.applications;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.preference.PreferenceFrameLayout;
+import android.support.v13.app.FragmentPagerAdapter;
+import android.support.v4.view.PagerTabStrip;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+
+public class BackgroundCheckSummary extends InstrumentedFragment {
+    // layout inflater object used to inflate views
+    private LayoutInflater mInflater;
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BACKGROUND_CHECK_SUMMARY;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // initialize the inflater
+        mInflater = inflater;
+
+        View rootView = mInflater.inflate(R.layout.background_check_summary,
+                container, false);
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
+        }
+
+        FragmentTransaction ft = getChildFragmentManager().beginTransaction();
+        ft.add(R.id.appops_content, new AppOpsCategory(AppOpsState.RUN_IN_BACKGROUND_TEMPLATE,
+                        true), "appops");
+        ft.commitAllowingStateLoss();
+
+        return rootView;
+    }
+}
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
new file mode 100644
index 0000000..c4411e6
--- /dev/null
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2015 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.applications;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.RecoverySystem;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.android.settings.ChooseLockSettingsHelper;
+import com.android.settings.SettingsActivity;
+import com.android.settings.R;
+
+import java.io.IOException;
+
+/* Class to prompt for conversion of userdata to file based encryption
+ */
+public class ConvertToFbe extends Fragment {
+    static final String TAG = "ConvertToFBE";
+    static final String CONVERT_FBE_EXTRA = "ConvertFBE";
+    private static final int KEYGUARD_REQUEST = 55;
+
+    private boolean runKeyguardConfirmation(int request) {
+        Resources res = getActivity().getResources();
+        return new ChooseLockSettingsHelper(getActivity(), this)
+            .launchConfirmationActivity(request,
+                                        res.getText(R.string.convert_to_file_encryption));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.convert_fbe, null);
+
+        final Button button = (Button) rootView.findViewById(R.id.button_convert_fbe);
+        button.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                if(!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                    convert();
+                }
+            }
+        });
+
+        return rootView;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode != KEYGUARD_REQUEST) {
+            return;
+        }
+
+        // If the user entered a valid keyguard credential, start the conversion
+        // process
+        if (resultCode == Activity.RESULT_OK) {
+            convert();
+        }
+    }
+
+    private void convert() {
+        Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR);
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        intent.putExtra(Intent.EXTRA_REASON, "convert_fbe");
+        getActivity().sendBroadcast(intent);
+    }
+}
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index dc09c45..7d8a7f0 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -206,6 +206,9 @@
             enabled = false;
         }
 
+        // We don't allow uninstalling DO/PO on *any* users, because if it's a system app,
+        // "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
+        // will clear data on all users.
         if (isProfileOrDeviceOwner(mPackageInfo.packageName)) {
             enabled = false;
         }
@@ -250,7 +253,7 @@
         List<UserInfo> userInfos = mUserManager.getUsers();
         DevicePolicyManager dpm = (DevicePolicyManager)
                 getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (packageName.equals(dpm.getDeviceOwner())) {
+        if (dpm.isDeviceOwnerAppOnAnyUser(packageName)) {
             return true;
         }
         for (UserInfo userInfo : userInfos) {
@@ -790,7 +793,7 @@
         }
     }
 
-    private static NetworkTemplate getTemplate(Context context) {
+    public static NetworkTemplate getTemplate(Context context) {
         if (DataUsageSummary.hasReadyMobileRadio(context)) {
             return NetworkTemplate.buildTemplateMobileWildcard();
         }
@@ -814,28 +817,7 @@
         if (appRow.banned) {
             return context.getString(R.string.notifications_disabled);
         }
-        ArrayList<CharSequence> notifSummary = new ArrayList<>();
-        if (appRow.priority) {
-            notifSummary.add(context.getString(R.string.notifications_priority));
-        }
-        if (appRow.sensitive) {
-            notifSummary.add(context.getString(R.string.notifications_sensitive));
-        }
-        if (!appRow.peekable) {
-            notifSummary.add(context.getString(R.string.notifications_no_peeking));
-        }
-        switch (notifSummary.size()) {
-            case 3:
-                return context.getString(R.string.notifications_three_items,
-                        notifSummary.get(0), notifSummary.get(1), notifSummary.get(2));
-            case 2:
-                return context.getString(R.string.notifications_two_items,
-                        notifSummary.get(0), notifSummary.get(1));
-            case 1:
-                return notifSummary.get(0);
-            default:
-                return context.getString(R.string.notifications_enabled);
-        }
+        return context.getString(R.string.notifications_enabled);
     }
 
     private class MemoryUpdater extends AsyncTask<Void, Void, ProcStatsPackageEntry> {
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 8694ca9..a01e18d 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -45,7 +46,6 @@
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.AppHeader;
 import com.android.settings.HelpUtils;
@@ -63,9 +63,11 @@
 import com.android.settings.Utils;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateUsageBridge.UsageState;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.fuelgauge.HighPowerDetail;
 import com.android.settings.fuelgauge.PowerWhitelistBackend;
 import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settingslib.applications.ApplicationsState;
@@ -113,60 +115,51 @@
 
     // Filter options used for displayed list of applications
     // The order which they appear is the order they will show when spinner is present.
-    public static final int FILTER_APPS_POWER_WHITELIST         = 0;
-    public static final int FILTER_APPS_POWER_WHITELIST_ALL     = 1;
-    public static final int FILTER_APPS_ALL                     = 2;
-    public static final int FILTER_APPS_ENABLED                 = 3;
-    public static final int FILTER_APPS_DISABLED                = 4;
-    public static final int FILTER_APPS_BLOCKED                 = 5;
-    public static final int FILTER_APPS_PRIORITY                = 6;
-    public static final int FILTER_APPS_NO_PEEKING              = 7;
-    public static final int FILTER_APPS_SENSITIVE               = 8;
-    public static final int FILTER_APPS_PERSONAL                = 9;
-    public static final int FILTER_APPS_WORK                    = 10;
-    public static final int FILTER_APPS_WITH_DOMAIN_URLS        = 11;
-    public static final int FILTER_APPS_USAGE_ACCESS            = 12;
-    public static final int FILTER_APPS_WITH_OVERLAY            = 13;
-    public static final int FILTER_APPS_WRITE_SETTINGS          = 14;
+    public static final int FILTER_APPS_POWER_WHITELIST = 0;
+    public static final int FILTER_APPS_POWER_WHITELIST_ALL = 1;
+    public static final int FILTER_APPS_ALL = 2;
+    public static final int FILTER_APPS_ENABLED = 3;
+    public static final int FILTER_APPS_DISABLED = 4;
+    public static final int FILTER_APPS_BLOCKED = 5;
+    public static final int FILTER_APPS_PERSONAL = 6;
+    public static final int FILTER_APPS_WORK = 7;
+    public static final int FILTER_APPS_WITH_DOMAIN_URLS = 8;
+    public static final int FILTER_APPS_USAGE_ACCESS = 9;
+    public static final int FILTER_APPS_WITH_OVERLAY = 10;
+    public static final int FILTER_APPS_WRITE_SETTINGS = 11;
 
     // This is the string labels for the filter modes above, the order must be kept in sync.
-    public static final int[] FILTER_LABELS = new int[] {
-        R.string.high_power_filter_on, // High power whitelist, on
-        R.string.filter_all_apps,      // All apps label, but personal filter (for high power);
-        R.string.filter_all_apps,      // All apps
-        R.string.filter_enabled_apps,  // Enabled
-        R.string.filter_apps_disabled, // Disabled
-        R.string.filter_notif_blocked_apps,   // Blocked Notifications
-        R.string.filter_notif_priority_apps,  // Priority Notifications
-        R.string.filter_notif_no_peeking,     // No peeking Notifications
-        R.string.filter_notif_sensitive_apps, // Sensitive Notifications
-        R.string.filter_personal_apps, // Personal
-        R.string.filter_work_apps,     // Work
-        R.string.filter_with_domain_urls_apps,     // Domain URLs
-        R.string.filter_all_apps,      // Usage access screen, never displayed
-        R.string.filter_overlay_apps,   // Apps with overlay permission
-        R.string.filter_write_settings_apps,   // Apps that can write system settings
+    public static final int[] FILTER_LABELS = new int[]{
+            R.string.high_power_filter_on, // High power whitelist, on
+            R.string.filter_all_apps,      // All apps label, but personal filter (for high power);
+            R.string.filter_all_apps,      // All apps
+            R.string.filter_enabled_apps,  // Enabled
+            R.string.filter_apps_disabled, // Disabled
+            R.string.filter_notif_blocked_apps,   // Blocked Notifications
+            R.string.filter_personal_apps, // Personal
+            R.string.filter_work_apps,     // Work
+            R.string.filter_with_domain_urls_apps,     // Domain URLs
+            R.string.filter_all_apps,      // Usage access screen, never displayed
+            R.string.filter_overlay_apps,   // Apps with overlay permission
+            R.string.filter_write_settings_apps,   // Apps that can write system settings
     };
     // This is the actual mapping to filters from FILTER_ constants above, the order must
     // be kept in sync.
-    public static final AppFilter[] FILTERS = new AppFilter[] {
-        new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED,
-                ApplicationsState.FILTER_ALL_ENABLED),     // High power whitelist, on
-        new CompoundFilter(ApplicationsState.FILTER_PERSONAL_WITHOUT_DISABLED_UNTIL_USED,
-                ApplicationsState.FILTER_ALL_ENABLED),     // All apps label, but personal filter
-        ApplicationsState.FILTER_EVERYTHING,  // All apps
-        ApplicationsState.FILTER_ALL_ENABLED, // Enabled
-        ApplicationsState.FILTER_DISABLED,    // Disabled
-        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,   // Blocked Notifications
-        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_PRIORITY,  // Priority Notifications
-        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_NO_PEEK,   // No peeking Notifications
-        AppStateNotificationBridge.FILTER_APP_NOTIFICATION_SENSITIVE, // Sensitive Notifications
-        ApplicationsState.FILTER_PERSONAL,    // Personal
-        ApplicationsState.FILTER_WORK,        // Work
-        ApplicationsState.FILTER_WITH_DOMAIN_URLS,   // Apps with Domain URLs
-        AppStateUsageBridge.FILTER_APP_USAGE, // Apps with Domain URLs
-        AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW,   // Apps that can draw overlays
-        AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS,  // Apps that can write system settings
+    public static final AppFilter[] FILTERS = new AppFilter[]{
+            new CompoundFilter(AppStatePowerBridge.FILTER_POWER_WHITELISTED,
+                    ApplicationsState.FILTER_ALL_ENABLED),     // High power whitelist, on
+            new CompoundFilter(ApplicationsState.FILTER_PERSONAL_WITHOUT_DISABLED_UNTIL_USED,
+                    ApplicationsState.FILTER_ALL_ENABLED),     // All apps label, but personal filter
+            ApplicationsState.FILTER_EVERYTHING,  // All apps
+            ApplicationsState.FILTER_ALL_ENABLED, // Enabled
+            ApplicationsState.FILTER_DISABLED,    // Disabled
+            AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,   // Blocked Notifications
+            ApplicationsState.FILTER_PERSONAL,    // Personal
+            ApplicationsState.FILTER_WORK,        // Work
+            ApplicationsState.FILTER_WITH_DOMAIN_URLS,   // Apps with Domain URLs
+            AppStateUsageBridge.FILTER_APP_USAGE, // Apps with Domain URLs
+            AppStateOverlayBridge.FILTER_SYSTEM_ALERT_WINDOW,   // Apps that can draw overlays
+            AppStateWriteSettingsBridge.FILTER_WRITE_SETTINGS,  // Apps that can write system settings
     };
 
     // sort order
@@ -201,13 +194,13 @@
 
     private Menu mOptionsMenu;
 
-    public static final int LIST_TYPE_MAIN         = 0;
+    public static final int LIST_TYPE_MAIN = 0;
     public static final int LIST_TYPE_NOTIFICATION = 1;
     public static final int LIST_TYPE_DOMAINS_URLS = 2;
-    public static final int LIST_TYPE_STORAGE      = 3;
+    public static final int LIST_TYPE_STORAGE = 3;
     public static final int LIST_TYPE_USAGE_ACCESS = 4;
-    public static final int LIST_TYPE_HIGH_POWER   = 5;
-    public static final int LIST_TYPE_OVERLAY      = 6;
+    public static final int LIST_TYPE_HIGH_POWER = 5;
+    public static final int LIST_TYPE_OVERLAY = 6;
     public static final int LIST_TYPE_WRITE_SETTINGS = 7;
 
     private View mRootView;
@@ -280,7 +273,7 @@
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         // initialize the inflater
         mInflater = inflater;
 
@@ -344,9 +337,6 @@
         }
         if (mListType == LIST_TYPE_NOTIFICATION) {
             mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
-            mFilterAdapter.enableFilter(FILTER_APPS_PRIORITY);
-            mFilterAdapter.enableFilter(FILTER_APPS_SENSITIVE);
-            mFilterAdapter.enableFilter(FILTER_APPS_NO_PEEKING);
         }
         if (mListType == LIST_TYPE_HIGH_POWER) {
             mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
@@ -534,7 +524,8 @@
         if (mOptionsMenu == null) {
             return;
         }
-        mOptionsMenu.findItem(R.id.advanced).setVisible(mListType == LIST_TYPE_MAIN);
+        mOptionsMenu.findItem(R.id.advanced).setVisible(
+                mListType == LIST_TYPE_MAIN || mListType == LIST_TYPE_NOTIFICATION);
 
         mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
                 && mSortOrder != R.id.sort_order_alpha);
@@ -550,7 +541,7 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int menuId = item.getItemId();
-        switch(item.getItemId()) {
+        switch (item.getItemId()) {
             case R.id.sort_order_alpha:
             case R.id.sort_order_size:
                 mSortOrder = menuId;
@@ -567,9 +558,15 @@
                 mResetAppsHelper.buildResetDialog();
                 return true;
             case R.id.advanced:
-                ((SettingsActivity) getActivity()).startPreferencePanel(
-                        AdvancedAppSettings.class.getName(), null, R.string.configure_apps,
-                        null, this, ADVANCED_SETTINGS);
+                if (mListType == LIST_TYPE_NOTIFICATION) {
+                    ((SettingsActivity) getActivity()).startPreferencePanel(
+                            ConfigureNotificationSettings.class.getName(), null,
+                            R.string.configure_notification_settings, null, this, ADVANCED_SETTINGS);
+                } else {
+                    ((SettingsActivity) getActivity()).startPreferencePanel(
+                            AdvancedAppSettings.class.getName(), null, R.string.configure_apps,
+                            null, this, ADVANCED_SETTINGS);
+                }
                 return true;
             default:
                 // Handle the home button
@@ -713,7 +710,7 @@
         private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
         private ArrayList<ApplicationsState.AppEntry> mEntries;
         private boolean mResumed;
-        private int mLastSortMode=-1;
+        private int mLastSortMode = -1;
         private int mWhichSize = SIZE_TOTAL;
         CharSequence mCurFilterPrefix;
         private PackageManager mPm;
@@ -742,7 +739,7 @@
         };
 
         public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
-                int filterMode) {
+                                   int filterMode) {
             mState = state;
             mSession = state.newSession(this);
             mManageApplications = manageApplications;
@@ -895,7 +892,7 @@
         }
 
         ArrayList<ApplicationsState.AppEntry> applyPrefixFilter(CharSequence prefix,
-                ArrayList<ApplicationsState.AppEntry> origEntries) {
+                                                                ArrayList<ApplicationsState.AppEntry> origEntries) {
             if (prefix == null || prefix.length() == 0) {
                 return origEntries;
             } else {
@@ -903,7 +900,7 @@
                 final String spacePrefixStr = " " + prefixStr;
                 ArrayList<ApplicationsState.AppEntry> newEntries
                         = new ArrayList<ApplicationsState.AppEntry>();
-                for (int i=0; i<origEntries.size(); i++) {
+                for (int i = 0; i < origEntries.size(); i++) {
                     ApplicationsState.AppEntry entry = origEntries.get(i);
                     String nlabel = entry.getNormalizedLabel();
                     if (nlabel.startsWith(prefixStr) || nlabel.indexOf(spacePrefixStr) != -1) {
@@ -945,8 +942,8 @@
 
         @Override
         public void onPackageSizeChanged(String packageName) {
-            for (int i=0; i<mActive.size(); i++) {
-                AppViewHolder holder = (AppViewHolder)mActive.get(i).getTag();
+            for (int i = 0; i < mActive.size(); i++) {
+                AppViewHolder holder = (AppViewHolder) mActive.get(i).getTag();
                 if (holder.entry.info.packageName.equals(packageName)) {
                     synchronized (holder.entry) {
                         updateSummary(holder);
@@ -1027,7 +1024,7 @@
                     holder.appIcon.setImageDrawable(entry.icon);
                 }
                 updateSummary(holder);
-                if ((entry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                if ((entry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
                     holder.disabled.setVisibility(View.VISIBLE);
                     holder.disabled.setText(R.string.not_installed);
                 } else if (!entry.info.enabled) {
@@ -1060,7 +1057,7 @@
 
                 case LIST_TYPE_USAGE_ACCESS:
                     if (holder.entry.extraInfo != null) {
-                        holder.summary.setText((new UsageState((PermissionState)holder.entry
+                        holder.summary.setText((new UsageState((PermissionState) holder.entry
                                 .extraInfo)).isPermissible() ? R.string.switch_on_text :
                                 R.string.switch_off_text);
                     } else {
@@ -1116,4 +1113,84 @@
             }
         }
     }
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider,
+            ApplicationsState.Callbacks {
+
+        private final Context mContext;
+        private final SummaryLoader mLoader;
+        // TODO: Can probably hack together with less than full app state.
+        private final ApplicationsState mAppState;
+        private final ApplicationsState.Session mSession;
+
+        private SummaryProvider(Context context, SummaryLoader loader) {
+            mContext = context;
+            mLoader = loader;
+            mAppState =
+                    ApplicationsState.getInstance((Application) context.getApplicationContext());
+            mSession = mAppState.newSession(this);
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                mSession.resume();
+            } else {
+                mSession.pause();
+            }
+        }
+
+        private void updateSummary(ArrayList<AppEntry> apps) {
+            if (apps == null) return;
+            mLoader.setSummary(this, mContext.getString(R.string.apps_summary, apps.size()));
+        }
+
+        @Override
+        public void onRebuildComplete(ArrayList<AppEntry> apps) {
+            updateSummary(apps);
+        }
+
+        @Override
+        public void onPackageListChanged() {
+            updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                    ApplicationsState.ALPHA_COMPARATOR));
+        }
+
+        @Override
+        public void onLauncherInfoChanged() {
+            updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                    ApplicationsState.ALPHA_COMPARATOR));
+        }
+
+        @Override
+        public void onLoadEntriesCompleted() {
+            updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
+                    ApplicationsState.ALPHA_COMPARATOR));
+        }
+
+        @Override
+        public void onRunningStateChanged(boolean running) {
+        }
+
+        @Override
+        public void onPackageIconChanged() {
+        }
+
+        @Override
+        public void onPackageSizeChanged(String packageName) {
+        }
+
+        @Override
+        public void onAllSizesComputed() {
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
 }
diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java
index 5dba409..0cd80e7 100644
--- a/src/com/android/settings/applications/ProcStatsData.java
+++ b/src/com/android/settings/applications/ProcStatsData.java
@@ -157,6 +157,9 @@
                 ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES);
 
         createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals);
+        if (totalMem.sysMemZRamWeight > 0) {
+            distributeZRam(totalMem.sysMemZRamWeight);
+        }
 
         ProcStatsPackageEntry osPkg = createOsEntry(bgTotals, runTotals, totalMem,
                 mMemInfo.baseCacheRam);
@@ -180,6 +183,45 @@
         }
     }
 
+    private void distributeZRam(double zramWeight) {
+        // Distribute kernel's Z-Ram across processes, based on how much they have been running.
+        // The idea is that the memory used by the kernel for this is not really the kernel's
+        // responsibility, but that of whoever got swapped in to it...  and we will take how
+        // much a process runs for as a sign of the proportion of Z-Ram it is responsible for.
+
+        long zramMem = (long) (zramWeight / memTotalTime);
+        long totalTime = 0;
+        for (int i = pkgEntries.size() - 1; i >= 0; i--) {
+            ProcStatsPackageEntry entry = pkgEntries.get(i);
+            for (int j = entry.mEntries.size() - 1; j >= 0; j--) {
+                ProcStatsEntry proc = entry.mEntries.get(j);
+                totalTime += proc.mRunDuration;
+            }
+        }
+        for (int i = pkgEntries.size() - 1; i >= 0 && totalTime > 0; i--) {
+            ProcStatsPackageEntry entry = pkgEntries.get(i);
+            long pkgRunTime = 0;
+            long maxRunTime = 0;
+            for (int j = entry.mEntries.size() - 1; j >= 0; j--) {
+                ProcStatsEntry proc = entry.mEntries.get(j);
+                pkgRunTime += proc.mRunDuration;
+                if (proc.mRunDuration > maxRunTime) {
+                    maxRunTime = proc.mRunDuration;
+                }
+            }
+            long pkgZRam = (zramMem*pkgRunTime)/totalTime;
+            if (pkgZRam > 0) {
+                zramMem -= pkgZRam;
+                totalTime -= pkgRunTime;
+                ProcStatsEntry procEntry = new ProcStatsEntry(entry.mPackage, 0,
+                        mContext.getString(R.string.process_stats_os_zram), maxRunTime,
+                        pkgZRam, memTotalTime);
+                procEntry.evaluateTargetPackage(mPm, mStats, null, null, sEntryCompare, mUseUss);
+                entry.addEntry(procEntry);
+            }
+        }
+    }
+
     private ProcStatsPackageEntry createOsEntry(ProcessDataCollection bgTotals,
             ProcessDataCollection runTotals, TotalMemoryUseCollection totalMem, long baseCacheRam) {
         // Add in fake entry representing the OS itself.
@@ -188,17 +230,18 @@
         if (totalMem.sysMemNativeWeight > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_native), memTotalTime,
-                    (long) (totalMem.sysMemNativeWeight / memTotalTime));
+                    (long) (totalMem.sysMemNativeWeight / memTotalTime), memTotalTime);
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
         if (totalMem.sysMemKernelWeight > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_kernel), memTotalTime,
-                    (long) (totalMem.sysMemKernelWeight / memTotalTime));
+                    (long) (totalMem.sysMemKernelWeight / memTotalTime), memTotalTime);
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
+        /*  Turned off now -- zram is being distributed across running apps.
         if (totalMem.sysMemZRamWeight > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_zram), memTotalTime,
@@ -206,10 +249,11 @@
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
+        */
         if (baseCacheRam > 0) {
             osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,
                     mContext.getString(R.string.process_stats_os_cache), memTotalTime,
-                    baseCacheRam / 1024);
+                    baseCacheRam / 1024, memTotalTime);
             osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);
             osPkg.addEntry(osEntry);
         }
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index faf0f5e..55f7bb8 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -73,13 +73,14 @@
                 + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
     }
 
-    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem) {
+    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem,
+            long memDuration) {
         mPackage = pkgName;
         mUid = uid;
         mName = procName;
         mBgDuration = mRunDuration = duration;
         mAvgBgMem = mMaxBgMem = mAvgRunMem = mMaxRunMem = mem;
-        mBgWeight = mRunWeight = ((double)duration) * mem;
+        mBgWeight = mRunWeight = ((double)memDuration) * mem;
         if (DEBUG) Log.d(TAG, "New proc entry " + procName + ": dur=" + mBgDuration
                 + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);
     }
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index 399558b..09fea89 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.applications;
 
+import android.app.Activity;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
@@ -28,6 +30,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.ProcStatsData.MemInfo;
+import com.android.settings.dashboard.SummaryLoader;
 
 public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
 
@@ -123,4 +126,39 @@
         return false;
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                ProcStatsData statsManager = new ProcStatsData(mContext, false);
+                statsManager.setDuration(sDurations[0]);
+                MemInfo memInfo = statsManager.getMemInfo();
+                String usedResult = Formatter.formatShortFileSize(mContext,
+                        (long) memInfo.realUsedRam);
+                String totalResult = Formatter.formatShortFileSize(mContext,
+                        (long) memInfo.realTotalRam);
+                mSummaryLoader.setSummary(this, mContext.getString(R.string.memory_summary,
+                        usedResult, totalResult));
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index a2150e9..182344c 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -193,8 +193,14 @@
         } else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){
             contactSharing.setChecked(false);
         } else {
-            contactSharing.setChecked(true);
-            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            if (mDevice.getBluetoothClass().getDeviceClass()
+                    == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
+                contactSharing.setChecked(true);
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            } else {
+                contactSharing.setChecked(false);
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+            }
         }
 
         contactSharing.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -207,12 +213,7 @@
                 }
             }
         });
-        if (mDevice.getBluetoothClass().getDeviceClass()
-                == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
-            contactSharing.setVisibility(View.VISIBLE);
-        } else {
-            contactSharing.setVisibility(View.GONE);
-        }
+
         mPairingView = (EditText) view.findViewById(R.id.text);
         mPairingView.addTextChangedListener(this);
         alphanumericPin.setOnCheckedChangeListener(this);
@@ -265,8 +266,14 @@
         } else if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_REJECTED){
             contactSharing.setChecked(false);
         } else {
-            contactSharing.setChecked(true);
-            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            if (mDevice.getBluetoothClass().getDeviceClass()
+                    == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
+                contactSharing.setChecked(true);
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            } else {
+                contactSharing.setChecked(false);
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+            }
         }
 
         contactSharing.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -279,12 +286,6 @@
                 }
             }
         });
-        if (mDevice.getBluetoothClass().getDeviceClass()
-                == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
-            contactSharing.setVisibility(View.VISIBLE);
-        } else {
-            contactSharing.setVisibility(View.GONE);
-        }
 
         String messageCaption = null;
         String pairingContent = null;
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 8a1ef46..eac89b1 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
@@ -39,16 +40,17 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -477,6 +479,84 @@
         return R.string.help_url_bluetooth;
     }
 
+    private static class SummaryProvider
+            implements SummaryLoader.SummaryProvider, BluetoothCallback {
+
+        private final LocalBluetoothManager mBluetoothManager;
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        private boolean mEnabled;
+        private boolean mConnected;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mBluetoothManager = Utils.getLocalBtManager(context);
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
+                mEnabled = defaultAdapter.isEnabled();
+                mConnected =
+                        defaultAdapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED;
+                mSummaryLoader.setSummary(this, getSummary());
+                mBluetoothManager.getEventManager().registerCallback(this);
+            } else {
+                mBluetoothManager.getEventManager().unregisterCallback(this);
+            }
+        }
+
+        private CharSequence getSummary() {
+            return mContext.getString(!mEnabled ? R.string.disabled
+                    : mConnected ? R.string.bluetooth_connected
+                    : R.string.bluetooth_disconnected);
+        }
+
+        @Override
+        public void onBluetoothStateChanged(int bluetoothState) {
+            mEnabled = bluetoothState == BluetoothAdapter.STATE_ON;
+            mSummaryLoader.setSummary(this, getSummary());
+        }
+
+        @Override
+        public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+            mConnected = state == BluetoothAdapter.STATE_CONNECTED;
+            mSummaryLoader.setSummary(this, getSummary());
+        }
+
+        @Override
+        public void onScanningStateChanged(boolean started) {
+
+        }
+
+        @Override
+        public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
+
+        }
+
+        @Override
+        public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
+
+        }
+
+        @Override
+        public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
         new BaseSearchIndexProvider() {
             @Override
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
new file mode 100644
index 0000000..6228bbc
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2015 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.dashboard;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.DashboardTile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder> {
+    public static final String TAG = "DashboardAdapter";
+
+    private final List<Object> mItems = new ArrayList<>();
+    private final List<Integer> mTypes = new ArrayList<>();
+    private final List<Integer> mIds = new ArrayList<>();
+
+    private final List<DashboardCategory> mCategories;
+    private final Context mContext;
+
+    private boolean mIsShowingAll;
+    // Used for counting items;
+    private int mId;
+
+    public DashboardAdapter(Context context, List<DashboardCategory> categories) {
+        mContext = context;
+        mCategories = categories;
+
+        // TODO: Better place for tinting?
+        TypedValue tintColor = new TypedValue();
+        context.getTheme().resolveAttribute(com.android.internal.R.attr.colorAccent,
+                tintColor, true);
+        for (int i = 0; i < categories.size(); i++) {
+            for (int j = 0; j < categories.get(i).tiles.size(); j++) {
+                DashboardTile tile = categories.get(i).tiles.get(j);
+
+                if (!context.getPackageName().equals(
+                        tile.intent.getComponent().getPackageName())) {
+                    // If this drawable is coming from outside Settings, tint it to match the
+                    // color.
+                    tile.icon.setTint(tintColor.data);
+                }
+            }
+        }
+
+        setShowingAll(false);
+        setHasStableIds(true);
+    }
+
+    public boolean isShowingAll() {
+        return mIsShowingAll;
+    }
+
+    public void notifyChanged(DashboardTile tile) {
+        for (int i = 0; i < mItems.size(); i++) {
+            if (mItems.get(i) == tile) {
+                notifyItemChanged(i);
+                return;
+            }
+        }
+    }
+
+    public void setShowingAll(boolean showingAll) {
+        mIsShowingAll = showingAll;
+        reset();
+        countItem(null, com.android.settings.R.layout.dashboard_spacer, true);
+        for (int i = 0; i < mCategories.size(); i++) {
+            DashboardCategory category = mCategories.get(i);
+            countItem(category, com.android.settings.R.layout.dashboard_category, mIsShowingAll);
+            for (int j = 0; j < category.tiles.size(); j++) {
+                DashboardTile tile = category.tiles.get(j);
+                Log.d(TAG, "Maybe adding " + tile.intent.getComponent().getClassName());
+                countItem(tile, com.android.settings.R.layout.dashboard_tile, mIsShowingAll
+                        || ArrayUtils.contains(DashboardSummary.INITIAL_ITEMS,
+                        tile.intent.getComponent().getClassName()));
+            }
+        }
+        countItem(null, com.android.settings.R.layout.see_all, true);
+        notifyDataSetChanged();
+    }
+
+    private void reset() {
+        mItems.clear();
+        mTypes.clear();
+        mIds.clear();
+        mId = 0;
+    }
+
+    private void countItem(Object object, int type, boolean add) {
+        if (add) {
+            mItems.add(object);
+            mTypes.add(type);
+            mIds.add(mId);
+        }
+        mId++;
+    }
+
+    @Override
+    public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+                viewType, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        switch (mTypes.get(position)) {
+            case com.android.settings.R.layout.dashboard_category:
+                onBindCategory(holder, (DashboardCategory) mItems.get(position));
+                break;
+            case com.android.settings.R.layout.dashboard_tile:
+                final DashboardTile tile = (DashboardTile) mItems.get(position);
+                onBindTile(holder, tile);
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        ((SettingsActivity) mContext).openTile(tile);
+                    }
+                });
+                break;
+            case com.android.settings.R.layout.see_all:
+                onBindSeeAll(holder);
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        setShowingAll(!mIsShowingAll);
+                    }
+                });
+                break;
+        }
+    }
+
+    private void onBindTile(DashboardItemHolder holder, DashboardTile dashboardTile) {
+        holder.icon.setImageIcon(dashboardTile.icon);
+        holder.title.setText(dashboardTile.title);
+        if (!TextUtils.isEmpty(dashboardTile.summary)) {
+            holder.summary.setText(dashboardTile.summary);
+            holder.summary.setVisibility(View.VISIBLE);
+        } else {
+            holder.summary.setVisibility(View.GONE);
+        }
+    }
+
+    private void onBindCategory(DashboardItemHolder holder, DashboardCategory category) {
+        holder.title.setText(category.title);
+    }
+
+    private void onBindSeeAll(DashboardItemHolder holder) {
+        holder.title.setText(mIsShowingAll ? com.android.settings.R.string.see_less
+                : com.android.settings.R.string.see_all);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mIds.get(position);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mTypes.get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mIds.size();
+    }
+
+    public static class DashboardItemHolder extends RecyclerView.ViewHolder {
+        private final ImageView icon;
+        private final TextView title;
+        private final TextView summary;
+
+        public DashboardItemHolder(View itemView) {
+            super(itemView);
+            icon = (ImageView) itemView.findViewById(android.R.id.icon);
+            title = (TextView) itemView.findViewById(android.R.id.title);
+            summary = (TextView) itemView.findViewById(android.R.id.summary);
+        }
+    }
+}
diff --git a/src/com/android/settings/dashboard/DashboardCategory.java b/src/com/android/settings/dashboard/DashboardCategory.java
deleted file mode 100644
index 69d0316..0000000
--- a/src/com/android/settings/dashboard/DashboardCategory.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2014 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.dashboard;
-
-import android.content.res.Resources;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DashboardCategory implements Parcelable {
-
-    /**
-     * Default value for {@link com.android.settings.dashboard.DashboardCategory#id DashboardCategory.id}
-     * indicating that no identifier value is set.  All other values (including those below -1)
-     * are valid.
-     */
-    public static final long CAT_ID_UNDEFINED = -1;
-
-    /**
-     * Identifier for this tile, to correlate with a new list when
-     * it is updated.  The default value is
-     * {@link com.android.settings.dashboard.DashboardTile#TILE_ID_UNDEFINED}, meaning no id.
-     * @attr ref android.R.styleable#PreferenceHeader_id
-     */
-    public long id = CAT_ID_UNDEFINED;
-
-    /**
-     * Resource ID of title of the category that is shown to the user.
-     */
-    public int titleRes;
-
-    /**
-     * Title of the category that is shown to the user.
-     */
-    public CharSequence title;
-
-    /**
-     * Key used for placing external tiles.
-     */
-    public String key;
-
-    /**
-     * Optional index of where to place tiles specified by system apps.
-     */
-    public int externalIndex = -1;
-
-    /**
-     * List of the category's children
-     */
-    public List<DashboardTile> tiles = new ArrayList<DashboardTile>();
-
-
-    public DashboardCategory() {
-        // Empty
-    }
-
-    public void addTile(DashboardTile tile) {
-        tiles.add(tile);
-    }
-
-    public void addTile(int n, DashboardTile tile) {
-        tiles.add(n, tile);
-    }
-
-    public void removeTile(DashboardTile tile) {
-        tiles.remove(tile);
-    }
-
-    public void removeTile(int n) {
-        tiles.remove(n);
-    }
-
-    public int getTilesCount() {
-        return tiles.size();
-    }
-
-    public DashboardTile getTile(int n) {
-        return tiles.get(n);
-    }
-
-    /**
-     * Return the currently set title.  If {@link #titleRes} is set,
-     * this resource is loaded from <var>res</var> and returned.  Otherwise
-     * {@link #title} is returned.
-     */
-    public CharSequence getTitle(Resources res) {
-        if (titleRes != 0) {
-            return res.getText(titleRes);
-        }
-        return title;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(titleRes);
-        dest.writeInt(externalIndex);
-        TextUtils.writeToParcel(title, dest, flags);
-        dest.writeString(key);
-
-        final int count = tiles.size();
-        dest.writeInt(count);
-
-        for (int n = 0; n < count; n++) {
-            DashboardTile tile = tiles.get(n);
-            tile.writeToParcel(dest, flags);
-        }
-    }
-
-    public void readFromParcel(Parcel in) {
-        titleRes = in.readInt();
-        externalIndex = in.readInt();
-        title = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        key = in.readString();
-
-        final int count = in.readInt();
-
-        for (int n = 0; n < count; n++) {
-            DashboardTile tile = DashboardTile.CREATOR.createFromParcel(in);
-            tiles.add(tile);
-        }
-    }
-
-    DashboardCategory(Parcel in) {
-        readFromParcel(in);
-    }
-
-    public static final Creator<DashboardCategory> CREATOR = new Creator<DashboardCategory>() {
-        public DashboardCategory createFromParcel(Parcel source) {
-            return new DashboardCategory(source);
-        }
-
-        public DashboardCategory[] newArray(int size) {
-            return new DashboardCategory[size];
-        }
-    };
-}
diff --git a/src/com/android/settings/dashboard/DashboardContainerView.java b/src/com/android/settings/dashboard/DashboardContainerView.java
deleted file mode 100644
index af7e787..0000000
--- a/src/com/android/settings/dashboard/DashboardContainerView.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2014 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.dashboard;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.settings.R;
-
-public class DashboardContainerView extends ViewGroup {
-
-    private float mCellGapX;
-    private float mCellGapY;
-
-    private int mNumRows;
-    private int mNumColumns;
-
-    public DashboardContainerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        final Resources res = context.getResources();
-        mCellGapX = res.getDimension(R.dimen.dashboard_cell_gap_x);
-        mCellGapY = res.getDimension(R.dimen.dashboard_cell_gap_y);
-        mNumColumns = res.getInteger(R.integer.dashboard_num_columns);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        final int width = MeasureSpec.getSize(widthMeasureSpec);
-        final int availableWidth = (int) (width - getPaddingLeft() - getPaddingRight() -
-                (mNumColumns - 1) * mCellGapX);
-        float cellWidth = (float) Math.ceil(((float) availableWidth) / mNumColumns);
-        final int N = getChildCount();
-
-        int cellHeight = 0;
-        int cursor = 0;
-
-        for (int i = 0; i < N; ++i) {
-            DashboardTileView v = (DashboardTileView) getChildAt(i);
-            if (v.getVisibility() == View.GONE) {
-                continue;
-            }
-
-            ViewGroup.LayoutParams lp = v.getLayoutParams();
-            int colSpan = v.getColumnSpan();
-            lp.width = (int) ((colSpan * cellWidth) + (colSpan - 1) * mCellGapX);
-
-            // Measure the child
-            int newWidthSpec = getChildMeasureSpec(widthMeasureSpec, 0, lp.width);
-            int newHeightSpec = getChildMeasureSpec(heightMeasureSpec, 0, lp.height);
-            v.measure(newWidthSpec, newHeightSpec);
-
-            // Save the cell height
-            if (cellHeight <= 0) {
-                cellHeight = v.getMeasuredHeight();
-            }
-
-            lp.height = cellHeight;
-
-            cursor += colSpan;
-        }
-
-        mNumRows = (int) Math.ceil((float) cursor / mNumColumns);
-        final int newHeight = (int) ((mNumRows * cellHeight) + ((mNumRows - 1) * mCellGapY)) +
-                getPaddingTop() + getPaddingBottom();
-
-        setMeasuredDimension(width, newHeight);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int N = getChildCount();
-        final boolean isLayoutRtl = isLayoutRtl();
-        final int width = getWidth();
-
-        int x = getPaddingStart();
-        int y = getPaddingTop();
-        int cursor = 0;
-
-        for (int i = 0; i < N; ++i) {
-            final DashboardTileView child = (DashboardTileView) getChildAt(i);
-            final ViewGroup.LayoutParams lp = child.getLayoutParams();
-            if (child.getVisibility() == GONE) {
-                continue;
-            }
-
-            final int col = cursor % mNumColumns;
-            final int colSpan = child.getColumnSpan();
-
-            final int childWidth = lp.width;
-            final int childHeight = lp.height;
-
-            int row = cursor / mNumColumns;
-
-            if (row == mNumRows - 1) {
-                child.setDividerVisibility(false);
-            }
-
-            // Push the item to the next row if it can't fit on this one
-            if ((col + colSpan) > mNumColumns) {
-                x = getPaddingStart();
-                y += childHeight + mCellGapY;
-                row++;
-            }
-
-            final int childLeft = (isLayoutRtl) ? width - x - childWidth : x;
-            final int childRight = childLeft + childWidth;
-
-            final int childTop = y;
-            final int childBottom = childTop + childHeight;
-
-            // Layout the container
-            child.layout(childLeft, childTop, childRight, childBottom);
-
-            // Offset the position by the cell gap or reset the position and cursor when we
-            // reach the end of the row
-            cursor += child.getColumnSpan();
-            if (cursor < (((row + 1) * mNumColumns))) {
-                x += childWidth + mCellGapX;
-            } else {
-                x = getPaddingStart();
-                y += childHeight + mCellGapY;
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 6408636..64eb356 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -16,61 +16,46 @@
 
 package com.android.settings.dashboard;
 
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
+import com.android.settings.Settings;
 import com.android.settings.SettingsActivity;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.SettingsDrawerActivity;
 
 import java.util.List;
 
-public class DashboardSummary extends InstrumentedFragment {
-    private static final String LOG_TAG = "DashboardSummary";
+public class DashboardSummary extends InstrumentedFragment
+        implements SettingsDrawerActivity.CategoryListener {
+    public static final boolean DEBUG = false;
+    private static final boolean DEBUG_TIMING = false;
+    private static final String TAG = "DashboardSummary";
 
-    private LayoutInflater mLayoutInflater;
-    private ViewGroup mDashboard;
-
-    private static final int MSG_REBUILD_UI = 1;
-    private Handler mHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_REBUILD_UI: {
-                    final Context context = getActivity();
-                    rebuildUI(context);
-                } break;
-            }
-        }
+    public static final String[] INITIAL_ITEMS = new String[] {
+            Settings.WifiSettingsActivity.class.getName(),
+            Settings.BluetoothSettingsActivity.class.getName(),
+            Settings.DataUsageSummaryActivity.class.getName(),
+            Settings.PowerUsageSummaryActivity.class.getName(),
+            Settings.ManageApplicationsActivity.class.getName(),
+            Settings.StorageSettingsActivity.class.getName(),
     };
 
-    private class HomePackageReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            rebuildUI(context);
-        }
-    }
-    private HomePackageReceiver mHomePackageReceiver = new HomePackageReceiver();
+    private static final int MSG_REBUILD_UI = 1;
+
+    private RecyclerView mDashboard;
+    private DashboardAdapter mAdapter;
+    private SummaryLoader mSummaryLoader;
 
     @Override
     protected int getMetricsCategory() {
@@ -81,12 +66,25 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        long startTime = System.currentTimeMillis();
+        List<DashboardCategory> categories =
+                ((SettingsActivity) getActivity()).getDashboardCategories();
+        mSummaryLoader = new SummaryLoader(getActivity(), categories);
         setHasOptionsMenu(true);
+        if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+                + " ms");
+    }
+
+    @Override
+    public void onDestroy() {
+        mSummaryLoader.release();
+        super.onDestroy();
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
+        if (getActivity() == null) return;
         HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_dashboard,
                 getClass().getName());
     }
@@ -95,123 +93,57 @@
     public void onResume() {
         super.onResume();
 
-        sendRebuildUI();
-
-        final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addDataScheme("package");
-        getActivity().registerReceiver(mHomePackageReceiver, filter);
+        ((SettingsDrawerActivity) getActivity()).addCategoryListener(this);
+        mSummaryLoader.setListening(true);
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
-        getActivity().unregisterReceiver(mHomePackageReceiver);
+        ((SettingsDrawerActivity) getActivity()).remCategoryListener(this);
+        mSummaryLoader.setListening(false);
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-
-        mLayoutInflater = inflater;
-
-        final View rootView = inflater.inflate(R.layout.dashboard, container, false);
-        mDashboard = (ViewGroup) rootView.findViewById(R.id.dashboard_container);
-
-        return rootView;
+        return inflater.inflate(R.layout.dashboard, container, false);
     }
 
-    private void rebuildUI(Context context) {
+    @Override
+    public void onViewCreated(View view, Bundle bundle) {
+        mDashboard = (RecyclerView) view.findViewById(R.id.dashboard_container);
+        LinearLayoutManager llm = new LinearLayoutManager(getContext());
+        llm.setOrientation(LinearLayoutManager.VERTICAL);
+        mDashboard.setLayoutManager(llm);
+        mDashboard.setHasFixedSize(true);
+
+        rebuildUI();
+    }
+
+    private void rebuildUI() {
         if (!isAdded()) {
-            Log.w(LOG_TAG, "Cannot build the DashboardSummary UI yet as the Fragment is not added");
+            Log.w(TAG, "Cannot build the DashboardSummary UI yet as the Fragment is not added");
             return;
         }
 
         long start = System.currentTimeMillis();
-        final Resources res = getResources();
-
-        mDashboard.removeAllViews();
-
+        // TODO: Cache summaries from old categories somehow.
         List<DashboardCategory> categories =
-                ((SettingsActivity) context).getDashboardCategories(true);
+                ((SettingsActivity) getActivity()).getDashboardCategories();
+        boolean showingAll = mAdapter != null && mAdapter.isShowingAll();
+        mAdapter = new DashboardAdapter(getContext(), categories);
+        mSummaryLoader.setAdapter(mAdapter);
+        mAdapter.setShowingAll(showingAll);
+        mDashboard.setAdapter(mAdapter);
 
-        final int count = categories.size();
-
-        for (int n = 0; n < count; n++) {
-            DashboardCategory category = categories.get(n);
-
-            View categoryView = mLayoutInflater.inflate(R.layout.dashboard_category, mDashboard,
-                    false);
-
-            TextView categoryLabel = (TextView) categoryView.findViewById(R.id.category_title);
-            categoryLabel.setText(category.getTitle(res));
-
-            ViewGroup categoryContent =
-                    (ViewGroup) categoryView.findViewById(R.id.category_content);
-
-            final int tilesCount = category.getTilesCount();
-            for (int i = 0; i < tilesCount; i++) {
-                DashboardTile tile = category.getTile(i);
-
-                DashboardTileView tileView = new DashboardTileView(context);
-                updateTileView(context, res, tile, tileView.getImageView(),
-                        tileView.getTitleTextView(), tileView.getStatusTextView());
-
-                tileView.setTile(tile);
-
-                categoryContent.addView(tileView);
-            }
-
-            // Add the category
-            mDashboard.addView(categoryView);
-        }
         long delta = System.currentTimeMillis() - start;
-        Log.d(LOG_TAG, "rebuildUI took: " + delta + " ms");
+        Log.d(TAG, "rebuildUI took: " + delta + " ms");
     }
 
-    private void updateTileView(Context context, Resources res, DashboardTile tile,
-            ImageView tileIcon, TextView tileTextView, TextView statusTextView) {
-
-        if (!TextUtils.isEmpty(tile.iconPkg)) {
-            try {
-                Drawable drawable = context.getPackageManager()
-                        .getResourcesForApplication(tile.iconPkg).getDrawable(tile.iconRes, null);
-                if (!tile.iconPkg.equals(context.getPackageName()) && drawable != null) {
-                    // If this drawable is coming from outside Settings, tint it to match the color.
-                    TypedValue tintColor = new TypedValue();
-                    context.getTheme().resolveAttribute(com.android.internal.R.attr.colorAccent,
-                            tintColor, true);
-                    drawable.setTint(tintColor.data);
-                }
-                tileIcon.setImageDrawable(drawable);
-            } catch (NameNotFoundException | Resources.NotFoundException e) {
-                tileIcon.setImageDrawable(null);
-                tileIcon.setBackground(null);
-            }
-        } else if (tile.iconRes > 0) {
-            tileIcon.setImageResource(tile.iconRes);
-        } else {
-            tileIcon.setImageDrawable(null);
-            tileIcon.setBackground(null);
-        }
-
-        tileTextView.setText(tile.getTitle(res));
-
-        CharSequence summary = tile.getSummary(res);
-        if (!TextUtils.isEmpty(summary)) {
-            statusTextView.setVisibility(View.VISIBLE);
-            statusTextView.setText(summary);
-        } else {
-            statusTextView.setVisibility(View.GONE);
-        }
-    }
-
-    private void sendRebuildUI() {
-        if (!mHandler.hasMessages(MSG_REBUILD_UI)) {
-            mHandler.sendEmptyMessage(MSG_REBUILD_UI);
-        }
+    @Override
+    public void onCategoriesChanged() {
+        rebuildUI();
     }
 }
diff --git a/src/com/android/settings/dashboard/DashboardTile.java b/src/com/android/settings/dashboard/DashboardTile.java
deleted file mode 100644
index 5e7e49a..0000000
--- a/src/com/android/settings/dashboard/DashboardTile.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2014 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.dashboard;
-
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.UserHandle;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-
-/**
- * Description of a single dashboard tile that the user can select.
- */
-public class DashboardTile implements Parcelable {
-    /**
-     * Default value for {@link com.android.settings.dashboard.DashboardTile#id DashboardTile.id}
-     * indicating that no identifier value is set.  All other values (including those below -1)
-     * are valid.
-     */
-    public static final long TILE_ID_UNDEFINED = -1;
-
-    /**
-     * Identifier for this tile, to correlate with a new list when
-     * it is updated.  The default value is
-     * {@link com.android.settings.dashboard.DashboardTile#TILE_ID_UNDEFINED}, meaning no id.
-     * @attr ref android.R.styleable#PreferenceHeader_id
-     */
-    public long id = TILE_ID_UNDEFINED;
-
-    /**
-     * Resource ID of title of the tile that is shown to the user.
-     * @attr ref android.R.styleable#PreferenceHeader_title
-     */
-    public int titleRes;
-
-    /**
-     * Title of the tile that is shown to the user.
-     * @attr ref android.R.styleable#PreferenceHeader_title
-     */
-    public CharSequence title;
-
-    /**
-     * Resource ID of optional summary describing what this tile controls.
-     * @attr ref android.R.styleable#PreferenceHeader_summary
-     */
-    public int summaryRes;
-
-    /**
-     * Optional summary describing what this tile controls.
-     * @attr ref android.R.styleable#PreferenceHeader_summary
-     */
-    public CharSequence summary;
-
-    /**
-     * Optional icon resource to show for this tile.
-     * @attr ref android.R.styleable#PreferenceHeader_icon
-     */
-    public int iconRes;
-
-    /**
-     * Optional package to pull the icon resource from.
-     */
-    public String iconPkg;
-
-    /**
-     * Full class name of the fragment to display when this tile is
-     * selected.
-     * @attr ref android.R.styleable#PreferenceHeader_fragment
-     */
-    public String fragment;
-
-    /**
-     * Optional arguments to supply to the fragment when it is
-     * instantiated.
-     */
-    public Bundle fragmentArguments;
-
-    /**
-     * Intent to launch when the preference is selected.
-     */
-    public Intent intent;
-
-    /**
-     * Optional list of user handles which the intent should be launched on.
-     */
-    public ArrayList<UserHandle> userHandle = new ArrayList<>();
-
-    /**
-     * Optional additional data for use by subclasses of the activity
-     */
-    public Bundle extras;
-
-    public DashboardTile() {
-        // Empty
-    }
-
-    /**
-     * Return the currently set title.  If {@link #titleRes} is set,
-     * this resource is loaded from <var>res</var> and returned.  Otherwise
-     * {@link #title} is returned.
-     */
-    public CharSequence getTitle(Resources res) {
-        if (titleRes != 0) {
-            return res.getText(titleRes);
-        }
-        return title;
-    }
-
-    /**
-     * Return the currently set summary.  If {@link #summaryRes} is set,
-     * this resource is loaded from <var>res</var> and returned.  Otherwise
-     * {@link #summary} is returned.
-     */
-    public CharSequence getSummary(Resources res) {
-        if (summaryRes != 0) {
-            return res.getText(summaryRes);
-        }
-        return summary;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(id);
-        dest.writeInt(titleRes);
-        TextUtils.writeToParcel(title, dest, flags);
-        dest.writeInt(summaryRes);
-        TextUtils.writeToParcel(summary, dest, flags);
-        dest.writeInt(iconRes);
-        dest.writeString(iconPkg);
-        dest.writeString(fragment);
-        dest.writeBundle(fragmentArguments);
-        if (intent != null) {
-            dest.writeInt(1);
-            intent.writeToParcel(dest, flags);
-        } else {
-            dest.writeInt(0);
-        }
-        final int N = userHandle.size();
-        dest.writeInt(N);
-        for (int i = 0; i < N; i++) {
-            userHandle.get(i).writeToParcel(dest, flags);
-        }
-        dest.writeBundle(extras);
-    }
-
-    public void readFromParcel(Parcel in) {
-        id = in.readLong();
-        titleRes = in.readInt();
-        title = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        summaryRes = in.readInt();
-        summary = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
-        iconRes = in.readInt();
-        iconPkg = in.readString();
-        fragment = in.readString();
-        fragmentArguments = in.readBundle();
-        if (in.readInt() != 0) {
-            intent = Intent.CREATOR.createFromParcel(in);
-        }
-        final int N = in.readInt();
-        for (int i = 0; i < N; i++) {
-            userHandle.add(UserHandle.CREATOR.createFromParcel(in));
-        }
-        extras = in.readBundle();
-    }
-
-    DashboardTile(Parcel in) {
-        readFromParcel(in);
-    }
-
-    public static final Creator<DashboardTile> CREATOR = new Creator<DashboardTile>() {
-        public DashboardTile createFromParcel(Parcel source) {
-            return new DashboardTile(source);
-        }
-        public DashboardTile[] newArray(int size) {
-            return new DashboardTile[size];
-        }
-    };
-}
diff --git a/src/com/android/settings/dashboard/DashboardTileView.java b/src/com/android/settings/dashboard/DashboardTileView.java
deleted file mode 100644
index 0896b82..0000000
--- a/src/com/android/settings/dashboard/DashboardTileView.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2014 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.dashboard;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.settings.ProfileSelectDialog;
-import com.android.settings.R;
-import com.android.settings.Utils;
-
-public class DashboardTileView extends FrameLayout implements View.OnClickListener {
-
-    private static final int DEFAULT_COL_SPAN = 1;
-
-    private ImageView mImageView;
-    private TextView mTitleTextView;
-    private TextView mStatusTextView;
-    private View mDivider;
-
-    private int mColSpan = DEFAULT_COL_SPAN;
-
-    private DashboardTile mTile;
-
-    public DashboardTileView(Context context) {
-        this(context, null);
-    }
-
-    public DashboardTileView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, this);
-
-        mImageView = (ImageView) view.findViewById(R.id.icon);
-        mTitleTextView = (TextView) view.findViewById(R.id.title);
-        mStatusTextView = (TextView) view.findViewById(R.id.status);
-        mDivider = view.findViewById(R.id.tile_divider);
-
-        setOnClickListener(this);
-        setBackgroundResource(R.drawable.dashboard_tile_background);
-        setFocusable(true);
-    }
-
-    public TextView getTitleTextView() {
-        return mTitleTextView;
-    }
-
-    public TextView getStatusTextView() {
-        return mStatusTextView;
-    }
-
-    public ImageView getImageView() {
-        return mImageView;
-    }
-
-    public void setTile(DashboardTile tile) {
-        mTile = tile;
-    }
-
-    public void setDividerVisibility(boolean visible) {
-        mDivider.setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
-
-    void setColumnSpan(int span) {
-        mColSpan = span;
-    }
-
-    int getColumnSpan() {
-        return mColSpan;
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (mTile.fragment != null) {
-            Utils.startWithFragment(getContext(), mTile.fragment, mTile.fragmentArguments, null, 0,
-                    mTile.titleRes, mTile.getTitle(getResources()));
-        } else if (mTile.intent != null) {
-            int numUserHandles = mTile.userHandle.size();
-            if (numUserHandles > 1) {
-                ProfileSelectDialog.show(((Activity) getContext()).getFragmentManager(), mTile);
-            } else if (numUserHandles == 1) {
-                getContext().startActivityAsUser(mTile.intent, mTile.userHandle.get(0));
-            } else {
-                getContext().startActivity(mTile.intent);
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
new file mode 100644
index 0000000..a9dd43a
--- /dev/null
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2015 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.dashboard;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.util.ArrayMap;
+import android.util.Log;
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.DashboardTile;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SummaryLoader {
+    private static final boolean DEBUG = DashboardSummary.DEBUG;
+    private static final String TAG = "SummaryLoader";
+
+    public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
+
+    private final Activity mActivity;
+    private final ArrayMap<SummaryProvider, DashboardTile> mSummaryMap = new ArrayMap<>();
+    private final List<DashboardTile> mTiles = new ArrayList<>();
+
+    private final Worker mWorker;
+    private final Handler mHandler;
+    private final HandlerThread mWorkerThread;
+
+    private DashboardAdapter mAdapter;
+
+    public SummaryLoader(Activity activity, List<DashboardCategory> categories) {
+        mHandler = new Handler();
+        mWorkerThread = new HandlerThread("SummaryLoader");
+        mWorkerThread.start();
+        mWorker = new Worker(mWorkerThread.getLooper());
+        mActivity = activity;
+        for (int i = 0; i < categories.size(); i++) {
+            List<DashboardTile> tiles = categories.get(i).tiles;
+            for (int j = 0; j < tiles.size(); j++) {
+                DashboardTile tile = tiles.get(j);
+                mWorker.obtainMessage(Worker.MSG_GET_PROVIDER, tile).sendToTarget();
+            }
+        }
+    }
+
+    public void release() {
+        mWorkerThread.quit();
+    }
+
+    public void setAdapter(DashboardAdapter adapter) {
+        mAdapter = adapter;
+    }
+
+    public void setSummary(SummaryProvider provider, final CharSequence summary) {
+        final DashboardTile tile = mSummaryMap.get(provider);
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                tile.summary = summary;
+                mAdapter.notifyChanged(tile);
+            }
+        });
+    }
+
+    public void setListening(boolean listening) {
+        mWorker.obtainMessage(Worker.MSG_SET_LISTENING, listening ? 1 : 0, 0).sendToTarget();
+    }
+
+    private SummaryProvider getSummaryProvider(DashboardTile tile) {
+        if (!mActivity.getPackageName().equals(tile.intent.getComponent().getPackageName())) {
+            // Not within Settings, can't load Summary directly.
+            // TODO: Load summary indirectly.
+            return null;
+        }
+        Bundle metaData = getMetaData(tile);
+        if (metaData == null) {
+            if (DEBUG) Log.d(TAG, "No metadata specified for " + tile.intent.getComponent());
+            return null;
+        }
+        String clsName = metaData.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
+        if (clsName == null) {
+            if (DEBUG) Log.d(TAG, "No fragment specified for " + tile.intent.getComponent());
+            return null;
+        }
+        try {
+            Class<?> cls = Class.forName(clsName);
+            Field field = cls.getField(SUMMARY_PROVIDER_FACTORY);
+            SummaryProviderFactory factory = (SummaryProviderFactory) field.get(null);
+            return factory.createSummaryProvider(mActivity, this);
+        } catch (ClassNotFoundException e) {
+            if (DEBUG) Log.d(TAG, "Couldn't find " + clsName, e);
+        } catch (NoSuchFieldException e) {
+            if (DEBUG) Log.d(TAG, "Couldn't find " + SUMMARY_PROVIDER_FACTORY, e);
+        } catch (ClassCastException e) {
+            if (DEBUG) Log.d(TAG, "Couldn't cast " + SUMMARY_PROVIDER_FACTORY, e);
+        } catch (IllegalAccessException e) {
+            if (DEBUG) Log.d(TAG, "Couldn't get " + SUMMARY_PROVIDER_FACTORY, e);
+        }
+        return null;
+    }
+
+    private Bundle getMetaData(DashboardTile tile) {
+        return tile.metaData;
+    }
+
+    public interface SummaryProvider {
+        void setListening(boolean listening);
+    }
+
+    public interface SummaryProviderFactory {
+        SummaryProvider createSummaryProvider(Activity activity, SummaryLoader summaryLoader);
+    }
+
+    private class Worker extends Handler {
+        private static final int MSG_GET_PROVIDER = 1;
+        private static final int MSG_SET_LISTENING = 2;
+
+        public Worker(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_GET_PROVIDER:
+                    DashboardTile tile = (DashboardTile) msg.obj;
+                    SummaryProvider provider = getSummaryProvider(tile);
+                    if (provider != null) {
+                        if (DEBUG) Log.d(TAG, "Creating " + tile);
+                        mSummaryMap.put(provider, tile);
+                    }
+                    break;
+                case MSG_SET_LISTENING:
+                    boolean listening = msg.arg1 != 0;
+                    if (DEBUG) Log.d(TAG, "Listening " + listening);
+                    for (SummaryProvider p : mSummaryMap.keySet()) {
+                        p.setListening(listening);
+                    }
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index d4a653b..9da08b8 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -117,11 +117,17 @@
 
     private Preference mExplore;
 
+    private boolean mDetached;
+
     private boolean isVolumeValid() {
         return (mVolume != null) && (mVolume.getType() == VolumeInfo.TYPE_PRIVATE)
                 && mVolume.isMountedReadable();
     }
 
+    public PrivateVolumeSettings() {
+        setRetainInstance(true);
+    }
+
     @Override
     protected int getMetricsCategory() {
         return MetricsLogger.DEVICEINFO_STORAGE;
@@ -158,10 +164,12 @@
 
         mExplore = buildAction(R.string.storage_menu_explore);
 
+        mDetached = false;
+
         setHasOptionsMenu(true);
     }
 
-    public void update() {
+    private void update() {
         if (!isVolumeValid()) {
             getActivity().finish();
             return;
@@ -289,6 +297,7 @@
     private Preference buildAction(int titleRes) {
         final Preference pref = new Preference(getPrefContext());
         pref.setTitle(titleRes);
+        pref.setKey(Integer.toString(titleRes));
         return pref;
     }
 
@@ -304,7 +313,10 @@
         }
 
         mStorageManager.registerListener(mStorageListener);
-        update();
+
+        if (!mDetached) {
+            update();
+        }
     }
 
     @Override
@@ -314,11 +326,18 @@
     }
 
     @Override
+    public void onDetach() {
+        super.onDetach();
+        mDetached = true;
+    }
+
+    @Override
     public void onDestroy() {
         super.onDestroy();
         if (mMeasure != null) {
             mMeasure.onDestroy();
         }
+        mDetached = false;
     }
 
     @Override
@@ -417,19 +436,19 @@
 
             } break;
             case R.string.storage_detail_images: {
-                intent = new Intent(DocumentsContract.ACTION_BROWSE_DOCUMENT_ROOT);
+                intent = new Intent(DocumentsContract.ACTION_BROWSE);
                 intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"));
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
             case R.string.storage_detail_videos: {
-                intent = new Intent(DocumentsContract.ACTION_BROWSE_DOCUMENT_ROOT);
+                intent = new Intent(DocumentsContract.ACTION_BROWSE);
                 intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"));
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
             case R.string.storage_detail_audio: {
-                intent = new Intent(DocumentsContract.ACTION_BROWSE_DOCUMENT_ROOT);
+                intent = new Intent(DocumentsContract.ACTION_BROWSE);
                 intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"));
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 0eb7264..6b42986 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -39,10 +40,10 @@
 import android.text.format.Formatter.BytesResult;
 import android.util.Log;
 import android.widget.Toast;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -116,6 +117,11 @@
                 refresh();
             }
         }
+
+        @Override
+        public void onDiskDestroyed(DiskInfo disk) {
+            refresh();
+        }
     };
 
     private static boolean isInteresting(VolumeInfo vol) {
@@ -428,6 +434,52 @@
         }
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+        private final Context mContext;
+        private final SummaryLoader mLoader;
+
+        private SummaryProvider(Context context, SummaryLoader loader) {
+            mContext = context;
+            mLoader = loader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                updateSummary();
+            }
+        }
+
+        private void updateSummary() {
+            // TODO: Register listener.
+            StorageManager storageManager = mContext.getSystemService(StorageManager.class);
+            final List<VolumeInfo> volumes = storageManager.getVolumes();
+            long privateUsedBytes = 0;
+            long privateTotalBytes = 0;
+            for (VolumeInfo info : volumes) {
+                if (info.getType() != VolumeInfo.TYPE_PUBLIC
+                        && info.getType() != VolumeInfo.TYPE_PRIVATE) {
+                    continue;
+                }
+                final File path = info.getPath();
+                privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
+                privateTotalBytes += path.getTotalSpace();
+            }
+            mLoader.setSummary(this, mContext.getString(R.string.storage_summary,
+                    Formatter.formatFileSize(mContext, privateUsedBytes),
+                    Formatter.formatFileSize(mContext, privateTotalBytes)));
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     /**
      * Enable indexing of searchable data
      */
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index ffaa10e..e7ff254 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
 import android.hardware.usb.UsbPortStatus;
@@ -36,6 +37,7 @@
     public static final int MODE_DATA_MIDI   = 0x03 << 1;
 
     private final boolean mRestricted;
+    private final boolean mMidi;
 
     private UserManager mUserManager;
     private UsbManager mUsbManager;
@@ -54,6 +56,8 @@
         mUsbManager = context.getSystemService(UsbManager.class);
 
         mRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        mMidi = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);
+
         UsbPort[] ports = mUsbManager.getPorts();
         // For now look for a connected port, in the future we should identify port in the
         // notification and pick based on that.
@@ -136,6 +140,11 @@
             // No USB data modes are supported.
             return false;
         }
+
+        if (!mMidi && (mode & MODE_DATA_MASK) == MODE_DATA_MIDI) {
+            return false;
+        }
+
         if (mPort != null) {
             int power = modeToPower(mode);
             if ((mode & MODE_DATA_MASK) != 0) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index cd6c62f..6c4d457 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -155,15 +155,13 @@
     final Path mWifiRunningPath = new Path();
     final Path mCpuRunningPath = new Path();
     final Path mDateLinePath = new Path();
-    
+
     BatteryStats mStats;
     Intent mBatteryBroadcast;
     long mStatsPeriod;
-    int mBatteryLevel;
     String mMaxPercentLabelString;
     String mMinPercentLabelString;
     String mDurationString;
-    String mChargeLabelString;
     String mChargeDurationString;
     String mDrainString;
     String mChargingLabel;
@@ -175,6 +173,8 @@
     String mCpuRunningLabel;
     String mPhoneSignalLabel;
 
+    BatteryInfo mInfo;
+
     int mChartMinHeight;
     int mHeaderHeight;
 
@@ -220,7 +220,6 @@
     long mStartWallTime;
     long mEndDataWallTime;
     long mEndWallTime;
-    boolean mDischarging;
     int mBatLow;
     int mBatHigh;
     boolean mHaveWifi;
@@ -510,54 +509,10 @@
 
         mMaxPercentLabelString = Utils.formatPercentage(100);
         mMinPercentLabelString = Utils.formatPercentage(0);
-
-        mBatteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
-        String batteryPercentString = Utils.formatPercentage(mBatteryLevel);
-        long remainingTimeUs = 0;
-        mDischarging = true;
-        if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
-            final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs);
-            if (drainTime > 0) {
-                remainingTimeUs = drainTime;
-                String timeString = Formatter.formatShortElapsedTime(getContext(),
-                        drainTime / 1000);
-                mChargeLabelString = getContext().getResources().getString(
-                        R.string.power_discharging_duration, batteryPercentString, timeString);
-            } else {
-                mChargeLabelString = batteryPercentString;
-            }
-        } else {
-            final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
-            final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(),
-                    mBatteryBroadcast);
-            final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
-                    BatteryManager.BATTERY_STATUS_UNKNOWN);
-            if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
-                mDischarging = false;
-                remainingTimeUs = chargeTime;
-                String timeString = Formatter.formatShortElapsedTime(getContext(),
-                        chargeTime / 1000);
-                int plugType = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-                int resId;
-                if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
-                    resId = R.string.power_charging_duration_ac;
-                } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
-                    resId = R.string.power_charging_duration_usb;
-                } else if (plugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
-                    resId = R.string.power_charging_duration_wireless;
-                } else {
-                    resId = R.string.power_charging_duration;
-                }
-                mChargeLabelString = getContext().getResources().getString(
-                        resId, batteryPercentString, timeString);
-            } else {
-                mChargeLabelString = getContext().getResources().getString(
-                        R.string.power_charging, batteryPercentString, statusLabel);
-            }
-        }
+        mInfo = getBatteryInfo(getContext(), mBatteryBroadcast, mStats, elapsedRealtimeUs);
         mDrainString = "";
         mChargeDurationString = "";
-        setContentDescription(mChargeLabelString);
+        setContentDescription(mInfo.mChargeLabelString);
 
         int pos = 0;
         int lastInteresting = 0;
@@ -613,9 +568,9 @@
                 }
             }
         }
-        mHistEnd = mHistDataEnd + (remainingTimeUs/1000);
+        mHistEnd = mHistDataEnd + (mInfo.remainingTimeUs/1000);
         mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
-        mEndWallTime = mEndDataWallTime + (remainingTimeUs/1000);
+        mEndWallTime = mEndDataWallTime + (mInfo.remainingTimeUs/1000);
         mNumHist = lastInteresting;
         mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
         mHaveFlashlight = (aggrStates2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
@@ -635,7 +590,7 @@
         mMaxPercentLabelStringWidth = (int)mTextPaint.measureText(mMaxPercentLabelString);
         mMinPercentLabelStringWidth = (int)mTextPaint.measureText(mMinPercentLabelString);
         mDrainStringWidth = (int)mHeaderTextPaint.measureText(mDrainString);
-        mChargeLabelStringWidth = (int)mHeaderTextPaint.measureText(mChargeLabelString);
+        mChargeLabelStringWidth = (int)mHeaderTextPaint.measureText(mInfo.mChargeLabelString);
         mChargeDurationStringWidth = (int)mHeaderTextPaint.measureText(mChargeDurationString);
         mTextAscent = (int)mTextPaint.ascent();
         mTextDescent = (int)mTextPaint.descent();
@@ -1029,9 +984,9 @@
         if (lastY < 0 || lastX < 0) {
             // Didn't get any data...
             x = lastX = mLevelLeft;
-            y = lastY = mLevelTop + levelh - ((mBatteryLevel-batLow)*(levelh-1))/batChange;
+            y = lastY = mLevelTop + levelh - ((mInfo.mBatteryLevel-batLow)*(levelh-1))/batChange;
             Path path;
-            byte value = (byte)mBatteryLevel;
+            byte value = (byte)mInfo.mBatteryLevel;
             if (value <= mBatteryCriticalLevel) path = mBatCriticalPath;
             else if (value <= mBatteryWarnLevel) path = mBatWarnPath;
             else path = null; //mBatGoodPath;
@@ -1060,7 +1015,7 @@
             mTimeRemainPath.moveTo(x, lastY);
             int fullY = mLevelTop + levelh - ((100-batLow)*(levelh-1))/batChange;
             int emptyY = mLevelTop + levelh - ((0-batLow)*(levelh-1))/batChange;
-            if (mDischarging) {
+            if (mInfo.mDischarging) {
                 mTimeRemainPath.lineTo(mLevelRight, emptyY);
             } else {
                 mTimeRemainPath.lineTo(mLevelRight, fullY);
@@ -1257,8 +1212,8 @@
 
         int headerTop = -mHeaderTextAscent + (mHeaderTextDescent-mHeaderTextAscent)/3;
         mHeaderTextPaint.setTextAlign(textAlignLeft);
-        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mChargeLabelString);
-        canvas.drawText(mChargeLabelString, textStartX, headerTop, mHeaderTextPaint);
+        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mInfo.mChargeLabelString);
+        canvas.drawText(mInfo.mChargeLabelString, textStartX, headerTop, mHeaderTextPaint);
         int stringHalfWidth = mChargeDurationStringWidth / 2;
         if (layoutRtl) stringHalfWidth = -stringHalfWidth;
         int headerCenter = ((width-mChargeDurationStringWidth-mDrainStringWidth)/2)
@@ -1404,4 +1359,59 @@
             }
         }
     }
+
+    public static class BatteryInfo {
+        public String mChargeLabelString;
+        public int mBatteryLevel;
+        public boolean mDischarging = true;
+        public long remainingTimeUs = 0;
+    }
+
+    public static BatteryInfo getBatteryInfo(Context context, Intent batteryBroadcast,
+                                             BatteryStats stats, long elapsedRealtimeUs) {
+        BatteryInfo info = new BatteryInfo();
+        info.mBatteryLevel = com.android.settings.Utils.getBatteryLevel(batteryBroadcast);
+        String batteryPercentString = Utils.formatPercentage(info.mBatteryLevel);
+        if (batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
+            final long drainTime = stats.computeBatteryTimeRemaining(elapsedRealtimeUs);
+            if (drainTime > 0) {
+                info.remainingTimeUs = drainTime;
+                String timeString = Formatter.formatShortElapsedTime(context,
+                        drainTime / 1000);
+                info.mChargeLabelString = context.getResources().getString(
+                        R.string.power_discharging_duration, batteryPercentString, timeString);
+            } else {
+                info.mChargeLabelString = batteryPercentString;
+            }
+        } else {
+            final long chargeTime = stats.computeChargeTimeRemaining(elapsedRealtimeUs);
+            final String statusLabel = com.android.settings.Utils.getBatteryStatus(
+                    context.getResources(), batteryBroadcast);
+            final int status = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
+                    BatteryManager.BATTERY_STATUS_UNKNOWN);
+            if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
+                info.mDischarging = false;
+                info.remainingTimeUs = chargeTime;
+                String timeString = Formatter.formatShortElapsedTime(context,
+                        chargeTime / 1000);
+                int plugType = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+                int resId;
+                if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
+                    resId = R.string.power_charging_duration_ac;
+                } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
+                    resId = R.string.power_charging_duration_usb;
+                } else if (plugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
+                    resId = R.string.power_charging_duration_wireless;
+                } else {
+                    resId = R.string.power_charging_duration;
+                }
+                info.mChargeLabelString = context.getResources().getString(
+                        resId, batteryPercentString, timeString);
+            } else {
+                info.mChargeLabelString = context.getResources().getString(
+                        R.string.power_charging, batteryPercentString, statusLabel);
+            }
+        }
+        return info;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 255270d..25c0fc2 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -17,13 +17,18 @@
 package com.android.settings.fuelgauge;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
 import android.os.BatteryStats;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Process;
+import android.os.SystemClock;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
@@ -32,15 +37,16 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatterySipper.DrainType;
+import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.PowerProfile;
 import com.android.settings.R;
 import com.android.settings.Settings.HighPowerApplicationsActivity;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.ManageApplications;
+import com.android.settings.dashboard.SummaryLoader;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -431,4 +437,49 @@
             super.handleMessage(msg);
         }
     };
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+        private final Context mContext;
+        private final SummaryLoader mLoader;
+
+        private SummaryProvider(Context context, SummaryLoader loader) {
+            mContext = context;
+            mLoader = loader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                // TODO: Listen.
+                new AsyncTask<Void, Void, BatteryStats>() {
+                    @Override
+                    protected BatteryStats doInBackground(Void... params) {
+                        BatteryStatsHelper statsHelper = new BatteryStatsHelper(mContext, true);
+                        statsHelper.create((Bundle) null);
+                        return statsHelper.getStats();
+                    }
+
+                    @Override
+                    protected void onPostExecute(BatteryStats batteryStats) {
+                        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
+                        Intent batteryBroadcast = mContext.registerReceiver(null,
+                                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+                        BatteryHistoryChart.BatteryInfo batteryInfo = BatteryHistoryChart
+                                .getBatteryInfo(mContext, batteryBroadcast, batteryStats,
+                                        elapsedRealtimeUs);
+                        mLoader.setSummary(SummaryProvider.this, batteryInfo.mChargeLabelString);
+                    }
+                }.execute();
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 779944b..fff5a78 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -60,6 +60,7 @@
 import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
 import com.android.settings.VoiceInputOutputSettings;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -648,6 +649,34 @@
         }
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                String localeName = getLocaleName(mContext);
+                mSummaryLoader.setSummary(this, localeName);
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
         @Override
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index df85a55..9974e89 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -16,7 +16,10 @@
 
 package com.android.settings.location;
 
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -24,22 +27,28 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v14.preference.SwitchPreference;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Switch;
-
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DimmableIconPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.location.RecentLocationApps;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -75,16 +84,10 @@
     private static final String TAG = "LocationSettings";
 
     /**
-     * Key for managed profile location preference category. Category is shown only
-     * if there is a managed profile
+     * Key for managed profile location switch preference. Shown only
+     * if there is a managed profile.
      */
-    private static final String KEY_MANAGED_PROFILE_CATEGORY = "managed_profile_location_category";
-    /**
-     * Key for managed profile location preference. Note it used to be a switch pref and we had to
-     * keep the key as strings had been submitted for string freeze before the decision to
-     * demote this to a simple preference was made. TODO: Candidate for refactoring.
-     */
-    private static final String KEY_MANAGED_PROFILE_PREFERENCE = "managed_profile_location_switch";
+    private static final String KEY_MANAGED_PROFILE_SWITCH = "managed_profile_location_switch";
     /** Key for preference screen "Mode" */
     private static final String KEY_LOCATION_MODE = "location_mode";
     /** Key for preference category "Recent location requests" */
@@ -98,7 +101,7 @@
     private Switch mSwitch;
     private boolean mValidListener = false;
     private UserHandle mManagedProfile;
-    private Preference mManagedProfilePreference;
+    private SwitchPreference mManagedProfileSwitch;
     private Preference mLocationMode;
     private PreferenceCategory mCategoryRecentLocationRequests;
     /** Receives UPDATE_INTENT  */
@@ -195,10 +198,26 @@
 
         mCategoryRecentLocationRequests =
                 (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
-        RecentLocationApps recentApps = new RecentLocationApps(activity, getPrefContext());
-        List<Preference> recentLocationRequests = recentApps.getAppList();
+        RecentLocationApps recentApps = new RecentLocationApps(activity);
+        List<RecentLocationApps.Request> recentLocationRequests = recentApps.getAppList();
+        List<Preference> recentLocationPrefs = new ArrayList<>(recentLocationRequests.size());
+        for (final RecentLocationApps.Request request : recentLocationRequests) {
+            DimmableIconPreference pref = new DimmableIconPreference(getPrefContext(),
+                    request.contentDescription);
+            pref.setIcon(request.icon);
+            pref.setTitle(request.label);
+            if (request.isHighBattery) {
+                pref.setSummary(R.string.location_high_battery_use);
+            } else {
+                pref.setSummary(R.string.location_low_battery_use);
+            }
+            pref.setOnPreferenceClickListener(
+                    new PackageEntryClickedListener(request.packageName, request.userHandle));
+            recentLocationPrefs.add(pref);
+
+        }
         if (recentLocationRequests.size() > 0) {
-            addPreferencesSorted(recentLocationRequests, mCategoryRecentLocationRequests);
+            addPreferencesSorted(recentLocationPrefs, mCategoryRecentLocationRequests);
         } else {
             // If there's no item to display, add a "No recent apps" item.
             Preference banner = new Preference(getPrefContext());
@@ -228,20 +247,39 @@
         mManagedProfile = Utils.getManagedProfile(mUm);
         if (mManagedProfile == null) {
             // There is no managed profile
-            root.removePreference(root.findPreference(KEY_MANAGED_PROFILE_CATEGORY));
-            mManagedProfilePreference = null;
+            root.removePreference(root.findPreference(KEY_MANAGED_PROFILE_SWITCH));
+            mManagedProfileSwitch = null;
         } else {
-            mManagedProfilePreference = root.findPreference(KEY_MANAGED_PROFILE_PREFERENCE);
-            mManagedProfilePreference.setOnPreferenceClickListener(null);
+            mManagedProfileSwitch = (SwitchPreference)root
+                    .findPreference(KEY_MANAGED_PROFILE_SWITCH);
+            mManagedProfileSwitch.setOnPreferenceClickListener(null);
         }
     }
 
-    private void changeManagedProfileLocationAccessStatus(boolean enabled, int summaryResId) {
-        if (mManagedProfilePreference == null) {
+    private void changeManagedProfileLocationAccessStatus(boolean mainSwitchOn) {
+        if (mManagedProfileSwitch == null) {
             return;
         }
-        mManagedProfilePreference.setEnabled(enabled);
-        mManagedProfilePreference.setSummary(summaryResId);
+        boolean enabled = mainSwitchOn;
+        int summaryResId = R.string.switch_off_text;
+        if (mUm.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile)
+                && getAdminRestrictingManagedProfile() != null) {
+                    summaryResId = R.string.managed_profile_location_switch_lockdown;
+                    enabled = false;
+        }
+
+        mManagedProfileSwitch.setEnabled(enabled);
+        mManagedProfileSwitch.setOnPreferenceClickListener(null);
+        if (!enabled) {
+            mManagedProfileSwitch.setChecked(false);
+        } else {
+            final boolean isRestricted = isManagedProfileRestrictedByBase();
+            mManagedProfileSwitch.setChecked(!isRestricted);
+            summaryResId = (isRestricted ?
+                    R.string.switch_off_text : R.string.switch_on_text);
+            mManagedProfileSwitch.setOnPreferenceClickListener(mManagedProfileSwitchClickListener);
+        }
+        mManagedProfileSwitch.setSummary(summaryResId);
     }
 
     /**
@@ -310,23 +348,25 @@
         return R.string.help_url_location_access;
     }
 
-    @Override
-    public void onModeChanged(int mode, boolean restricted) {
+    private static int getLocationString(int mode) {
         switch (mode) {
             case android.provider.Settings.Secure.LOCATION_MODE_OFF:
-                mLocationMode.setSummary(R.string.location_mode_location_off_title);
-                break;
+                return R.string.location_mode_location_off_title;
             case android.provider.Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
-                mLocationMode.setSummary(R.string.location_mode_sensors_only_title);
-                break;
+                return R.string.location_mode_sensors_only_title;
             case android.provider.Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
-                mLocationMode.setSummary(R.string.location_mode_battery_saving_title);
-                break;
+                return R.string.location_mode_battery_saving_title;
             case android.provider.Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
-                mLocationMode.setSummary(R.string.location_mode_high_accuracy_title);
-                break;
-            default:
-                break;
+                return R.string.location_mode_high_accuracy_title;
+        }
+        return 0;
+    }
+
+    @Override
+    public void onModeChanged(int mode, boolean restricted) {
+        int modeDescription = getLocationString(mode);
+        if (modeDescription != 0) {
+            mLocationMode.setSummary(modeDescription);
         }
 
         // Restricted user can't change the location mode, so disable the master switch. But in some
@@ -350,18 +390,7 @@
             }
         }
 
-        if (mManagedProfilePreference != null) {
-            if (mUm.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile)) {
-                changeManagedProfileLocationAccessStatus(false,
-                        R.string.managed_profile_location_switch_lockdown);
-            } else {
-                if (enabled) {
-                    changeManagedProfileLocationAccessStatus(true, R.string.switch_on_text);
-                } else {
-                    changeManagedProfileLocationAccessStatus(false, R.string.switch_off_text);
-                }
-            }
-        }
+        changeManagedProfileLocationAccessStatus(enabled);
 
         // As a safety measure, also reloads on location mode change to ensure the settings are
         // up-to-date even if an affected app doesn't send the setting changed broadcast.
@@ -374,9 +403,107 @@
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         if (isChecked) {
-            setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+            setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_PREVIOUS);
         } else {
             setLocationMode(android.provider.Settings.Secure.LOCATION_MODE_OFF);
         }
     }
+
+    private ComponentName getAdminRestrictingManagedProfile() {
+        if (mManagedProfile == null) {
+            return null;
+        }
+        DevicePolicyManager dpm = (DevicePolicyManager)getActivity().getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+        if (dpm == null) {
+            return null;
+        }
+        List<ComponentName> admins = dpm.getActiveAdminsAsUser(mManagedProfile.getIdentifier());
+        for (int i = 0; i < admins.size(); ++i) {
+            final ComponentName admin = admins.get(i);
+            Bundle restrictions = dpm.getUserRestrictions(admin, mManagedProfile.getIdentifier());
+            if (restrictions != null && restrictions.getBoolean(UserManager.DISALLOW_SHARE_LOCATION,
+                    false)) {
+                return admin;
+            }
+        }
+        return null;
+    }
+
+    private boolean isManagedProfileRestrictedByBase() {
+        if (mManagedProfile == null) {
+            return false;
+        }
+        return mUm.hasBaseUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, mManagedProfile);
+    }
+
+    private Preference.OnPreferenceClickListener mManagedProfileSwitchClickListener =
+            new Preference.OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    final boolean switchState = mManagedProfileSwitch.isChecked();
+                    mUm.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
+                            !switchState, mManagedProfile);
+                    mManagedProfileSwitch.setSummary(switchState ?
+                            R.string.switch_on_text : R.string.switch_off_text);
+                    return true;
+                }
+            };
+
+    private class PackageEntryClickedListener
+            implements Preference.OnPreferenceClickListener {
+        private String mPackage;
+        private UserHandle mUserHandle;
+
+        public PackageEntryClickedListener(String packageName, UserHandle userHandle) {
+            mPackage = packageName;
+            mUserHandle = userHandle;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // start new fragment to display extended information
+            Bundle args = new Bundle();
+            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
+            ((SettingsActivity) getActivity()).startPreferencePanelAsUser(
+                    InstalledAppDetails.class.getName(), args,
+                    R.string.application_info_label, null, mUserHandle);
+            return true;
+        }
+    }
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                        Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+                if (mode != Settings.Secure.LOCATION_MODE_OFF) {
+                    mSummaryLoader.setSummary(this, mContext.getString(R.string.location_on_summary,
+                            mContext.getString(getLocationString(mode))));
+                } else {
+                    mSummaryLoader.setSummary(this,
+                            mContext.getString(R.string.location_off_summary));
+                }
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
 }
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
deleted file mode 100644
index bf62c22..0000000
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2013 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.location;
-
-import android.app.AppGlobals;
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.util.Log;
-
-import com.android.settings.DimmableIconPreference;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.applications.InstalledAppDetails;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Retrieves the information of applications which accessed location recently.
- */
-public class RecentLocationApps {
-    private static final String TAG = RecentLocationApps.class.getSimpleName();
-    private static final String ANDROID_SYSTEM_PACKAGE_NAME = "android";
-
-    private static final int RECENT_TIME_INTERVAL_MILLIS = 15 * 60 * 1000;
-
-    private final SettingsActivity mActivity;
-    private final PackageManager mPackageManager;
-    private final Context mContext;
-
-    public RecentLocationApps(SettingsActivity activity, Context context) {
-        mActivity = activity;
-        mContext = context;
-        mPackageManager = activity.getPackageManager();
-    }
-
-    private class PackageEntryClickedListener
-            implements Preference.OnPreferenceClickListener {
-        private String mPackage;
-        private UserHandle mUserHandle;
-
-        public PackageEntryClickedListener(String packageName, UserHandle userHandle) {
-            mPackage = packageName;
-            mUserHandle = userHandle;
-        }
-
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            // start new fragment to display extended information
-            Bundle args = new Bundle();
-            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
-            mActivity.startPreferencePanelAsUser(InstalledAppDetails.class.getName(), args,
-                    R.string.application_info_label, null, mUserHandle);
-            return true;
-        }
-    }
-
-    private DimmableIconPreference createRecentLocationEntry(
-            Drawable icon,
-            CharSequence label,
-            boolean isHighBattery,
-            CharSequence contentDescription,
-            Preference.OnPreferenceClickListener listener) {
-        DimmableIconPreference pref = new DimmableIconPreference(mContext, contentDescription);
-        pref.setIcon(icon);
-        pref.setTitle(label);
-        if (isHighBattery) {
-            pref.setSummary(R.string.location_high_battery_use);
-        } else {
-            pref.setSummary(R.string.location_low_battery_use);
-        }
-        pref.setOnPreferenceClickListener(listener);
-        return pref;
-    }
-
-    /**
-     * Fills a list of applications which queried location recently within specified time.
-     */
-    public List<Preference> getAppList() {
-        // Retrieve a location usage list from AppOps
-        AppOpsManager aoManager =
-                (AppOpsManager) mActivity.getSystemService(Context.APP_OPS_SERVICE);
-        List<AppOpsManager.PackageOps> appOps = aoManager.getPackagesForOps(new int[] {
-                AppOpsManager.OP_MONITOR_LOCATION, AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION, });
-
-        // Process the AppOps list and generate a preference list.
-        ArrayList<Preference> prefs = new ArrayList<Preference>();
-        final long now = System.currentTimeMillis();
-        final UserManager um = (UserManager) mActivity.getSystemService(Context.USER_SERVICE);
-        final List<UserHandle> profiles = um.getUserProfiles();
-
-        final int appOpsN = appOps.size();
-        for (int i = 0; i < appOpsN; ++i) {
-            AppOpsManager.PackageOps ops = appOps.get(i);
-            // Don't show the Android System in the list - it's not actionable for the user.
-            // Also don't show apps belonging to background users except managed users.
-            String packageName = ops.getPackageName();
-            int uid = ops.getUid();
-            int userId = UserHandle.getUserId(uid);
-            boolean isAndroidOs =
-                    (uid == Process.SYSTEM_UID) && ANDROID_SYSTEM_PACKAGE_NAME.equals(packageName);
-            if (isAndroidOs || !profiles.contains(new UserHandle(userId))) {
-                continue;
-            }
-            Preference preference = getPreferenceFromOps(um, now, ops);
-            if (preference != null) {
-                prefs.add(preference);
-            }
-        }
-
-        return prefs;
-    }
-
-    /**
-     * Creates a Preference entry for the given PackageOps.
-     *
-     * This method examines the time interval of the PackageOps first. If the PackageOps is older
-     * than the designated interval, this method ignores the PackageOps object and returns null.
-     * When the PackageOps is fresh enough, this method returns a Preference pointing to the App
-     * Info page for that package.
-     */
-    private Preference getPreferenceFromOps(final UserManager um, long now,
-            AppOpsManager.PackageOps ops) {
-        String packageName = ops.getPackageName();
-        List<AppOpsManager.OpEntry> entries = ops.getOps();
-        boolean highBattery = false;
-        boolean normalBattery = false;
-        // Earliest time for a location request to end and still be shown in list.
-        long recentLocationCutoffTime = now - RECENT_TIME_INTERVAL_MILLIS;
-        for (AppOpsManager.OpEntry entry : entries) {
-            if (entry.isRunning() || entry.getTime() >= recentLocationCutoffTime) {
-                switch (entry.getOp()) {
-                    case AppOpsManager.OP_MONITOR_LOCATION:
-                        normalBattery = true;
-                        break;
-                    case AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION:
-                        highBattery = true;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        if (!highBattery && !normalBattery) {
-            if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                Log.v(TAG, packageName + " hadn't used location within the time interval.");
-            }
-            return null;
-        }
-
-        // The package is fresh enough, continue.
-
-        int uid = ops.getUid();
-        int userId = UserHandle.getUserId(uid);
-
-        DimmableIconPreference preference = null;
-        try {
-            IPackageManager ipm = AppGlobals.getPackageManager();
-            ApplicationInfo appInfo =
-                    ipm.getApplicationInfo(packageName, PackageManager.GET_META_DATA, userId);
-            if (appInfo == null) {
-                Log.w(TAG, "Null application info retrieved for package " + packageName
-                        + ", userId " + userId);
-                return null;
-            }
-            Resources res = mActivity.getResources();
-
-            final UserHandle userHandle = new UserHandle(userId);
-            Drawable appIcon = mPackageManager.getApplicationIcon(appInfo);
-            Drawable icon = mPackageManager.getUserBadgedIcon(appIcon, userHandle);
-            CharSequence appLabel = mPackageManager.getApplicationLabel(appInfo);
-            CharSequence badgedAppLabel = mPackageManager.getUserBadgedLabel(appLabel, userHandle);
-            if (appLabel.toString().contentEquals(badgedAppLabel)) {
-                // If badged label is not different from original then no need for it as
-                // a separate content description.
-                badgedAppLabel = null;
-            }
-            preference = createRecentLocationEntry(icon,
-                    appLabel, highBattery, badgedAppLabel,
-                    new PackageEntryClickedListener(packageName, userHandle));
-        } catch (RemoteException e) {
-            Log.w(TAG, "Error while retrieving application info for package " + packageName
-                    + ", userId " + userId, e);
-        }
-
-        return preference;
-    }
-}
diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java
index c918d2f..4738728 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreference.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreference.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.nfc;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -32,6 +33,7 @@
 
 import com.android.settings.CustomDialogPreference;
 import com.android.settings.R;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
 
 import java.util.List;
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index c0f3ff7..985a1e6 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.nfc;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
@@ -29,6 +31,7 @@
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
 
 import java.util.List;
@@ -48,21 +51,11 @@
 
         mPaymentBackend = new PaymentBackend(getActivity());
         setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
-        View emptyView = getActivity().getLayoutInflater().inflate(
-                R.layout.nfc_payment_empty, contentRoot, false);
-        contentRoot.addView(emptyView);
-        setEmptyView(emptyView);
 
         PreferenceManager manager = getPreferenceManager();
         PreferenceScreen screen = manager.createPreferenceScreen(getActivity());
 
-        List<PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
+        List<PaymentBackend.PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
         if (appInfos != null && appInfos.size() > 0) {
             NfcPaymentPreference preference =
                     new NfcPaymentPreference(getPrefContext(), mPaymentBackend);
@@ -76,6 +69,16 @@
     }
 
     @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
+        View emptyView = getActivity().getLayoutInflater().inflate(
+                R.layout.nfc_payment_empty, contentRoot, false);
+        contentRoot.addView(emptyView);
+        setEmptyView(emptyView);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mPaymentBackend.onResume();
@@ -95,4 +98,37 @@
         menuItem.setIntent(howItWorksIntent);
         menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
     }
+
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                PaymentBackend paymentBackend = new PaymentBackend(mContext);
+                paymentBackend.refresh();
+                PaymentAppInfo app = paymentBackend.getDefaultApp();
+                if (app != null) {
+                    mSummaryLoader.setSummary(this, mContext.getString(R.string.payment_summary,
+                            app.label));
+                }
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
 }
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index d49ecdd..deba7d4 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -54,9 +54,6 @@
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private static final String KEY_BLOCK = "block";
-    private static final String KEY_PRIORITY = "priority";
-    private static final String KEY_PEEKABLE = "peekable";
-    private static final String KEY_SENSITIVE = "sensitive";
     private static final String KEY_APP_SETTINGS = "app_settings";
 
     private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
@@ -67,9 +64,6 @@
 
     private Context mContext;
     private SwitchPreference mBlock;
-    private SwitchPreference mPriority;
-    private SwitchPreference mPeekable;
-    private SwitchPreference mSensitive;
     private AppRow mAppRow;
     private boolean mCreated;
     private boolean mIsSystemPackage;
@@ -132,9 +126,6 @@
 
         addPreferencesFromResource(R.xml.app_notification_settings);
         mBlock = (SwitchPreference) findPreference(KEY_BLOCK);
-        mPriority = (SwitchPreference) findPreference(KEY_PRIORITY);
-        mPeekable = (SwitchPreference) findPreference(KEY_PEEKABLE);
-        mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
 
         mAppRow = mBackend.loadAppRow(pm, info.applicationInfo);
 
@@ -143,11 +134,29 @@
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(getPackageManager(), rows);
 
+        // Add topics
+        List<Notification.Topic> topics = mBackend.getTopics(pkg, mUid);
+        for (Notification.Topic topic : topics) {
+            Preference topicPreference = new Preference(mContext);
+            topicPreference.setKey(topic.getId());
+            topicPreference.setTitle(topic.getLabel());
+            // Create intent for this preference.
+            Bundle topicArgs = new Bundle();
+            topicArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
+            topicArgs.putParcelable(TopicNotificationSettings.ARG_TOPIC, topic);
+            topicArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
+            topicArgs.putParcelable(TopicNotificationSettings.ARG_PACKAGE_INFO, info);
+
+            Intent topicIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+                    TopicNotificationSettings.class.getName(),
+                    topicArgs, null, R.string.topic_notifications_title, null, false);
+            topicPreference.setIntent(topicIntent);
+            // Add preference to the settings menu.
+            getPreferenceScreen().addPreference(topicPreference);
+        }
+
         mBlock.setChecked(mAppRow.banned);
         updateDependents(mAppRow.banned);
-        mPriority.setChecked(mAppRow.priority);
-        mPeekable.setChecked(mAppRow.peekable);
-        mSensitive.setChecked(mAppRow.sensitive);
 
         mBlock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
@@ -164,30 +173,6 @@
             }
         });
 
-        mPriority.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean priority = (Boolean) newValue;
-                return mBackend.setHighPriority(pkg, mUid, priority);
-            }
-        });
-
-        mPeekable.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean peekable = (Boolean) newValue;
-                return mBackend.setPeekable(pkg, mUid, peekable);
-            }
-        });
-
-        mSensitive.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final boolean sensitive = (Boolean) newValue;
-                return mBackend.setSensitive(pkg, mUid, sensitive);
-            }
-        });
-
         if (mAppRow.settingsIntent != null) {
             findPreference(KEY_APP_SETTINGS).setOnPreferenceClickListener(
                     new OnPreferenceClickListener() {
@@ -212,16 +197,7 @@
     }
 
     private void updateDependents(boolean banned) {
-        final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(
-                UserHandle.myUserId());
-        final boolean lockscreenNotificationsEnabled = getLockscreenNotificationsEnabled();
-        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
-
         setVisible(mBlock, !mIsSystemPackage);
-        setVisible(mPriority, mIsSystemPackage || !banned);
-        setVisible(mPeekable, mIsSystemPackage || !banned);
-        setVisible(mSensitive, mIsSystemPackage || !banned && lockscreenSecure
-                && lockscreenNotificationsEnabled && allowPrivate);
     }
 
     private void setVisible(Preference p, boolean visible) {
@@ -234,16 +210,6 @@
         }
     }
 
-    private boolean getLockscreenNotificationsEnabled() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
-    }
-
-    private boolean getLockscreenAllowPrivateNotifications() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
-    }
-
     private void toastAndFinish() {
         Toast.makeText(mContext, R.string.app_not_found_dlg_text, Toast.LENGTH_SHORT).show();
         getActivity().finish();
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
new file mode 100644
index 0000000..4b438f0
--- /dev/null
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -0,0 +1,250 @@
+/**
+ * Copyright (C) 2015 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.notification;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.DropDownPreference;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.TwoStatePreference;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+public class ConfigureNotificationSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "ConfigNotiSettings";
+
+    private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
+    private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "lock_screen_notifications";
+
+    private final SettingsObserver mSettingsObserver = new SettingsObserver();
+
+    private Context mContext;
+
+    private TwoStatePreference mNotificationPulse;
+    private DropDownPreference mLockscreen;
+    private boolean mSecure;
+    private int mLockscreenSelectedValue;
+
+    @Override
+    protected int getMetricsCategory() {
+        return InstrumentedFragment.CONFIGURE_NOTIFICATION;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getActivity();
+        mSecure = new LockPatternUtils(getActivity()).isSecure(UserHandle.myUserId());
+
+        addPreferencesFromResource(R.xml.configure_notification_settings);
+
+        initPulse();
+        initLockscreenNotifications();
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsObserver.register(true);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSettingsObserver.register(false);
+    }
+
+    // === Pulse notification light ===
+
+    private void initPulse() {
+        mNotificationPulse =
+                (TwoStatePreference) getPreferenceScreen().findPreference(KEY_NOTIFICATION_PULSE);
+        if (mNotificationPulse == null) {
+            Log.i(TAG, "Preference not found: " + KEY_NOTIFICATION_PULSE);
+            return;
+        }
+        if (!getResources()
+                .getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed)) {
+            getPreferenceScreen().removePreference(mNotificationPulse);
+        } else {
+            updatePulse();
+            mNotificationPulse.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    final boolean val = (Boolean)newValue;
+                    return Settings.System.putInt(getContentResolver(),
+                            Settings.System.NOTIFICATION_LIGHT_PULSE,
+                            val ? 1 : 0);
+                }
+            });
+        }
+    }
+
+    private void updatePulse() {
+        if (mNotificationPulse == null) {
+            return;
+        }
+        try {
+            mNotificationPulse.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.NOTIFICATION_LIGHT_PULSE) == 1);
+        } catch (Settings.SettingNotFoundException snfe) {
+            Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
+        }
+    }
+
+    // === Lockscreen (public / private) notifications ===
+
+    private void initLockscreenNotifications() {
+        mLockscreen = (DropDownPreference) getPreferenceScreen().findPreference(
+                KEY_LOCK_SCREEN_NOTIFICATIONS);
+        if (mLockscreen == null) {
+            Log.i(TAG, "Preference not found: " + KEY_LOCK_SCREEN_NOTIFICATIONS);
+            return;
+        }
+
+        boolean isSecureNotificationsDisabled = isSecureNotificationsDisabled();
+        boolean isUnredactedNotificationsDisabled = isUnredactedNotificationsDisabled();
+        ArrayList<CharSequence> entries = new ArrayList<>();
+        ArrayList<CharSequence> values = new ArrayList<>();
+        if (!isSecureNotificationsDisabled && !isUnredactedNotificationsDisabled) {
+            entries.add(getString(R.string.lock_screen_notifications_summary_show));
+            values.add(Integer.toString(R.string.lock_screen_notifications_summary_show));
+        }
+        if (mSecure && !isSecureNotificationsDisabled) {
+            entries.add(getString(R.string.lock_screen_notifications_summary_hide));
+            values.add(Integer.toString(R.string.lock_screen_notifications_summary_hide));
+        }
+        entries.add(getString(R.string.lock_screen_notifications_summary_disable));
+        values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable));
+
+        mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()]));
+        mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()]));
+        updateLockscreenNotifications();
+        if (mLockscreen.getEntries().length > 1) {
+            mLockscreen.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    final int val = Integer.parseInt((String) newValue);
+                    if (val == mLockscreenSelectedValue) {
+                        return false;
+                    }
+                    final boolean enabled =
+                            val != R.string.lock_screen_notifications_summary_disable;
+                    final boolean show = val == R.string.lock_screen_notifications_summary_show;
+                    Settings.Secure.putInt(getContentResolver(),
+                            Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0);
+                    Settings.Secure.putInt(getContentResolver(),
+                            Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0);
+                    mLockscreenSelectedValue = val;
+                    return true;
+                }
+            });
+        } else {
+            // There is one or less option for the user, disable the drop down.
+            mLockscreen.setEnabled(false);
+        }
+    }
+
+    private boolean isSecureNotificationsDisabled() {
+        final DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+        return dpm != null && (dpm.getKeyguardDisabledFeatures(null)
+                & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) != 0;
+    }
+
+    private boolean isUnredactedNotificationsDisabled() {
+        final DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+        return dpm != null && (dpm.getKeyguardDisabledFeatures(null)
+                & DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS) != 0;
+    }
+
+    private void updateLockscreenNotifications() {
+        if (mLockscreen == null) {
+            return;
+        }
+        final boolean enabled = getLockscreenNotificationsEnabled();
+        final boolean allowPrivate = !mSecure || getLockscreenAllowPrivateNotifications();
+        mLockscreenSelectedValue = !enabled ? R.string.lock_screen_notifications_summary_disable :
+                allowPrivate ? R.string.lock_screen_notifications_summary_show :
+                R.string.lock_screen_notifications_summary_hide;
+        mLockscreen.setValue(Integer.toString(mLockscreenSelectedValue));
+    }
+
+    private boolean getLockscreenNotificationsEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
+    }
+
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
+    }
+
+
+    // === Callbacks ===
+
+    private final class SettingsObserver extends ContentObserver {
+        private final Uri NOTIFICATION_LIGHT_PULSE_URI =
+                Settings.System.getUriFor(Settings.System.NOTIFICATION_LIGHT_PULSE);
+        private final Uri LOCK_SCREEN_PRIVATE_URI =
+                Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);
+        private final Uri LOCK_SCREEN_SHOW_URI =
+                Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS);
+
+        public SettingsObserver() {
+            super(new Handler());
+        }
+
+        public void register(boolean register) {
+            final ContentResolver cr = getContentResolver();
+            if (register) {
+                cr.registerContentObserver(NOTIFICATION_LIGHT_PULSE_URI, false, this);
+                cr.registerContentObserver(LOCK_SCREEN_PRIVATE_URI, false, this);
+                cr.registerContentObserver(LOCK_SCREEN_SHOW_URI, false, this);
+            } else {
+                cr.unregisterContentObserver(this);
+            }
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (NOTIFICATION_LIGHT_PULSE_URI.equals(uri)) {
+                updatePulse();
+            }
+            if (LOCK_SCREEN_PRIVATE_URI.equals(uri) || LOCK_SCREEN_SHOW_URI.equals(uri)) {
+                updateLockscreenNotifications();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/EmptyTextSettings.java b/src/com/android/settings/notification/EmptyTextSettings.java
index dd7a321..3f8ccc6 100644
--- a/src/com/android/settings/notification/EmptyTextSettings.java
+++ b/src/com/android/settings/notification/EmptyTextSettings.java
@@ -39,7 +39,7 @@
         TypedValue value = new TypedValue();
         getContext().getTheme().resolveAttribute(android.R.attr.textAppearanceMedium, value, true);
         mEmpty.setTextAppearance(value.resourceId);
-        ((ViewGroup) view.findViewById(R.id.list_container)).addView(mEmpty,
+        ((ViewGroup) view.findViewById(android.R.id.list_container)).addView(mEmpty,
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
         setEmptyView(mEmpty);
     }
diff --git a/src/com/android/settings/notification/ImportanceSeekBarPreference.java b/src/com/android/settings/notification/ImportanceSeekBarPreference.java
new file mode 100644
index 0000000..fdba42c
--- /dev/null
+++ b/src/com/android/settings/notification/ImportanceSeekBarPreference.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright (C) 2015 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.notification;
+
+import com.android.settings.R;
+import com.android.settings.SeekBarPreference;
+
+import android.content.Context;
+import android.service.notification.NotificationListenerService;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+/**
+ * A slider preference that controls notification importance.
+ **/
+public class ImportanceSeekBarPreference extends SeekBarPreference implements
+        SeekBar.OnSeekBarChangeListener {
+    private static final String TAG = "ImportanceSeekBarPref";
+
+    public static final int IMPORTANCE_PROGRESS_OFFSET = 2;
+    private Callback mCallback;
+    private TextView mSummaryTextView;
+    private String mSummary;
+
+    public ImportanceSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        setLayoutResource(R.layout.preference_importance_slider);
+    }
+
+    public ImportanceSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public ImportanceSeekBarPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ImportanceSeekBarPreference(Context context) {
+        this(context, null);
+    }
+
+    public void setCallback(Callback callback) {
+        mCallback = callback;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+        mSummaryTextView = (TextView) view.findViewById(com.android.internal.R.id.summary);
+    }
+
+    @Override
+    public void setProgress(int progress) {
+        mSummary = getProgressSummary(progress);
+        super.setProgress(progress);
+    }
+
+    @Override
+    public void onProgressChanged(SeekBar seekBar, final int progress, boolean fromTouch) {
+        super.onProgressChanged(seekBar, progress, fromTouch);
+        if (mSummaryTextView != null) {
+            mSummaryTextView.setText(getProgressSummary(progress));
+        }
+        if (fromTouch) {
+            mCallback.onImportanceChanged(progress);
+        }
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return mSummary;
+    }
+
+    private String getProgressSummary(int progress) {
+        // Map progress 0-4 values to Importance's -2-2.
+        progress = progress - IMPORTANCE_PROGRESS_OFFSET;
+        switch (progress) {
+            case NotificationListenerService.Ranking.IMPORTANCE_NONE:
+                return getContext().getString(
+                        com.android.internal.R.string.notification_importance_blocked);
+            case NotificationListenerService.Ranking.IMPORTANCE_LOW:
+                return getContext().getString(
+                        com.android.internal.R.string.notification_importance_low);
+            case NotificationListenerService.Ranking.IMPORTANCE_DEFAULT:
+                return getContext().getString(
+                        com.android.internal.R.string.notification_importance_default);
+            case NotificationListenerService.Ranking.IMPORTANCE_HIGH:
+                return getContext().getString(
+                        com.android.internal.R.string.notification_importance_high);
+            case NotificationListenerService.Ranking.IMPORTANCE_MAX:
+                return getContext().getString(
+                        com.android.internal.R.string.notification_importance_max);
+            default:
+                return "";
+        }
+    }
+
+    public interface Callback {
+        void onImportanceChanged(int progress);
+    }
+}
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 2060719..4c1f6ea 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -15,17 +15,22 @@
  */
 package com.android.settings.notification;
 
+import com.google.android.collect.Lists;
+
 import android.app.INotificationManager;
 import android.app.Notification;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ParceledListSlice;
 import android.graphics.drawable.Drawable;
 import android.os.ServiceManager;
 import android.service.notification.NotificationListenerService;
 import android.util.Log;
 
+import java.util.List;
+
 public class NotificationBackend {
     private static final String TAG = "NotificationBackend";
 
@@ -44,9 +49,20 @@
         }
         row.icon = app.loadIcon(pm);
         row.banned = getNotificationsBanned(row.pkg, row.uid);
-        row.priority = getHighPriority(row.pkg, row.uid);
-        row.peekable = getPeekable(row.pkg, row.uid);
-        row.sensitive = getSensitive(row.pkg, row.uid);
+        return row;
+    }
+
+    public TopicRow loadTopicRow(PackageManager pm, ApplicationInfo app, Notification.Topic topic) {
+        final TopicRow row = new TopicRow();
+        row.pkg = app.packageName;
+        row.uid = app.uid;
+        row.label = topic.getLabel();
+        row.icon = app.loadIcon(pm);
+        row.topic = topic;
+        row.priority = getBypassZenMode(row.pkg, row.uid, row.topic);
+        row.sensitive = getSensitive(row.pkg, row.uid, row.topic);
+        row.banned = getNotificationsBanned(row.pkg, row.uid);
+        row.importance = getImportance(row.pkg, row.uid, row.topic);
         return row;
     }
 
@@ -70,19 +86,20 @@
         }
     }
 
-    public boolean getHighPriority(String pkg, int uid) {
+    public boolean getBypassZenMode(String pkg, int uid, Notification.Topic topic) {
         try {
-            return sINM.getPackagePriority(pkg, uid) == Notification.PRIORITY_MAX;
+            return sINM.getTopicPriority(pkg, uid, topic) == Notification.PRIORITY_MAX;
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
             return false;
         }
     }
 
-    public boolean setHighPriority(String pkg, int uid, boolean highPriority) {
+    public boolean setBypassZenMode(String pkg, int uid, Notification.Topic topic,
+            boolean bypassZen) {
         try {
-            sINM.setPackagePriority(pkg, uid,
-                    highPriority ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT);
+            sINM.setTopicPriority(pkg, uid, topic,
+                    bypassZen ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT);
             return true;
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
@@ -90,37 +107,19 @@
         }
     }
 
-    public boolean getPeekable(String pkg, int uid) {
+    public boolean getSensitive(String pkg, int uid, Notification.Topic topic) {
         try {
-            return sINM.getPackagePeekable(pkg, uid);
+            return sINM.getTopicVisibilityOverride(pkg, uid, topic)
+                    == Notification.VISIBILITY_PRIVATE;
         } catch (Exception e) {
             Log.w(TAG, "Error calling NoMan", e);
             return false;
         }
     }
 
-    public boolean setPeekable(String pkg, int uid, boolean peekable) {
+    public boolean setSensitive(String pkg, int uid, Notification.Topic topic, boolean sensitive) {
         try {
-            sINM.setPackagePeekable(pkg, uid, peekable);
-            return true;
-        } catch (Exception e) {
-           Log.w(TAG, "Error calling NoMan", e);
-           return false;
-        }
-    }
-
-    public boolean getSensitive(String pkg, int uid) {
-        try {
-            return sINM.getPackageVisibilityOverride(pkg, uid) == Notification.VISIBILITY_PRIVATE;
-        } catch (Exception e) {
-            Log.w(TAG, "Error calling NoMan", e);
-            return false;
-        }
-    }
-
-    public boolean setSensitive(String pkg, int uid, boolean sensitive) {
-        try {
-            sINM.setPackageVisibilityOverride(pkg, uid,
+            sINM.setTopicVisibilityOverride(pkg, uid, topic,
                     sensitive ? Notification.VISIBILITY_PRIVATE
                             : NotificationListenerService.Ranking.VISIBILITY_NO_OVERRIDE);
             return true;
@@ -130,6 +129,35 @@
         }
     }
 
+    public boolean setImportance(String pkg, int uid, Notification.Topic topic, int importance) {
+        try {
+            sINM.setTopicImportance(pkg, uid, topic, importance);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
+    public int getImportance(String pkg, int uid, Notification.Topic topic) {
+        try {
+            return sINM.getTopicImportance(pkg, uid, topic);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return NotificationListenerService.Ranking.IMPORTANCE_DEFAULT;
+        }
+    }
+
+    public List<Notification.Topic> getTopics(String pkg, int uid) {
+        try {
+            final ParceledListSlice<Notification.Topic> parceledList = sINM.getTopics(pkg, uid);
+            return parceledList.getList();
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return Lists.newArrayList();
+        }
+    }
+
     static class Row {
         public String section;
     }
@@ -141,10 +169,14 @@
         public CharSequence label;
         public Intent settingsIntent;
         public boolean banned;
-        public boolean priority;
-        public boolean peekable;
-        public boolean sensitive;
         public boolean first;  // first app in section
     }
 
+    public static class TopicRow extends AppRow {
+        public Notification.Topic topic;
+        public boolean priority;
+        public boolean sensitive;
+        public int importance;
+    }
+
 }
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/SoundSettings.java
similarity index 65%
rename from src/com/android/settings/notification/NotificationSettings.java
rename to src/com/android/settings/notification/SoundSettings.java
index 46935d0..11517ea 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.notification;
 
+import android.app.Activity;
 import android.app.NotificationManager;
-import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -37,7 +37,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.Vibrator;
 import android.preference.SeekBarVolumizer;
@@ -47,29 +46,27 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.TwoStatePreference;
 import android.util.Log;
 
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.DropDownPreference;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-public class NotificationSettings extends SettingsPreferenceFragment implements Indexable {
-    private static final String TAG = "NotificationSettings";
+public class SoundSettings extends SettingsPreferenceFragment implements Indexable {
+    private static final String TAG = "SoundSettings";
 
-    private static final String KEY_SOUND = "sound";
     private static final String KEY_MEDIA_VOLUME = "media_volume";
     private static final String KEY_ALARM_VOLUME = "alarm_volume";
     private static final String KEY_RING_VOLUME = "ring_volume";
@@ -78,19 +75,14 @@
     private static final String KEY_NOTIFICATION_RINGTONE = "notification_ringtone";
     private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
     private static final String KEY_WIFI_DISPLAY = "wifi_display";
-    private static final String KEY_NOTIFICATION = "notification";
-    private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
-    private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "lock_screen_notifications";
-    private static final String KEY_NOTIFICATION_ACCESS = "manage_notification_access";
-    private static final String KEY_ZEN_ACCESS = "manage_zen_access";
     private static final String KEY_ZEN_MODE = "zen_mode";
+    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
 
     private static final String[] RESTRICTED_KEYS = {
         KEY_MEDIA_VOLUME,
         KEY_ALARM_VOLUME,
         KEY_RING_VOLUME,
         KEY_NOTIFICATION_VOLUME,
-        KEY_ZEN_ACCESS,
         KEY_ZEN_MODE,
     };
 
@@ -103,7 +95,6 @@
     private final ArrayList<VolumeSeekBarPreference> mVolumePrefs = new ArrayList<>();
 
     private Context mContext;
-    private PackageManager mPM;
     private boolean mVoiceCapable;
     private Vibrator mVibrator;
     private AudioManager mAudioManager;
@@ -112,31 +103,25 @@
     private Preference mPhoneRingtonePreference;
     private Preference mNotificationRingtonePreference;
     private TwoStatePreference mVibrateWhenRinging;
-    private TwoStatePreference mNotificationPulse;
-    private DropDownPreference mLockscreen;
-    private Preference mNotificationAccess;
-    private Preference mZenAccess;
-    private boolean mSecure;
-    private int mLockscreenSelectedValue;
     private ComponentName mSuppressor;
     private int mRingerMode = -1;
 
+    private PackageManager mPm;
     private UserManager mUserManager;
     private RingtonePreference mRequestPreference;
 
     @Override
     protected int getMetricsCategory() {
-        return MetricsLogger.NOTIFICATION;
+        return InstrumentedFragment.SOUND;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
-        mPM = mContext.getPackageManager();
+        mPm = getPackageManager();
         mUserManager = UserManager.get(getContext());
         mVoiceCapable = Utils.isVoiceCapable(mContext);
-        mSecure = new LockPatternUtils(getActivity()).isSecure(UserHandle.myUserId());
 
         mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         mVibrator = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
@@ -144,9 +129,8 @@
             mVibrator = null;
         }
 
-        addPreferencesFromResource(R.xml.notification_settings);
+        addPreferencesFromResource(R.xml.sound_settings);
 
-        final PreferenceCategory sound = (PreferenceCategory) findPreference(KEY_SOUND);
         initVolumePreference(KEY_MEDIA_VOLUME, AudioManager.STREAM_MUSIC,
                 com.android.internal.R.drawable.ic_audio_media_mute);
         initVolumePreference(KEY_ALARM_VOLUME, AudioManager.STREAM_ALARM,
@@ -155,25 +139,33 @@
             mRingOrNotificationPreference =
                     initVolumePreference(KEY_RING_VOLUME, AudioManager.STREAM_RING,
                             com.android.internal.R.drawable.ic_audio_ring_notif_mute);
-            sound.removePreference(sound.findPreference(KEY_NOTIFICATION_VOLUME));
+            removePreference(KEY_NOTIFICATION_VOLUME);
         } else {
             mRingOrNotificationPreference =
                     initVolumePreference(KEY_NOTIFICATION_VOLUME, AudioManager.STREAM_NOTIFICATION,
                             com.android.internal.R.drawable.ic_audio_ring_notif_mute);
-            sound.removePreference(sound.findPreference(KEY_RING_VOLUME));
+            removePreference(KEY_RING_VOLUME);
         }
-        initRingtones(sound);
-        initVibrateWhenRinging(sound);
 
-        final PreferenceCategory notification = (PreferenceCategory)
-                findPreference(KEY_NOTIFICATION);
-        initPulse(notification);
-        initLockscreenNotifications(notification);
-
-        mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS);
-        refreshNotificationListeners();
-        mZenAccess = findPreference(KEY_ZEN_ACCESS);
-        refreshZenAccess();
+        // Enable link to CMAS app settings depending on the value in config.xml.
+        boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
+                com.android.internal.R.bool.config_cellBroadcastAppLinks);
+        try {
+            if (isCellBroadcastAppLinkEnabled) {
+                if (mPm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
+                        == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+                    isCellBroadcastAppLinkEnabled = false;  // CMAS app disabled
+                }
+            }
+        } catch (IllegalArgumentException ignored) {
+            isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
+        }
+        if (!mUserManager.isAdminUser() || !isCellBroadcastAppLinkEnabled
+                || mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS)) {
+            removePreference(KEY_CELL_BROADCAST_SETTINGS);
+        }
+        initRingtones();
+        initVibrateWhenRinging();
         updateRingerMode();
         updateEffectsSuppressor();
     }
@@ -181,8 +173,6 @@
     @Override
     public void onResume() {
         super.onResume();
-        refreshNotificationListeners();
-        refreshZenAccess();
         lookupRingtoneNames();
         mSettingsObserver.register(true);
         mReceiver.register(true);
@@ -323,13 +313,14 @@
 
     // === Phone & notification ringtone ===
 
-    private void initRingtones(PreferenceCategory root) {
-        mPhoneRingtonePreference = root.findPreference(KEY_PHONE_RINGTONE);
+    private void initRingtones() {
+        mPhoneRingtonePreference = getPreferenceScreen().findPreference(KEY_PHONE_RINGTONE);
         if (mPhoneRingtonePreference != null && !mVoiceCapable) {
-            root.removePreference(mPhoneRingtonePreference);
+            getPreferenceScreen().removePreference(mPhoneRingtonePreference);
             mPhoneRingtonePreference = null;
         }
-        mNotificationRingtonePreference = root.findPreference(KEY_NOTIFICATION_RINGTONE);
+        mNotificationRingtonePreference =
+                getPreferenceScreen().findPreference(KEY_NOTIFICATION_RINGTONE);
     }
 
     private void lookupRingtoneNames() {
@@ -397,14 +388,15 @@
 
     // === Vibrate when ringing ===
 
-    private void initVibrateWhenRinging(PreferenceCategory root) {
-        mVibrateWhenRinging = (TwoStatePreference) root.findPreference(KEY_VIBRATE_WHEN_RINGING);
+    private void initVibrateWhenRinging() {
+        mVibrateWhenRinging =
+                (TwoStatePreference) getPreferenceScreen().findPreference(KEY_VIBRATE_WHEN_RINGING);
         if (mVibrateWhenRinging == null) {
             Log.i(TAG, "Preference not found: " + KEY_VIBRATE_WHEN_RINGING);
             return;
         }
         if (!mVoiceCapable) {
-            root.removePreference(mVibrateWhenRinging);
+            getPreferenceScreen().removePreference(mVibrateWhenRinging);
             mVibrateWhenRinging = null;
             return;
         }
@@ -427,164 +419,11 @@
                 Settings.System.VIBRATE_WHEN_RINGING, 0) != 0);
     }
 
-    // === Pulse notification light ===
-
-    private void initPulse(PreferenceCategory parent) {
-        mNotificationPulse = (TwoStatePreference) parent.findPreference(KEY_NOTIFICATION_PULSE);
-        if (mNotificationPulse == null) {
-            Log.i(TAG, "Preference not found: " + KEY_NOTIFICATION_PULSE);
-            return;
-        }
-        if (!getResources()
-                .getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed)) {
-            parent.removePreference(mNotificationPulse);
-        } else {
-            updatePulse();
-            mNotificationPulse.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    final boolean val = (Boolean)newValue;
-                    return Settings.System.putInt(getContentResolver(),
-                            Settings.System.NOTIFICATION_LIGHT_PULSE,
-                            val ? 1 : 0);
-                }
-            });
-        }
-    }
-
-    private void updatePulse() {
-        if (mNotificationPulse == null) {
-            return;
-        }
-        try {
-            mNotificationPulse.setChecked(Settings.System.getInt(getContentResolver(),
-                    Settings.System.NOTIFICATION_LIGHT_PULSE) == 1);
-        } catch (Settings.SettingNotFoundException snfe) {
-            Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
-        }
-    }
-
-    // === Lockscreen (public / private) notifications ===
-
-    private void initLockscreenNotifications(PreferenceCategory parent) {
-        mLockscreen = (DropDownPreference) parent.findPreference(KEY_LOCK_SCREEN_NOTIFICATIONS);
-        if (mLockscreen == null) {
-            Log.i(TAG, "Preference not found: " + KEY_LOCK_SCREEN_NOTIFICATIONS);
-            return;
-        }
-
-        boolean isSecureNotificationsDisabled = isSecureNotificationsDisabled();
-        boolean isUnredactedNotificationsDisabled = isUnredactedNotificationsDisabled();
-        ArrayList<CharSequence> entries = new ArrayList<>();
-        ArrayList<CharSequence> values = new ArrayList<>();
-        if (!isSecureNotificationsDisabled && !isUnredactedNotificationsDisabled) {
-            entries.add(getString(R.string.lock_screen_notifications_summary_show));
-            values.add(Integer.toString(R.string.lock_screen_notifications_summary_show));
-        }
-        if (mSecure && !isSecureNotificationsDisabled) {
-            entries.add(getString(R.string.lock_screen_notifications_summary_hide));
-            values.add(Integer.toString(R.string.lock_screen_notifications_summary_hide));
-        }
-        entries.add(getString(R.string.lock_screen_notifications_summary_disable));
-        values.add(Integer.toString(R.string.lock_screen_notifications_summary_disable));
-
-        mLockscreen.setEntries(entries.toArray(new CharSequence[entries.size()]));
-        mLockscreen.setEntryValues(values.toArray(new CharSequence[values.size()]));
-        updateLockscreenNotifications();
-        if (mLockscreen.getEntries().length > 1) {
-            mLockscreen.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    final int val = Integer.parseInt((String) newValue);
-                    if (val == mLockscreenSelectedValue) {
-                        return false;
-                    }
-                    final boolean enabled =
-                            val != R.string.lock_screen_notifications_summary_disable;
-                    final boolean show = val == R.string.lock_screen_notifications_summary_show;
-                    Settings.Secure.putInt(getContentResolver(),
-                            Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, show ? 1 : 0);
-                    Settings.Secure.putInt(getContentResolver(),
-                            Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0);
-                    mLockscreenSelectedValue = val;
-                    return true;
-                }
-            });
-        } else {
-            // There is one or less option for the user, disable the drop down.
-            mLockscreen.setEnabled(false);
-        }
-    }
-
-    private boolean isSecureNotificationsDisabled() {
-        final DevicePolicyManager dpm =
-                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-        return dpm != null && (dpm.getKeyguardDisabledFeatures(null)
-                & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) != 0;
-    }
-
-    private boolean isUnredactedNotificationsDisabled() {
-        final DevicePolicyManager dpm =
-                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-        return dpm != null && (dpm.getKeyguardDisabledFeatures(null)
-                & DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS) != 0;
-    }
-
-    private void updateLockscreenNotifications() {
-        if (mLockscreen == null) {
-            return;
-        }
-        final boolean enabled = getLockscreenNotificationsEnabled();
-        final boolean allowPrivate = !mSecure || getLockscreenAllowPrivateNotifications();
-        mLockscreenSelectedValue = !enabled ? R.string.lock_screen_notifications_summary_disable :
-                allowPrivate ? R.string.lock_screen_notifications_summary_show :
-                R.string.lock_screen_notifications_summary_hide;
-        mLockscreen.setValue(Integer.toString(mLockscreenSelectedValue));
-    }
-
-    private boolean getLockscreenNotificationsEnabled() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
-    }
-
-    private boolean getLockscreenAllowPrivateNotifications() {
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
-    }
-
-    // === Notification listeners ===
-
-    private void refreshNotificationListeners() {
-        if (mNotificationAccess != null) {
-            final int n = NotificationAccessSettings.getEnabledListenersCount(mContext);
-            if (n == 0) {
-                mNotificationAccess.setSummary(getResources().getString(
-                        R.string.manage_notification_access_summary_zero));
-            } else {
-                mNotificationAccess.setSummary(String.format(getResources().getQuantityString(
-                        R.plurals.manage_notification_access_summary_nonzero,
-                        n, n)));
-            }
-        }
-    }
-
-    // === Zen access ===
-
-    private void refreshZenAccess() {
-        // noop for now
-    }
-
     // === Callbacks ===
 
     private final class SettingsObserver extends ContentObserver {
         private final Uri VIBRATE_WHEN_RINGING_URI =
                 Settings.System.getUriFor(Settings.System.VIBRATE_WHEN_RINGING);
-        private final Uri NOTIFICATION_LIGHT_PULSE_URI =
-                Settings.System.getUriFor(Settings.System.NOTIFICATION_LIGHT_PULSE);
-        private final Uri LOCK_SCREEN_PRIVATE_URI =
-                Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);
-        private final Uri LOCK_SCREEN_SHOW_URI =
-                Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS);
 
         public SettingsObserver() {
             super(mHandler);
@@ -594,9 +433,6 @@
             final ContentResolver cr = getContentResolver();
             if (register) {
                 cr.registerContentObserver(VIBRATE_WHEN_RINGING_URI, false, this);
-                cr.registerContentObserver(NOTIFICATION_LIGHT_PULSE_URI, false, this);
-                cr.registerContentObserver(LOCK_SCREEN_PRIVATE_URI, false, this);
-                cr.registerContentObserver(LOCK_SCREEN_SHOW_URI, false, this);
             } else {
                 cr.unregisterContentObserver(this);
             }
@@ -608,12 +444,6 @@
             if (VIBRATE_WHEN_RINGING_URI.equals(uri)) {
                 updateVibrateWhenRinging();
             }
-            if (NOTIFICATION_LIGHT_PULSE_URI.equals(uri)) {
-                updatePulse();
-            }
-            if (LOCK_SCREEN_PRIVATE_URI.equals(uri) || LOCK_SCREEN_SHOW_URI.equals(uri)) {
-                updateLockscreenNotifications();
-            }
         }
     }
 
@@ -677,6 +507,57 @@
         }
     }
 
+    // === Summary ===
+
+    private static class SummaryProvider extends BroadcastReceiver
+            implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final AudioManager mAudioManager;
+        private final SummaryLoader mSummaryLoader;
+        private final int maxVolume;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                IntentFilter filter = new IntentFilter();
+                filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);
+                filter.addAction(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
+                filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
+                filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+                filter.addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION);
+                filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED);
+                mContext.registerReceiver(this, filter);
+            } else {
+                mContext.unregisterReceiver(this);
+            }
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String percent =  NumberFormat.getPercentInstance().format(
+                    (double) mAudioManager.getStreamVolume(AudioManager.STREAM_RING) / maxVolume);
+            mSummaryLoader.setSummary(this,
+                    mContext.getString(R.string.sound_settings_summary, percent));
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     // === Indexing ===
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -685,7 +566,7 @@
         public List<SearchIndexableResource> getXmlResourcesToIndex(
                 Context context, boolean enabled) {
             final SearchIndexableResource sir = new SearchIndexableResource(context);
-            sir.xmlResId = R.xml.notification_settings;
+            sir.xmlResId = R.xml.sound_settings;
             return Arrays.asList(sir);
         }
 
@@ -699,6 +580,27 @@
                 rt.add(KEY_WIFI_DISPLAY);
                 rt.add(KEY_VIBRATE_WHEN_RINGING);
             }
+
+            final PackageManager pm = context.getPackageManager();
+            final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+
+            // Enable link to CMAS app settings depending on the value in config.xml.
+            boolean isCellBroadcastAppLinkEnabled = context.getResources().getBoolean(
+                    com.android.internal.R.bool.config_cellBroadcastAppLinks);
+            try {
+                if (isCellBroadcastAppLinkEnabled) {
+                    if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
+                            == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+                        isCellBroadcastAppLinkEnabled = false;  // CMAS app disabled
+                    }
+                }
+            } catch (IllegalArgumentException ignored) {
+                isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
+            }
+            if (!um.isAdminUser() || !isCellBroadcastAppLinkEnabled) {
+                rt.add(KEY_CELL_BROADCAST_SETTINGS);
+            }
+
             return rt;
         }
     };
diff --git a/src/com/android/settings/notification/TopicNotificationSettings.java b/src/com/android/settings/notification/TopicNotificationSettings.java
new file mode 100644
index 0000000..71196b7
--- /dev/null
+++ b/src/com/android/settings/notification/TopicNotificationSettings.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2015 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.notification;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.AppHeader;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.notification.NotificationBackend.TopicRow;
+
+import android.app.Notification;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.service.notification.NotificationListenerService;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.util.Log;
+import android.widget.Toast;
+
+/** These settings are per topic, so should not be returned in global search results. */
+public class TopicNotificationSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "TopicNotiSettings";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    protected static final String ARG_TOPIC = "arg_topic";
+    protected static final String ARG_PACKAGE_INFO = "arg_info";
+    private static final String KEY_BYPASS_DND = "bypass_dnd";
+    private static final String KEY_SENSITIVE = "sensitive";
+    private static final String KEY_IMPORTANCE = "importance";
+
+    private final NotificationBackend mBackend = new NotificationBackend();
+
+    private Context mContext;
+    private ImportanceSeekBarPreference mImportance;
+    private SwitchPreference mPriority;
+    private SwitchPreference mSensitive;
+    private TopicRow mTopicRow;
+    private boolean mCreated;
+    private boolean mIsSystemPackage;
+    private int mUid;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onActivityCreated mCreated=" + mCreated);
+        if (mCreated) {
+            Log.w(TAG, "onActivityCreated: ignoring duplicate call");
+            return;
+        }
+        mCreated = true;
+        if (mTopicRow == null) return;
+        AppHeader.createAppHeader(
+                this, mTopicRow.icon, mTopicRow.label, mTopicRow.pkg, mTopicRow.uid);
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_TOPIC_NOTIFICATION;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getActivity();
+        Intent intent = getActivity().getIntent();
+        Bundle args = getArguments();
+        if (DEBUG) Log.d(TAG, "onCreate getIntent()=" + intent);
+        if (intent == null && args == null) {
+            Log.w(TAG, "No intent");
+            toastAndFinish();
+            return;
+        }
+
+        final Notification.Topic topic = args != null && args.containsKey(ARG_TOPIC)
+                ? (Notification.Topic) args.getParcelable(ARG_TOPIC) : null;
+
+        if (topic == null) {
+            toastAndFinish();
+            return;
+        }
+
+        final PackageInfo info = args != null && args.containsKey(ARG_PACKAGE_INFO)
+                ? (PackageInfo) args.getParcelable(ARG_PACKAGE_INFO) : null;
+        if (info == null) {
+            Log.w(TAG, "Failed to find package info");
+            toastAndFinish();
+            return;
+        }
+
+        mUid = args != null && args.containsKey(AppInfoBase.ARG_PACKAGE_UID)
+                ? args.getInt(AppInfoBase.ARG_PACKAGE_UID)
+                : intent.getIntExtra(Settings.EXTRA_APP_UID, -1);
+        if (mUid == -1) {
+            Log.w(TAG, "Missing extras: " + Settings.EXTRA_APP_UID + " was " + mUid);
+            toastAndFinish();
+            return;
+        }
+
+        final PackageManager pm = getPackageManager();
+        mIsSystemPackage = Utils.isSystemPackage(pm, info);
+
+        addPreferencesFromResource(R.xml.topic_notification_settings);
+        mImportance = (ImportanceSeekBarPreference) findPreference(KEY_IMPORTANCE);
+        mPriority = (SwitchPreference) findPreference(KEY_BYPASS_DND);
+        mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
+
+        mTopicRow = mBackend.loadTopicRow(pm, info.applicationInfo, topic);
+
+        mImportance.setMax(4);
+        // TODO: stop defaulting to 'normal' in the UI when there are mocks for this scenario.
+        int importance =
+                mTopicRow.importance == NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED
+                ? NotificationListenerService.Ranking.IMPORTANCE_DEFAULT
+                        : mTopicRow.importance;
+        mImportance.setProgress(
+                importance + ImportanceSeekBarPreference.IMPORTANCE_PROGRESS_OFFSET);
+        mImportance.setCallback(new ImportanceSeekBarPreference.Callback() {
+            @Override
+            public void onImportanceChanged(int progress) {
+                mBackend.setImportance(mTopicRow.pkg, mTopicRow.uid, mTopicRow.topic,
+                        progress - ImportanceSeekBarPreference.IMPORTANCE_PROGRESS_OFFSET);
+            }
+        });
+        mPriority.setChecked(mTopicRow.priority);
+        mSensitive.setChecked(mTopicRow.sensitive);
+
+        mPriority.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final boolean bypassZenMode = (Boolean) newValue;
+                return mBackend.setBypassZenMode(info.packageName, mUid, topic, bypassZenMode);
+            }
+        });
+
+        mSensitive.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final boolean sensitive = (Boolean) newValue;
+                return mBackend.setSensitive(info.packageName, mUid, topic, sensitive);
+            }
+        });
+        updateDependents(mTopicRow.banned);
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mUid != -1 && getPackageManager().getPackagesForUid(mUid) == null) {
+            // App isn't around anymore, must have been removed.
+            finish();
+        }
+    }
+
+    private void updateDependents(boolean banned) {
+        final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(
+                UserHandle.myUserId());
+        final boolean lockscreenNotificationsEnabled = getLockscreenNotificationsEnabled();
+        final boolean allowPrivate = getLockscreenAllowPrivateNotifications();
+
+        setVisible(mPriority, mIsSystemPackage || !banned);
+        setVisible(mSensitive, mIsSystemPackage || !banned && lockscreenSecure
+                && lockscreenNotificationsEnabled && allowPrivate);
+        setVisible(mImportance, !banned);
+    }
+
+    private void setVisible(Preference p, boolean visible) {
+        final boolean isVisible = getPreferenceScreen().findPreference(p.getKey()) != null;
+        if (isVisible == visible) return;
+        if (visible) {
+            getPreferenceScreen().addPreference(p);
+        } else {
+            getPreferenceScreen().removePreference(p);
+        }
+    }
+
+    private boolean getLockscreenNotificationsEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
+    }
+
+    private boolean getLockscreenAllowPrivateNotifications() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
+    }
+
+    private void toastAndFinish() {
+        Toast.makeText(mContext, R.string.app_not_found_dlg_text, Toast.LENGTH_SHORT).show();
+        getActivity().finish();
+    }
+}
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index 1c85f4d..4cec0b4 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -119,15 +119,15 @@
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
                     final boolean access = (Boolean) newValue;
-                    if (!access) {
-                        // disabling access
-                        setAccess(mContext, pkg, access);
-                        return true;
+                    if (access) {
+                        new ScaryWarningDialogFragment()
+                                .setPkgInfo(pkg, label)
+                                .show(getFragmentManager(), "dialog");
+                    } else {
+                        new FriendlyWarningDialogFragment()
+                                .setPkgInfo(pkg, label)
+                                .show(getFragmentManager(), "dialog");
                     }
-                    // enabling access: show a scary dialog first
-                    new ScaryWarningDialogFragment()
-                            .setPkgInfo(pkg, label)
-                            .show(getFragmentManager(), "dialog");
                     return false;
                 }
             });
@@ -149,6 +149,16 @@
         });
     }
 
+    private static void deleteRules(final Context context, final String pkg) {
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                final NotificationManager mgr = context.getSystemService(NotificationManager.class);
+                mgr.removeAutomaticZenRules(pkg);
+            }
+        });
+    }
+
     private final class SettingObserver extends ContentObserver {
         public SettingObserver() {
             super(new Handler(Looper.getMainLooper()));
@@ -160,6 +170,9 @@
         }
     }
 
+    /**
+     * Warning dialog when allowing zen access warning about the privileges being granted.
+     */
     public static class ScaryWarningDialogFragment extends DialogFragment {
         static final String KEY_PKG = "p";
         static final String KEY_LABEL = "l";
@@ -202,4 +215,51 @@
                     .create();
         }
     }
+
+    /**
+     * Warning dialog when revoking zen access warning that zen rule instances will be deleted.
+     */
+    public static class FriendlyWarningDialogFragment extends DialogFragment {
+        static final String KEY_PKG = "p";
+        static final String KEY_LABEL = "l";
+
+        public FriendlyWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
+            Bundle args = new Bundle();
+            args.putString(KEY_PKG, pkg);
+            args.putString(KEY_LABEL, TextUtils.isEmpty(label) ? pkg : label.toString());
+            setArguments(args);
+            return this;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            final Bundle args = getArguments();
+            final String pkg = args.getString(KEY_PKG);
+            final String label = args.getString(KEY_LABEL);
+
+            final String title = getResources().getString(
+                    R.string.zen_access_revoke_warning_dialog_title, label);
+            final String summary = getResources()
+                    .getString(R.string.zen_access_revoke_warning_dialog_summary);
+            return new AlertDialog.Builder(getContext())
+                    .setMessage(summary)
+                    .setTitle(title)
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.okay,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    deleteRules(getContext(), pkg);
+                                    setAccess(getContext(), pkg, false);
+                                }
+                            })
+                    .setNegativeButton(R.string.cancel,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    // pass
+                                }
+                            })
+                    .create();
+        }
+    }
 }
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
index 99744b6..dbbd9a9 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -37,7 +37,6 @@
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.PreferenceViewHolder;
-import android.util.Log;
 import android.view.View;
 
 import com.android.internal.logging.MetricsLogger;
@@ -47,8 +46,6 @@
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
 
 public class ZenModeAutomationSettings extends ZenModeSettingsBase {
 
@@ -63,7 +60,6 @@
         addPreferencesFromResource(R.xml.zen_mode_automation_settings);
         mPm = mContext.getPackageManager();
         mServiceListing = new ServiceListing(mContext, CONFIG);
-        mServiceListing.addCallback(mServiceListingCallback);
         mServiceListing.reload();
         mServiceListing.setListening(true);
     }
@@ -72,7 +68,6 @@
     public void onDestroy() {
         super.onDestroy();
         mServiceListing.setListening(false);
-        mServiceListing.removeCallback(mServiceListingCallback);
     }
 
     @Override
@@ -198,7 +193,7 @@
     private static Config getConditionProviderConfig() {
         final Config c = new Config();
         c.tag = TAG;
-        c.setting = Settings.Secure.ENABLED_CONDITION_PROVIDERS;
+        c.setting = Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES;
         c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
         c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
         c.noun = "condition provider";
@@ -218,23 +213,6 @@
         }
     }
 
-    private final ServiceListing.Callback mServiceListingCallback = new ServiceListing.Callback() {
-        @Override
-        public void onServicesReloaded(List<ServiceInfo> services) {
-            for (ServiceInfo service : services) {
-                final ZenRuleInfo ri = getRuleInfo(mPm, service);
-                if (ri != null && ri.serviceComponent != null
-                        && Objects.equals(ri.settingsAction,
-                        Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS)) {
-                    if (!mServiceListing.isEnabled(ri.serviceComponent)) {
-                        Log.i(TAG, "Enabling external condition provider: " + ri.serviceComponent);
-                        mServiceListing.setEnabled(ri.serviceComponent, true);
-                    }
-                }
-            }
-        }
-    };
-
     public static ZenRuleInfo getRuleInfo(PackageManager pm, ServiceInfo si) {
         if (si == null || si.metaData == null) return null;
         final String ruleType = si.metaData.getString(ConditionProviderService.META_DATA_RULE_TYPE);
@@ -353,7 +331,9 @@
         protected void onPostExecute(Drawable icon) {
             if (icon != null) {
                 final Preference pref = prefReference.get();
-                pref.setIcon(icon);
+                if (pref != null) {
+                    pref.setIcon(icon);
+                }
             }
         }
     }
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index 6168e57..e3413a7 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -66,7 +66,8 @@
                 MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_REMINDERS, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowReminders=" + val);
                 savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_REMINDERS),
-                        mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders);
+                        mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
+                        mPolicy.suppressedVisualEffects);
                 return true;
             }
         });
@@ -80,7 +81,8 @@
                 MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_EVENTS, val);
                 if (DEBUG) Log.d(TAG, "onPrefChange allowEvents=" + val);
                 savePolicy(getNewPriorityCategories(val, Policy.PRIORITY_CATEGORY_EVENTS),
-                        mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders);
+                        mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
+                        mPolicy.suppressedVisualEffects);
                 return true;
             }
         });
@@ -100,7 +102,8 @@
                         + " allowMessagesFrom=" + ZenModeConfig.sourceToString(allowMessagesFrom));
                 savePolicy(
                         getNewPriorityCategories(allowMessages, Policy.PRIORITY_CATEGORY_MESSAGES),
-                        mPolicy.priorityCallSenders, allowMessagesFrom);
+                        mPolicy.priorityCallSenders, allowMessagesFrom,
+                        mPolicy.suppressedVisualEffects);
                 return true;
             }
         });
@@ -118,7 +121,8 @@
                 if (DEBUG) Log.d(TAG, "onPrefChange allowCalls=" + allowCalls
                         + " allowCallsFrom=" + ZenModeConfig.sourceToString(allowCallsFrom));
                 savePolicy(getNewPriorityCategories(allowCalls, Policy.PRIORITY_CATEGORY_CALLS),
-                        allowCallsFrom, mPolicy.priorityMessageSenders);
+                        allowCallsFrom, mPolicy.priorityMessageSenders,
+                        mPolicy.suppressedVisualEffects);
                 return true;
             }
         });
@@ -137,7 +141,7 @@
                 int priorityCategories = getNewPriorityCategories(val,
                         NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS);
                 savePolicy(priorityCategories, mPolicy.priorityCallSenders,
-                        mPolicy.priorityMessageSenders);
+                        mPolicy.priorityMessageSenders, mPolicy.suppressedVisualEffects);
                 return true;
             }
         });
@@ -210,8 +214,9 @@
     }
 
     private void savePolicy(int priorityCategories, int priorityCallSenders,
-            int priorityMessageSenders) {
-        mPolicy = new Policy(priorityCategories, priorityCallSenders, priorityMessageSenders);
+            int priorityMessageSenders, int suppressedVisualEffects) {
+        mPolicy = new Policy(priorityCategories, priorityCallSenders, priorityMessageSenders,
+                suppressedVisualEffects);
         NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
     }
 
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 3e32abc..3743396 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -18,25 +18,19 @@
 
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.util.SparseArray;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.SettingsActivity;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class ZenModeSettings extends ZenModeSettingsBase implements Indexable {
+public class ZenModeSettings extends ZenModeSettingsBase {
     private static final String KEY_PRIORITY_SETTINGS = "priority_settings";
-    private static final String KEY_AUTOMATION_SETTINGS = "automation_settings";
 
     private Preference mPrioritySettings;
 
@@ -48,9 +42,6 @@
         final PreferenceScreen root = getPreferenceScreen();
 
         mPrioritySettings = root.findPreference(KEY_PRIORITY_SETTINGS);
-        if (!isScheduleSupported(mContext)) {
-            removePreference(KEY_AUTOMATION_SETTINGS);
-        }
     }
 
     @Override
@@ -78,6 +69,23 @@
         updatePrioritySettingsSummary();
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.zen_settings_menu, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.zen_access:
+                ((SettingsActivity) getActivity()).startPreferencePanel(
+                            ZenAccessSettings.class.getCanonicalName(), null,
+                            R.string.manage_zen_access_title, null, this, 0);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private void updatePrioritySettingsSummary() {
         Policy policy = NotificationManager.from(mContext).getNotificationPolicy();
         String s = getResources().getString(R.string.zen_mode_alarms);
@@ -116,45 +124,8 @@
         return s;
     }
 
-    private static SparseArray<String> allKeyTitles(Context context) {
-        final SparseArray<String> rt = new SparseArray<String>();
-        rt.put(R.string.zen_mode_priority_settings_title, KEY_PRIORITY_SETTINGS);
-        rt.put(R.string.zen_mode_automation_settings_title, KEY_AUTOMATION_SETTINGS);
-        return rt;
-    }
-
     @Override
     protected int getHelpResource() {
         return R.string.help_uri_interruptions;
     }
-
-    // Enable indexing of searchable data
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final SparseArray<String> keyTitles = allKeyTitles(context);
-                final int N = keyTitles.size();
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>(N);
-                final Resources res = context.getResources();
-                for (int i = 0; i < N; i++) {
-                    final SearchIndexableRaw data = new SearchIndexableRaw(context);
-                    data.key = keyTitles.valueAt(i);
-                    data.title = res.getString(keyTitles.keyAt(i));
-                    data.screenTitle = res.getString(R.string.zen_mode_settings_title);
-                    result.add(data);
-                }
-                return result;
-            }
-
-            @Override
-            public List<String> getNonIndexableKeys(Context context) {
-                final ArrayList<String> rt = new ArrayList<String>();
-                if (!isScheduleSupported(context)) {
-                    rt.add(KEY_AUTOMATION_SETTINGS);
-                }
-                return rt;
-            }
-        };
 }
diff --git a/src/com/android/settings/notification/ZenModeSettingsBase.java b/src/com/android/settings/notification/ZenModeSettingsBase.java
index 1a34062..4c8663f 100644
--- a/src/com/android/settings/notification/ZenModeSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeSettingsBase.java
@@ -122,11 +122,6 @@
         NotificationManager.from(mContext).setZenMode(zenMode, conditionId, TAG);
     }
 
-    protected static boolean isScheduleSupported(Context context) {
-        return NotificationManager.from(context)
-                .isSystemConditionProviderEnabled(ZenModeConfig.SCHEDULE_PATH);
-    }
-
     private List<AutomaticZenRule> getZenModeRules() {
         return NotificationManager.from(mContext).getAutomaticZenRules();
     }
diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
new file mode 100644
index 0000000..ba1b378
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (C) 2015 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.notification;
+
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.R;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
+
+    private static final String KEY_PEEK = "peek";
+    private static final String KEY_LIGHTS = "lights";
+
+    private SwitchPreference mPeek;
+    private SwitchPreference mLights;
+
+    private boolean mDisableListeners;
+    private NotificationManager.Policy mPolicy;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.zen_mode_visual_interruptions_settings);
+        final PreferenceScreen root = getPreferenceScreen();
+
+        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
+
+        mPeek = (SwitchPreference) root.findPreference(KEY_PEEK);
+        mPeek.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_PEEK, val);
+                if (DEBUG) Log.d(TAG, "onPrefChange suppressPeek=" + val);
+                savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_PEEK));
+                return true;
+            }
+        });
+
+        mLights = (SwitchPreference) root.findPreference(KEY_LIGHTS);
+        mLights.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (mDisableListeners) return true;
+                final boolean val = (Boolean) newValue;
+                MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_LIGHTS, val);
+                if (DEBUG) Log.d(TAG, "onPrefChange suppressLights=" + val);
+                savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_LIGHTS));
+                return true;
+            }
+        });
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS;
+    }
+
+    @Override
+    protected void onZenModeChanged() {
+        // Don't care
+    }
+
+    @Override
+    protected void onZenModeConfigChanged() {
+        mPolicy = NotificationManager.from(mContext).getNotificationPolicy();
+        updateControls();
+    }
+
+    private void updateControls() {
+        mDisableListeners = true;
+        mPeek.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_PEEK));
+        mLights.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_LIGHTS));
+        mDisableListeners = false;
+    }
+
+    private boolean isEffectSuppressed(int effect) {
+        return (mPolicy.suppressedVisualEffects & effect) != 0;
+    }
+
+    private int getNewSuppressedEffects(boolean suppress, int effectType) {
+        int effects = mPolicy.suppressedVisualEffects;
+        if (suppress) {
+            effects |= effectType;
+        } else {
+            effects &= ~effectType;
+        }
+        return effects;
+    }
+
+    private void savePolicy(int suppressedVisualEffects) {
+        mPolicy = new Policy(mPolicy.priorityCategories,
+                mPolicy.priorityCallSenders, mPolicy.priorityMessageSenders,
+                suppressedVisualEffects);
+        NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
+    }
+}
diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/ZenRuleSelectionDialog.java
index ee1f73f..e182355 100644
--- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java
+++ b/src/com/android/settings/notification/ZenRuleSelectionDialog.java
@@ -17,7 +17,7 @@
 package com.android.settings.notification;
 
 import android.app.AlertDialog;
-import android.app.AutomaticZenRule;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
@@ -39,7 +39,7 @@
 import java.lang.ref.WeakReference;
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -49,6 +49,7 @@
 
     private final Context mContext;
     private final PackageManager mPm;
+    private NotificationManager mNm;
     private final AlertDialog mDialog;
     private final LinearLayout mRuleContainer;
     private final ServiceListing mServiceListing;
@@ -56,6 +57,7 @@
     public ZenRuleSelectionDialog(Context context, ServiceListing serviceListing) {
         mContext = context;
         mPm = context.getPackageManager();
+        mNm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         mServiceListing = serviceListing;
         final View v =
                 LayoutInflater.from(context).inflate(R.layout.zen_rule_type_selection, null, false);
@@ -149,8 +151,8 @@
         return rt;
     }
 
-    private void bindExternalRules(ZenRuleInfo[] externalRuleTypes) {
-        Arrays.sort(externalRuleTypes, RULE_TYPE_COMPARATOR);
+    private void bindExternalRules(List<ZenRuleInfo> externalRuleTypes) {
+        Collections.sort(externalRuleTypes, RULE_TYPE_COMPARATOR);
         for (ZenRuleInfo ri : externalRuleTypes) {
             bindType(ri);
         }
@@ -160,11 +162,12 @@
         @Override
         public void onServicesReloaded(List<ServiceInfo> services) {
             if (DEBUG) Log.d(TAG, "Services reloaded: count=" + services.size());
-            ZenRuleInfo[] externalRuleTypes = new ZenRuleInfo[services.size()];
+            List<ZenRuleInfo> externalRuleTypes = new ArrayList<>();
             for (int i = 0; i < services.size(); i++) {
                 final ZenRuleInfo ri = ZenModeAutomationSettings.getRuleInfo(mPm, services.get(i));
-                if (ri != null && ri.configurationActivity != null) {
-                    externalRuleTypes[i] = ri;
+                if (ri != null && ri.configurationActivity != null
+                        && mNm.isNotificationPolicyAccessGrantedForPackage(ri.packageName)) {
+                    externalRuleTypes.add(ri);
                 }
             }
             bindExternalRules(externalRuleTypes);
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 9988cb0..cdc676d 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -99,16 +99,16 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
         mPrintManager.addPrintJobStateChangeListener(
                 mPrintJobStateChangeListener);
         updateUi();
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStop() {
+        super.onStop();
         mPrintManager.removePrintJobStateChangeListener(
                 mPrintJobStateChangeListener);
     }
@@ -229,12 +229,12 @@
             } break;
         }
 
-        String stateReason = info.getStateReason();
-        if (!TextUtils.isEmpty(stateReason)) {
+        CharSequence status = info.getStatus();
+        if (!TextUtils.isEmpty(status)) {
             if (getPreferenceScreen().findPreference(PRINT_JOB_MESSAGE_PREFERENCE) == null) {
                 getPreferenceScreen().addPreference(mMessagePreference);
             }
-            mMessagePreference.setSummary(stateReason);
+            mMessagePreference.setSummary(status);
         } else {
             getPreferenceScreen().removePreference(mMessagePreference);
         }
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index fd24edf..f174614 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -17,13 +17,10 @@
 package com.android.settings.print;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.LoaderManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
 import android.content.pm.PackageInfo;
@@ -75,12 +72,10 @@
  * Fragment with print service settings.
  */
 public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
-        implements DialogInterface.OnClickListener, SwitchBar.OnSwitchChangeListener {
+        implements SwitchBar.OnSwitchChangeListener {
 
     private static final int LOADER_ID_PRINTERS_LOADER = 1;
 
-    private static final int DIALOG_ID_ENABLE_WARNING = 1;
-
     private final SettingsContentObserver mSettingsContentObserver =
             new SettingsContentObserver(new Handler()) {
         @Override
@@ -122,9 +117,6 @@
     private CharSequence mAddPrintersTitle;
     private Intent mAddPrintersIntent;
 
-    private CharSequence mEnableWarningTitle;
-    private CharSequence mEnableWarningMessage;
-
     private ComponentName mComponentName;
 
     private PrintersAdapter mPrintersAdapter;
@@ -155,8 +147,8 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
         mSettingsContentObserver.register(getContentResolver());
         updateEmptyView();
         updateUiForServiceState();
@@ -164,7 +156,6 @@
 
     @Override
     public void onPause() {
-        mSettingsContentObserver.unregister(getContentResolver());
         if (mSearchView != null) {
             mSearchView.setOnQueryTextListener(null);
         }
@@ -172,11 +163,16 @@
     }
 
     @Override
+    public void onStop() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onStop();
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         initComponents();
         updateUiForArguments();
-        getView().findViewById(R.id.list_container).setVisibility(View.GONE);
         getBackupListView().setVisibility(View.VISIBLE);
     }
 
@@ -201,55 +197,13 @@
         PrintSettingsUtils.writeEnabledPrintServices(getActivity(), services);
     }
 
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        CharSequence title = null;
-        CharSequence message = null;
-        switch (dialogId) {
-            case DIALOG_ID_ENABLE_WARNING:
-                title = mEnableWarningTitle;
-                message = mEnableWarningMessage;
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(title)
-                .setMessage(message)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        final boolean checked;
-        switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
-                checked = true;
-                mSwitchBar.setCheckedInternal(checked);
-                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
-                onPreferenceToggled(mPreferenceKey, checked);
-                break;
-            case DialogInterface.BUTTON_NEGATIVE:
-                checked = false;
-                mSwitchBar.setCheckedInternal(checked);
-                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
-                onPreferenceToggled(mPreferenceKey, checked);
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
     private ListView getBackupListView() {
         return (ListView) getView().findViewById(R.id.backup_list);
     }
 
     private void updateEmptyView() {
         ViewGroup contentRoot = (ViewGroup) getListView().getParent();
-        View emptyView = getEmptyView();
+        View emptyView = getBackupListView().getEmptyView();
         if (!mToggleSwitch.isChecked()) {
             if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
                 contentRoot.removeView(emptyView);
@@ -322,17 +276,7 @@
         mToggleSwitch.setOnBeforeCheckedChangeListener(new ToggleSwitch.OnBeforeCheckedChangeListener() {
             @Override
             public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
-                if (checked) {
-                    if (!TextUtils.isEmpty(mEnableWarningMessage)) {
-                        mSwitchBar.setCheckedInternal(false);
-                        getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, false);
-                        showDialog(DIALOG_ID_ENABLE_WARNING);
-                        return true;
-                    }
-                    onPreferenceToggled(mPreferenceKey, true);
-                } else {
-                    onPreferenceToggled(mPreferenceKey, false);
-                }
+                onPreferenceToggled(mPreferenceKey, checked);
                 return false;
             }
         });
@@ -395,14 +339,6 @@
             }
         }
 
-        // Enable warning title.
-        mEnableWarningTitle = arguments.getCharSequence(
-                PrintSettingsFragment.EXTRA_ENABLE_WARNING_TITLE);
-
-        // Enable warning message.
-        mEnableWarningMessage = arguments.getCharSequence(
-                PrintSettingsFragment.EXTRA_ENABLE_WARNING_MESSAGE);
-
         // Component name.
         mComponentName = ComponentName.unflattenFromString(arguments
                 .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));
@@ -442,7 +378,7 @@
 
                 @Override
                 public boolean onQueryTextChange(String searchString) {
-                    ((Filterable) getListView().getAdapter()).getFilter().filter(searchString);
+                    mPrintersAdapter.getFilter().filter(searchString);
                     return true;
                 }
             });
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 13b8518..c2d3ac2 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -56,17 +56,15 @@
 import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
-
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DialogCreatable;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.UserAdapter;
-import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.drawer.UserAdapter;
 
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -87,8 +85,6 @@
     static final String EXTRA_PREFERENCE_KEY = "EXTRA_PREFERENCE_KEY";
     static final String EXTRA_CHECKED = "EXTRA_CHECKED";
     static final String EXTRA_TITLE = "EXTRA_TITLE";
-    static final String EXTRA_ENABLE_WARNING_TITLE = "EXTRA_ENABLE_WARNING_TITLE";
-    static final String EXTRA_ENABLE_WARNING_MESSAGE = "EXTRA_ENABLE_WARNING_MESSAGE";
     static final String EXTRA_SETTINGS_TITLE = "EXTRA_SETTINGS_TITLE";
     static final String EXTRA_SETTINGS_COMPONENT_NAME = "EXTRA_SETTINGS_COMPONENT_NAME";
     static final String EXTRA_ADD_PRINTERS_TITLE = "EXTRA_ADD_PRINTERS_TITLE";
@@ -154,8 +150,8 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
         mSettingsContentObserver.register(getContentResolver());
         updateServicesPreferences();
@@ -164,10 +160,10 @@
     }
 
     @Override
-    public void onPause() {
+    public void onStop() {
         mSettingsPackageMonitor.unregister();
         mSettingsContentObserver.unregister(getContentResolver());
-        super.onPause();
+        super.onStop();
     }
 
     @Override
@@ -191,7 +187,7 @@
         setEmptyView(emptyView);
 
         final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
-        mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(um, getActivity());
+        mProfileSpinnerAdapter = UserAdapter.createUserSpinnerAdapter(um, getActivity());
         if (mProfileSpinnerAdapter != null) {
             mSpinner = (Spinner) setPinnedHeaderView(R.layout.spinner_view);
             mSpinner.setAdapter(mProfileSpinnerAdapter);
@@ -257,13 +253,6 @@
             PrintServiceInfo printServiceInfo = PrintServiceInfo.create(
                     installedService, getActivity());
 
-            CharSequence applicationLabel = installedService.loadLabel(getPackageManager());
-
-            extras.putString(EXTRA_ENABLE_WARNING_TITLE, getString(
-                    R.string.print_service_security_warning_title, applicationLabel));
-            extras.putString(EXTRA_ENABLE_WARNING_MESSAGE, getString(
-                    R.string.print_service_security_warning_summary, applicationLabel));
-
             String settingsClassName = printServiceInfo.getSettingsActivityName();
             if (!TextUtils.isEmpty(settingsClassName)) {
                 extras.putString(EXTRA_SETTINGS_TITLE,
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index e54168c..05880f0 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -234,7 +234,8 @@
     private void handlePackageAvailable(String packageName) {
         if (!mAccessibilityServices.contains(packageName)) {
             final Intent intent = getAccessibilityServiceIntent(packageName);
-            if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+            List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+            if (services != null && !services.isEmpty()) {
                 mAccessibilityServices.add(packageName);
                 Index.getInstance(mContext).updateFromClassNameResource(
                         AccessibilitySettings.class.getName(), false, true);
@@ -244,7 +245,8 @@
         if (mHasFeaturePrinting) {
             if (!mPrintServices.contains(packageName)) {
                 final Intent intent = getPrintServiceIntent(packageName);
-                if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+                List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+                if (services != null && !services.isEmpty()) {
                     mPrintServices.add(packageName);
                     Index.getInstance(mContext).updateFromClassNameResource(
                             PrintSettingsFragment.class.getName(), false, true);
@@ -255,7 +257,8 @@
         if (mHasFeatureIme) {
             if (!mImeServices.contains(packageName)) {
                 Intent intent = getIMEServiceIntent(packageName);
-                if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+                List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+                if (services != null && !services.isEmpty()) {
                     mImeServices.add(packageName);
                     Index.getInstance(mContext).updateFromClassNameResource(
                             InputMethodAndLanguageSettings.class.getName(), false, true);
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 18ae1ec..4ac4fb8 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -42,11 +42,13 @@
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
-import com.android.settings.notification.NotificationSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
+import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenModeAutomationSettings;
 import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.ZenModeVisualInterruptionSettings;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.sim.SimSettings;
 import com.android.settings.users.UserSettings;
@@ -70,20 +72,21 @@
     public static final int RANK_DISPLAY = 7;
     public static final int RANK_WALLPAPER = 8;
     public static final int RANK_NOTIFICATIONS = 9;
-    public static final int RANK_APPS = 10;
-    public static final int RANK_STORAGE = 11;
-    public static final int RANK_POWER_USAGE = 12;
-    public static final int RANK_USERS = 13;
-    public static final int RANK_LOCATION = 14;
-    public static final int RANK_SECURITY = 15;
-    public static final int RANK_ACCOUNT = 16;
-    public static final int RANK_IME = 17;
-    public static final int RANK_PRIVACY = 18;
-    public static final int RANK_DATE_TIME = 19;
-    public static final int RANK_ACCESSIBILITY = 20;
-    public static final int RANK_PRINTING = 21;
-    public static final int RANK_DEVELOPEMENT = 22;
-    public static final int RANK_DEVICE_INFO = 23;
+    public static final int RANK_SOUND = 10;
+    public static final int RANK_APPS = 11;
+    public static final int RANK_STORAGE = 12;
+    public static final int RANK_POWER_USAGE = 13;
+    public static final int RANK_USERS = 14;
+    public static final int RANK_LOCATION = 15;
+    public static final int RANK_SECURITY = 16;
+    public static final int RANK_ACCOUNT = 17;
+    public static final int RANK_IME = 18;
+    public static final int RANK_PRIVACY = 19;
+    public static final int RANK_DATE_TIME = 20;
+    public static final int RANK_ACCESSIBILITY = 21;
+    public static final int RANK_PRINTING = 22;
+    public static final int RANK_DEVELOPEMENT = 23;
+    public static final int RANK_DEVICE_INFO = 24;
 
     public static final int RANK_UNDEFINED = -1;
     public static final int RANK_OTHERS = 1024;
@@ -123,12 +126,16 @@
         // Wallpapers
         sRankMap.put(WallpaperTypeSettings.class.getName(), RANK_WALLPAPER);
 
+        // Sound
+        sRankMap.put(SoundSettings.class.getName(), RANK_SOUND);
+
         // Notifications
-        sRankMap.put(NotificationSettings.class.getName(), RANK_NOTIFICATIONS);
+        sRankMap.put(ConfigureNotificationSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModePrioritySettings.class.getName(), RANK_NOTIFICATIONS);
         sRankMap.put(ZenModeAutomationSettings.class.getName(), RANK_NOTIFICATIONS);
+        sRankMap.put(ZenModeVisualInterruptionSettings.class.getName(), RANK_NOTIFICATIONS);
 
         // Storage
         sRankMap.put(StorageSettings.class.getName(), RANK_STORAGE);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 6b4a947..6d6ca08 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -44,10 +44,12 @@
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
-import com.android.settings.notification.NotificationSettings;
+import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
+import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenModePrioritySettings;
 import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.ZenModeVisualInterruptionSettings;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.sim.SimSettings;
 import com.android.settings.users.UserSettings;
@@ -143,24 +145,31 @@
                         WallpaperTypeSettings.class.getName(),
                         R.drawable.ic_settings_display));
 
-        sResMap.put(NotificationSettings.class.getName(),
+        sResMap.put(ConfigureNotificationSettings.class.getName(),
                 new SearchIndexableResource(
-                        Ranking.getRankForClassName(NotificationSettings.class.getName()),
-                        NO_DATA_RES_ID,
-                        NotificationSettings.class.getName(),
+                        Ranking.getRankForClassName(ConfigureNotificationSettings.class.getName()),
+                        R.xml.configure_notification_settings,
+                        ConfigureNotificationSettings.class.getName(),
                         R.drawable.ic_settings_notifications));
 
+        sResMap.put(SoundSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(SoundSettings.class.getName()),
+                        NO_DATA_RES_ID,
+                        SoundSettings.class.getName(),
+                        R.drawable.ic_settings_sound));
+
         sResMap.put(OtherSoundSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(OtherSoundSettings.class.getName()),
                         NO_DATA_RES_ID,
                         OtherSoundSettings.class.getName(),
-                        R.drawable.ic_settings_notifications));
+                        R.drawable.ic_settings_sound));
 
         sResMap.put(ZenModeSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(ZenModeSettings.class.getName()),
-                        NO_DATA_RES_ID,
+                        R.xml.zen_mode_settings,
                         ZenModeSettings.class.getName(),
                         R.drawable.ic_settings_notifications));
 
@@ -310,6 +319,14 @@
                         R.xml.wifi_calling_settings,
                         WifiCallingSettings.class.getName(),
                         R.drawable.ic_settings_wireless));
+
+        sResMap.put(ZenModeVisualInterruptionSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(
+                                ZenModeVisualInterruptionSettings.class.getName()),
+                        R.xml.zen_mode_visual_interruptions_settings,
+                        ZenModeVisualInterruptionSettings.class.getName(),
+                        R.drawable.ic_settings_notifications));
     }
 
     private SearchIndexableResources() {
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index cd211ee..dece886 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -27,6 +27,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.telephony.PhoneNumberUtils;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -278,7 +279,7 @@
                     setSummary(mSubInfoRecord.getDisplayName());
                 } else {
                     setSummary(mSubInfoRecord.getDisplayName() + " - " +
-                            getPhoneNumber(mSubInfoRecord));
+                            PhoneNumberUtils.createTtsSpannable(getPhoneNumber(mSubInfoRecord)));
                     setEnabled(true);
                 }
                 setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext))));
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 0dc87aa..9a81d16 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -145,14 +145,15 @@
             List<UserInfo> users = mUserManager.getUsers(true);
             for (UserInfo user: users) {
                 if (user.isGuest()) {
+                    UserHandle userHandle = UserHandle.of(user.id);
                     for (String key : mDefaultGuestRestrictions.keySet()) {
                         mUserManager.setUserRestriction(
-                                key, mDefaultGuestRestrictions.getBoolean(key));
+                                key, mDefaultGuestRestrictions.getBoolean(key), userHandle);
                     }
                 }
             }
         } else {
-            UserHandle userHandle = new UserHandle(mUserInfo.id);
+            UserHandle userHandle = UserHandle.of(mUserInfo.id);
             mUserManager.setUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS, !enabled,
                     userHandle);
             mUserManager.setUserRestriction(UserManager.DISALLOW_SMS, !enabled, userHandle);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 6a9bb09..3e2ac87 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -61,6 +61,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -1030,7 +1031,7 @@
             DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
                     Context.DEVICE_POLICY_SERVICE);
             // No restricted profiles for tablets with a device owner, or phones.
-            if (dpm.getDeviceOwner() != null || Utils.isVoiceCapable(context)) {
+            if (dpm.isDeviceManaged() || Utils.isVoiceCapable(context)) {
                 caps.mCanAddRestrictedProfile = false;
             }
 
@@ -1052,6 +1053,36 @@
         }
     }
 
+    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
+                        UserHandle.myUserId());
+                mSummaryLoader.setSummary(this, mContext.getString(R.string.user_summary,
+                        info.name));
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java
index 84897be..af4192e 100644
--- a/src/com/android/settings/vpn2/AppPreference.java
+++ b/src/com/android/settings/vpn2/AppPreference.java
@@ -39,18 +39,13 @@
     private int mState = STATE_DISCONNECTED;
     private String mPackageName;
     private String mName;
-    private int mUid;
+    private int mUserId = UserHandle.USER_NULL;
 
-    public AppPreference(Context context, OnClickListener onManage, final String packageName,
-            int uid) {
+    public AppPreference(Context context, OnClickListener onManage) {
         super(context, null /* attrs */, onManage);
-        mPackageName = packageName;
-        mUid = uid;
-        update();
     }
 
     public PackageInfo getPackageInfo() {
-        UserHandle user = new UserHandle(UserHandle.getUserId(mUid));
         try {
             PackageManager pm = getUserContext().getPackageManager();
             return pm.getPackageInfo(mPackageName, 0 /* flags */);
@@ -67,8 +62,18 @@
         return mPackageName;
     }
 
-    public int getUid() {
-        return mUid;
+    public void setPackageName(String name) {
+        mPackageName = name;
+        update();
+    }
+
+    public int getUserId() {
+        return mUserId;
+    }
+
+    public void setUserId(int userId) {
+        mUserId = userId;
+        update();
     }
 
     public int getState() {
@@ -81,6 +86,10 @@
     }
 
     private void update() {
+        if (mPackageName == null || mUserId == UserHandle.USER_NULL) {
+            return;
+        }
+
         final String[] states = getContext().getResources().getStringArray(R.array.vpn_states);
         setSummary(mState != STATE_DISCONNECTED ? states[mState] : "");
 
@@ -116,7 +125,7 @@
     }
 
     private Context getUserContext() throws PackageManager.NameNotFoundException {
-        UserHandle user = new UserHandle(UserHandle.getUserId(mUid));
+        UserHandle user = UserHandle.of(mUserId);
         return getContext().createPackageContextAsUser(
                 getContext().getPackageName(), 0 /* flags */, user);
     }
@@ -128,7 +137,7 @@
             if ((result = another.mState - mState) == 0 &&
                     (result = mName.compareToIgnoreCase(another.mName)) == 0 &&
                     (result = mPackageName.compareTo(another.mPackageName)) == 0) {
-                result = mUid - another.mUid;
+                result = mUserId - another.mUserId;
             }
             return result;
         } else if (preference instanceof ConfigPreference) {
diff --git a/src/com/android/settings/vpn2/ConfigPreference.java b/src/com/android/settings/vpn2/ConfigPreference.java
index a2736a0..c7ecddb 100644
--- a/src/com/android/settings/vpn2/ConfigPreference.java
+++ b/src/com/android/settings/vpn2/ConfigPreference.java
@@ -31,12 +31,15 @@
  * state.
  */
 public class ConfigPreference extends ManageablePreference {
-    private VpnProfile mProfile;
-    private int mState = -1;
+    public static int STATE_NONE = -1;
 
-    ConfigPreference(Context context, OnClickListener onManage, VpnProfile profile) {
+    private VpnProfile mProfile;
+
+    /** One of the STATE_* fields from LegacyVpnInfo, or STATE_NONE */
+    private int mState = STATE_NONE;
+
+    ConfigPreference(Context context, OnClickListener onManage) {
         super(context, null /* attrs */, onManage);
-        setProfile(profile);
     }
 
     public VpnProfile getProfile() {
@@ -54,15 +57,16 @@
     }
 
     private void update() {
-        if (mState < 0) {
+        if (mState == STATE_NONE) {
             setSummary("");
         } else {
-            String[] states = getContext().getResources()
-                    .getStringArray(R.array.vpn_states);
+            final String[] states = getContext().getResources().getStringArray(R.array.vpn_states);
             setSummary(states[mState]);
         }
-        setIcon(R.mipmap.ic_launcher_settings);
-        setTitle(mProfile.name);
+        if (mProfile != null) {
+            setIcon(R.mipmap.ic_launcher_settings);
+            setTitle(mProfile.name);
+        }
         notifyHierarchyChanged();
     }
 
@@ -72,7 +76,7 @@
             ConfigPreference another = (ConfigPreference) preference;
             int result;
             if ((result = another.mState - mState) == 0 &&
-                    (result = mProfile.name.compareTo(another.mProfile.name)) == 0 &&
+                    (result = mProfile.name.compareToIgnoreCase(another.mProfile.name)) == 0 &&
                     (result = mProfile.type - another.mProfile.type) == 0) {
                 result = mProfile.key.compareTo(another.mProfile.key);
             }
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 4192648..00f6a12 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -16,13 +16,16 @@
 
 package com.android.settings.vpn2;
 
+import android.annotation.NonNull;
+import android.annotation.UiThread;
+import android.annotation.WorkerThread;
 import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
 import android.net.ConnectivityManager.NetworkCallback;
+import android.net.ConnectivityManager;
 import android.net.IConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -40,7 +43,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
-import android.util.SparseArray;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -57,8 +62,10 @@
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
 
@@ -87,8 +94,8 @@
 
     private final KeyStore mKeyStore = KeyStore.getInstance();
 
-    private HashMap<String, ConfigPreference> mConfigPreferences = new HashMap<>();
-    private HashMap<String, AppPreference> mAppPreferences = new HashMap<>();
+    private Map<String, ConfigPreference> mConfigPreferences = new ArrayMap<>();
+    private Map<AppVpnInfo, AppPreference> mAppPreferences = new ArrayMap<>();
 
     private Handler mUpdater;
     private LegacyVpnInfo mConnectedLegacyVpn;
@@ -128,6 +135,11 @@
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
+        // Disable all actions if VPN configuration has been disallowed
+        for (int i = 0; i < menu.size(); i++) {
+            menu.getItem(i).setEnabled(!mUnavailable);
+        }
+
         // Hide lockdown VPN on devices that require IMS authentication
         if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) {
             menu.findItem(R.id.vpn_lockdown).setVisible(false);
@@ -206,58 +218,64 @@
     public boolean handleMessage(Message message) {
         mUpdater.removeMessages(RESCAN_MESSAGE);
 
-        // Pref group within which to list VPNs
-        PreferenceGroup vpnGroup = getPreferenceScreen();
-        vpnGroup.removeAll();
-        mConfigPreferences.clear();
-        mAppPreferences.clear();
+        final List<VpnProfile> vpnProfiles = loadVpnProfiles(mKeyStore);
+        final List<AppVpnInfo> vpnApps = getVpnApps();
 
-        // Fetch configured VPN profiles from KeyStore
-        for (VpnProfile profile : loadVpnProfiles(mKeyStore)) {
-            final ConfigPreference pref = new ConfigPreference(getPrefContext(), mManageListener,
-                    profile);
-            pref.setOnPreferenceClickListener(this);
-            mConfigPreferences.put(profile.key, pref);
-            vpnGroup.addPreference(pref);
-        }
+        final List<LegacyVpnInfo> connectedLegacyVpns = getConnectedLegacyVpns();
+        final List<AppVpnInfo> connectedAppVpns = getConnectedAppVpns();
 
-        // 3rd-party VPN apps can change elsewhere. Reload them every time.
-        for (AppOpsManager.PackageOps pkg : getVpnApps()) {
-            String key = getVpnIdentifier(UserHandle.getUserId(pkg.getUid()), pkg.getPackageName());
-            final AppPreference pref = new AppPreference(getPrefContext(), mManageListener,
-                    pkg.getPackageName(), pkg.getUid());
-            pref.setOnPreferenceClickListener(this);
-            mAppPreferences.put(key, pref);
-            vpnGroup.addPreference(pref);
-        }
+        // Refresh the PreferenceGroup which lists VPNs
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                // Find new VPNs by subtracting existing ones from the full set
+                final Set<Preference> updates = new ArraySet<>();
 
-        // Mark out connections with a subtitle
-        try {
-            // Legacy VPNs
-            mConnectedLegacyVpn = null;
-            LegacyVpnInfo info = mConnectivityService.getLegacyVpnInfo(UserHandle.myUserId());
-            if (info != null) {
-                ConfigPreference preference = mConfigPreferences.get(info.key);
-                if (preference != null) {
-                    preference.setState(info.state);
-                    mConnectedLegacyVpn = info;
+                for (VpnProfile profile : vpnProfiles) {
+                    ConfigPreference p = findOrCreatePreference(profile);
+                    p.setState(ConfigPreference.STATE_NONE);
+                    updates.add(p);
                 }
-            }
+                for (AppVpnInfo app : vpnApps) {
+                    AppPreference p = findOrCreatePreference(app);
+                    p.setState(AppPreference.STATE_DISCONNECTED);
+                    updates.add(p);
+                }
 
-            // Third-party VPNs
-            for (UserHandle profile : mUserManager.getUserProfiles()) {
-                VpnConfig cfg = mConnectivityService.getVpnConfig(profile.getIdentifier());
-                if (cfg != null) {
-                    final String key = getVpnIdentifier(profile.getIdentifier(), cfg.user);
-                    final AppPreference preference = mAppPreferences.get(key);
+                // Trim preferences for deleted VPNs
+                mConfigPreferences.values().retainAll(updates);
+                mAppPreferences.values().retainAll(updates);
+
+                final PreferenceGroup vpnGroup = getPreferenceScreen();
+                for (int i = vpnGroup.getPreferenceCount() - 1; i >= 0; i--) {
+                    Preference p = vpnGroup.getPreference(i);
+                    if (updates.contains(p)) {
+                        updates.remove(p);
+                    } else {
+                        vpnGroup.removePreference(p);
+                    }
+                }
+
+                // Show any new preferences on the screen
+                for (Preference pref : updates) {
+                    vpnGroup.addPreference(pref);
+                }
+
+                // Mark connected VPNs
+                for (LegacyVpnInfo info : connectedLegacyVpns) {
+                    final ConfigPreference preference = mConfigPreferences.get(info.key);
+                    if (preference != null) {
+                        preference.setState(info.state);
+                    }
+                }
+                for (AppVpnInfo app : connectedAppVpns) {
+                    final AppPreference preference = mAppPreferences.get(app);
                     if (preference != null) {
                         preference.setState(AppPreference.STATE_CONNECTED);
                     }
                 }
             }
-        } catch (RemoteException e) {
-            // ignore
-        }
+        });
 
         mUpdater.sendEmptyMessageDelayed(RESCAN_MESSAGE, RESCAN_INTERVAL_MS);
         return true;
@@ -273,7 +291,7 @@
                     mConnectedLegacyVpn.intent.send();
                     return true;
                 } catch (Exception e) {
-                    // ignore
+                    Log.w(LOG_TAG, "Starting config intent failed", e);
                 }
             }
             ConfigDialogFragment.show(this, profile, false /* editing */, true /* exists */);
@@ -284,7 +302,7 @@
 
             if (!connected) {
                 try {
-                    UserHandle user = new UserHandle(UserHandle.getUserId(pref.getUid()));
+                    UserHandle user = UserHandle.of(pref.getUserId());
                     Context userContext = getActivity().createPackageContextAsUser(
                             getActivity().getPackageName(), 0 /* flags */, user);
                     PackageManager pm = userContext.getPackageManager();
@@ -294,11 +312,11 @@
                         return true;
                     }
                 } catch (PackageManager.NameNotFoundException nnfe) {
-                    // Fall through
+                    Log.w(LOG_TAG, "VPN provider does not exist: " + pref.getPackageName(), nnfe);
                 }
             }
 
-            // Already onnected or no launch intent available - show an info dialog
+            // Already connected or no launch intent available - show an info dialog
             PackageInfo pkgInfo = pref.getPackageInfo();
             AppDialogFragment.show(this, pkgInfo, pref.getLabel(), false /* editing */, connected);
             return true;
@@ -306,6 +324,11 @@
         return false;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_vpn;
+    }
+
     private View.OnClickListener mManageListener = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
@@ -324,10 +347,6 @@
         }
     };
 
-    private static String getVpnIdentifier(int userId, String packageName) {
-        return Integer.toString(userId)+ "_" + packageName;
-    }
-
     private NetworkCallback mNetworkCallback = new NetworkCallback() {
         @Override
         public void onAvailable(Network network) {
@@ -344,18 +363,68 @@
         }
     };
 
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_url_vpn;
+    @UiThread
+    private ConfigPreference findOrCreatePreference(VpnProfile profile) {
+        ConfigPreference pref = mConfigPreferences.get(profile.key);
+        if (pref == null) {
+            pref = new ConfigPreference(getPrefContext(), mManageListener);
+            pref.setOnPreferenceClickListener(this);
+            mConfigPreferences.put(profile.key, pref);
+        }
+        pref.setProfile(profile);
+        return pref;
     }
 
-    private List<AppOpsManager.PackageOps> getVpnApps() {
-        List<AppOpsManager.PackageOps> result = Lists.newArrayList();
+    @UiThread
+    private AppPreference findOrCreatePreference(AppVpnInfo app) {
+        AppPreference pref = mAppPreferences.get(app);
+        if (pref == null) {
+            pref = new AppPreference(getPrefContext(), mManageListener);
+            pref.setOnPreferenceClickListener(this);
+            mAppPreferences.put(app, pref);
+        }
+        pref.setUserId(app.userId);
+        pref.setPackageName(app.packageName);
+        return pref;
+    }
+
+    @WorkerThread
+    private List<LegacyVpnInfo> getConnectedLegacyVpns() {
+        try {
+            mConnectedLegacyVpn = mConnectivityService.getLegacyVpnInfo(UserHandle.myUserId());
+            if (mConnectedLegacyVpn != null) {
+                return Collections.singletonList(mConnectedLegacyVpn);
+            }
+        } catch (RemoteException e) {
+            Log.e(LOG_TAG, "Failure updating VPN list with connected legacy VPNs", e);
+        }
+        return Collections.emptyList();
+    }
+
+    @WorkerThread
+    private List<AppVpnInfo> getConnectedAppVpns() {
+        // Mark connected third-party services
+        List<AppVpnInfo> connections = new ArrayList<>();
+        try {
+            for (UserHandle profile : mUserManager.getUserProfiles()) {
+                VpnConfig config = mConnectivityService.getVpnConfig(profile.getIdentifier());
+                if (config != null && !config.legacy) {
+                    connections.add(new AppVpnInfo(profile.getIdentifier(), config.user));
+                }
+            }
+        } catch (RemoteException e) {
+            Log.e(LOG_TAG, "Failure updating VPN list with connected app VPNs", e);
+        }
+        return connections;
+    }
+
+    private List<AppVpnInfo> getVpnApps() {
+        List<AppVpnInfo> result = Lists.newArrayList();
 
         // Build a filter of currently active user profiles.
-        SparseArray<Boolean> currentProfileIds = new SparseArray<>();
+        Set<Integer> currentProfileIds = new ArraySet<>();
         for (UserHandle profile : mUserManager.getUserProfiles()) {
-            currentProfileIds.put(profile.getIdentifier(), Boolean.TRUE);
+            currentProfileIds.add(profile.getIdentifier());
         }
 
         // Fetch VPN-enabled apps from AppOps.
@@ -364,7 +433,7 @@
         if (apps != null) {
             for (AppOpsManager.PackageOps pkg : apps) {
                 int userId = UserHandle.getUserId(pkg.getUid());
-                if (currentProfileIds.get(userId) == null) {
+                if (!currentProfileIds.contains(userId)) {
                     // Skip packages for users outside of our profile group.
                     continue;
                 }
@@ -377,7 +446,7 @@
                     }
                 }
                 if (allowed) {
-                    result.add(pkg);
+                    result.add(new AppVpnInfo(userId, pkg.getPackageName()));
                 }
             }
         }
@@ -402,4 +471,29 @@
         }
         return result;
     }
+
+    /** Utility holder for packageName:userId pairs */
+    private static class AppVpnInfo {
+        public int userId;
+        public String packageName;
+
+        public AppVpnInfo(int userId, @NonNull String packageName) {
+            this.userId = userId;
+            this.packageName = packageName;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (other instanceof AppVpnInfo) {
+                AppVpnInfo that = (AppVpnInfo) other;
+                return userId == that.userId && packageName.equals(that.packageName);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return (packageName != null ? packageName.hashCode() : 0) * 31 + userId;
+        }
+    }
 }
diff --git a/src/com/android/settings/widget/AnimatedImageView.java b/src/com/android/settings/widget/AnimatedImageView.java
deleted file mode 100644
index 671d718..0000000
--- a/src/com/android/settings/widget/AnimatedImageView.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011 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.widget;
-
-import android.content.Context;
-import android.graphics.drawable.AnimatedRotateDrawable;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-
-public class AnimatedImageView extends ImageView {
-    private AnimatedRotateDrawable mDrawable;
-    private boolean mAnimating;
-
-    public AnimatedImageView(Context context) {
-        super(context);
-    }
-
-    public AnimatedImageView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    private void updateDrawable() {
-        if (isShown() && mDrawable != null) {
-            mDrawable.stop();
-        }
-        final Drawable drawable = getDrawable();
-        if (drawable instanceof AnimatedRotateDrawable) {
-            mDrawable = (AnimatedRotateDrawable) drawable;
-            // TODO: define in drawable xml once we have public attrs.
-            mDrawable.setFramesCount(56);
-            mDrawable.setFramesDuration(32);
-            if (isShown() && mAnimating) {
-                mDrawable.start();
-            }
-        } else {
-            mDrawable = null;
-        }
-    }
-
-    private void updateAnimating() {
-        if (mDrawable != null) {
-            if (isShown() && mAnimating) {
-                mDrawable.start();
-            } else {
-                mDrawable.stop();
-            }
-        }
-    }
-
-    @Override
-    public void setImageDrawable(Drawable drawable) {
-        super.setImageDrawable(drawable);
-        updateDrawable();
-    }
-
-    @Override
-    public void setImageResource(int resid) {
-        super.setImageResource(resid);
-        updateDrawable();
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        updateAnimating();
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        updateAnimating();
-    }
-
-    public void setAnimating(boolean animating) {
-        mAnimating = animating;
-        updateAnimating();
-    }
-
-    @Override
-    protected void onVisibilityChanged(View changedView, int vis) {
-        super.onVisibilityChanged(changedView, vis);
-        updateAnimating();
-    }
-}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 7f1f747..d7cbaae 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -569,7 +569,7 @@
                                 mode = Settings.Secure.LOCATION_MODE_OFF;
                                 break;
                             case Settings.Secure.LOCATION_MODE_OFF:
-                                mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                                mode = Settings.Secure.LOCATION_MODE_PREVIOUS;
                                 break;
                         }
                         Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index aaab0c5..8dfb024 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -18,68 +18,25 @@
 
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.NetworkScoreManager;
-import android.net.NetworkScorerAppManager;
-import android.net.NetworkScorerAppManager.NetworkScorerAppData;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
 import android.os.Bundle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.provider.Settings.Global;
 import android.security.Credentials;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
-
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.AppListSwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
 
-import java.util.Collection;
-
-public class AdvancedWifiSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
+public class AdvancedWifiSettings extends SettingsPreferenceFragment {
     private static final String TAG = "AdvancedWifiSettings";
-    private static final String KEY_MAC_ADDRESS = "mac_address";
-    private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
-    private static final String KEY_FREQUENCY_BAND = "frequency_band";
-    private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
-    private static final String KEY_SLEEP_POLICY = "sleep_policy";
+
     private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
-    private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";
     private static final String KEY_WIFI_DIRECT = "wifi_direct";
     private static final String KEY_WPS_PUSH = "wps_push_button";
     private static final String KEY_WPS_PIN = "wps_pin_entry";
 
-    private WifiManager mWifiManager;
-    private NetworkScoreManager mNetworkScoreManager;
-    private AppListSwitchPreference mWifiAssistantPreference;
-
-    private IntentFilter mFilter;
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION) ||
-                action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
-                refreshWifiInfo();
-            }
-        }
-    };
-
     @Override
     protected int getMetricsCategory() {
         return MetricsLogger.WIFI_ADVANCED;
@@ -92,37 +49,13 @@
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mFilter = new IntentFilter();
-        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mNetworkScoreManager =
-                (NetworkScoreManager) getSystemService(Context.NETWORK_SCORE_SERVICE);
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
         initPreferences();
-        getActivity().registerReceiver(mReceiver, mFilter);
-        refreshWifiInfo();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getActivity().unregisterReceiver(mReceiver);
     }
 
     private void initPreferences() {
-        SwitchPreference notifyOpenNetworks =
-            (SwitchPreference) findPreference(KEY_NOTIFY_OPEN_NETWORKS);
-        notifyOpenNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
-                Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
-        notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
-
+        final Context context = getActivity();
         Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION);
         intent.setClassName("com.android.certinstaller",
                 "com.android.certinstaller.CertInstallerMain");
@@ -130,16 +63,6 @@
         Preference pref = findPreference(KEY_INSTALL_CREDENTIALS);
         pref.setIntent(intent);
 
-        final Context context = getActivity();
-        mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
-        Collection<NetworkScorerAppData> scorers =
-                NetworkScorerAppManager.getAllValidScorers(context);
-        if (UserManager.get(context).isAdminUser() && !scorers.isEmpty()) {
-            mWifiAssistantPreference.setOnPreferenceChangeListener(this);
-            initWifiAssistantPreference(scorers);
-        } else if (mWifiAssistantPreference != null) {
-            getPreferenceScreen().removePreference(mWifiAssistantPreference);
-        }
 
         Intent wifiDirectIntent = new Intent(context,
                 com.android.settings.Settings.WifiP2pSettingsActivity.class);
@@ -165,165 +88,6 @@
                     return true;
                 }
         });
-
-        ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
-
-        if (mWifiManager.isDualBandSupported()) {
-            frequencyPref.setOnPreferenceChangeListener(this);
-            int value = mWifiManager.getFrequencyBand();
-            if (value != -1) {
-                frequencyPref.setValue(String.valueOf(value));
-                updateFrequencyBandSummary(frequencyPref, value);
-            } else {
-                Log.e(TAG, "Failed to fetch frequency band");
-            }
-        } else {
-            if (frequencyPref != null) {
-                // null if it has already been removed before resume
-                getPreferenceScreen().removePreference(frequencyPref);
-            }
-        }
-
-        ListPreference sleepPolicyPref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
-        if (sleepPolicyPref != null) {
-            if (Utils.isWifiOnly(context)) {
-                sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
-            }
-            sleepPolicyPref.setOnPreferenceChangeListener(this);
-            int value = Settings.Global.getInt(getContentResolver(),
-                    Settings.Global.WIFI_SLEEP_POLICY,
-                    Settings.Global.WIFI_SLEEP_POLICY_NEVER);
-            String stringValue = String.valueOf(value);
-            sleepPolicyPref.setValue(stringValue);
-            updateSleepPolicySummary(sleepPolicyPref, stringValue);
-        }
-    }
-
-    private void initWifiAssistantPreference(Collection<NetworkScorerAppData> scorers) {
-        int count = scorers.size();
-        String[] packageNames = new String[count];
-        int i = 0;
-        for (NetworkScorerAppData scorer : scorers) {
-            packageNames[i] = scorer.mPackageName;
-            i++;
-        }
-        mWifiAssistantPreference.setPackageNames(packageNames,
-                mNetworkScoreManager.getActiveScorerPackage());
-    }
-
-    private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) {
-        if (value != null) {
-            String[] values = getResources().getStringArray(R.array.wifi_sleep_policy_values);
-            final int summaryArrayResId = Utils.isWifiOnly(getActivity()) ?
-                    R.array.wifi_sleep_policy_entries_wifi_only : R.array.wifi_sleep_policy_entries;
-            String[] summaries = getResources().getStringArray(summaryArrayResId);
-            for (int i = 0; i < values.length; i++) {
-                if (value.equals(values[i])) {
-                    if (i < summaries.length) {
-                        sleepPolicyPref.setSummary(summaries[i]);
-                        return;
-                    }
-                }
-            }
-        }
-
-        sleepPolicyPref.setSummary("");
-        Log.e(TAG, "Invalid sleep policy value: " + value);
-    }
-
-    private void updateFrequencyBandSummary(Preference frequencyBandPref, int index) {
-        String[] summaries = getResources().getStringArray(R.array.wifi_frequency_band_entries);
-        frequencyBandPref.setSummary(summaries[index]);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        String key = preference.getKey();
-
-        if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) {
-            Global.putInt(getContentResolver(),
-                    Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
-                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final Context context = getActivity();
-        String key = preference.getKey();
-
-        if (KEY_FREQUENCY_BAND.equals(key)) {
-            try {
-                int value = Integer.parseInt((String) newValue);
-                mWifiManager.setFrequencyBand(value, true);
-                updateFrequencyBandSummary(preference, value);
-            } catch (NumberFormatException e) {
-                Toast.makeText(context, R.string.wifi_setting_frequency_band_error,
-                        Toast.LENGTH_SHORT).show();
-                return false;
-            }
-        } else if (KEY_WIFI_ASSISTANT.equals(key)) {
-            NetworkScorerAppData wifiAssistant =
-                    NetworkScorerAppManager.getScorer(context, (String) newValue);
-            if (wifiAssistant == null) {
-                mNetworkScoreManager.setActiveScorer(null);
-                return true;
-            }
-
-            Intent intent = new Intent();
-            if (wifiAssistant.mConfigurationActivityClassName != null) {
-                // App has a custom configuration activity; launch that.
-                // This custom activity will be responsible for launching the system
-                // dialog.
-                intent.setClassName(wifiAssistant.mPackageName,
-                        wifiAssistant.mConfigurationActivityClassName);
-            } else {
-                // Fall back on the system dialog.
-                intent.setAction(NetworkScoreManager.ACTION_CHANGE_ACTIVE);
-                intent.putExtra(NetworkScoreManager.EXTRA_PACKAGE_NAME,
-                        wifiAssistant.mPackageName);
-            }
-
-            startActivity(intent);
-            // Don't update the preference widget state until the child activity returns.
-            // It will be updated in onResume after the activity finishes.
-            return false;
-        }
-
-        if (KEY_SLEEP_POLICY.equals(key)) {
-            try {
-                String stringValue = (String) newValue;
-                Settings.Global.putInt(getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY,
-                        Integer.parseInt(stringValue));
-                updateSleepPolicySummary(preference, stringValue);
-            } catch (NumberFormatException e) {
-                Toast.makeText(context, R.string.wifi_setting_sleep_policy_error,
-                        Toast.LENGTH_SHORT).show();
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void refreshWifiInfo() {
-        final Context context = getActivity();
-        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-
-        Preference wifiMacAddressPref = findPreference(KEY_MAC_ADDRESS);
-        String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
-        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
-                : context.getString(R.string.status_unavailable));
-        wifiMacAddressPref.setSelectable(false);
-
-        Preference wifiIpAddressPref = findPreference(KEY_CURRENT_IP_ADDRESS);
-        String ipAddress = Utils.getWifiIpAddresses(context);
-        wifiIpAddressPref.setSummary(ipAddress == null ?
-                context.getString(R.string.status_unavailable) : ipAddress);
-        wifiIpAddressPref.setSelectable(false);
     }
 
     /* Wrapper class for the WPS dialog to properly handle life cycle events like rotation. */
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
new file mode 100644
index 0000000..54ce036
--- /dev/null
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2015 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.wifi;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+import com.android.settings.AppListSwitchPreference;
+import com.android.settings.InstrumentedFragment;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+
+import java.util.Collection;
+import java.util.List;
+
+public class ConfigureWifiSettings extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+    private static final String TAG = "ConfigureWifiSettings";
+
+    private static final String KEY_MAC_ADDRESS = "mac_address";
+    private static final String KEY_SAVED_NETWORKS = "saved_networks";
+    private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
+    private static final String KEY_FREQUENCY_BAND = "frequency_band";
+    private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
+    private static final String KEY_SLEEP_POLICY = "sleep_policy";
+    private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";
+
+    private WifiManager mWifiManager;
+    private NetworkScoreManager mNetworkScoreManager;
+    private AppListSwitchPreference mWifiAssistantPreference;
+
+    private IntentFilter mFilter;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.wifi_configure_settings);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mFilter = new IntentFilter();
+        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        mNetworkScoreManager =
+                (NetworkScoreManager) getSystemService(Context.NETWORK_SCORE_SERVICE);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        initPreferences();
+        getActivity().registerReceiver(mReceiver, mFilter);
+        refreshWifiInfo();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mReceiver);
+    }
+
+    private void initPreferences() {
+        List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
+        if (configs == null || configs.size() == 0) {
+            removePreference(KEY_SAVED_NETWORKS);
+        }
+
+        SwitchPreference notifyOpenNetworks =
+                (SwitchPreference) findPreference(KEY_NOTIFY_OPEN_NETWORKS);
+        notifyOpenNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
+        notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
+
+        final Context context = getActivity();
+        mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
+        Collection<NetworkScorerAppManager.NetworkScorerAppData> scorers =
+                NetworkScorerAppManager.getAllValidScorers(context);
+        if (UserManager.get(context).isAdminUser() && !scorers.isEmpty()) {
+            mWifiAssistantPreference.setOnPreferenceChangeListener(this);
+            initWifiAssistantPreference(scorers);
+        } else if (mWifiAssistantPreference != null) {
+            getPreferenceScreen().removePreference(mWifiAssistantPreference);
+        }
+
+        ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
+
+        if (mWifiManager.isDualBandSupported()) {
+            frequencyPref.setOnPreferenceChangeListener(this);
+            int value = mWifiManager.getFrequencyBand();
+            if (value != -1) {
+                frequencyPref.setValue(String.valueOf(value));
+                updateFrequencyBandSummary(frequencyPref, value);
+            } else {
+                Log.e(TAG, "Failed to fetch frequency band");
+            }
+        } else {
+            if (frequencyPref != null) {
+                // null if it has already been removed before resume
+                getPreferenceScreen().removePreference(frequencyPref);
+            }
+        }
+
+        ListPreference sleepPolicyPref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
+        if (sleepPolicyPref != null) {
+            if (Utils.isWifiOnly(context)) {
+                sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
+            }
+            sleepPolicyPref.setOnPreferenceChangeListener(this);
+            int value = Settings.Global.getInt(getContentResolver(),
+                    Settings.Global.WIFI_SLEEP_POLICY,
+                    Settings.Global.WIFI_SLEEP_POLICY_NEVER);
+            String stringValue = String.valueOf(value);
+            sleepPolicyPref.setValue(stringValue);
+            updateSleepPolicySummary(sleepPolicyPref, stringValue);
+        }
+    }
+
+    private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) {
+        if (value != null) {
+            String[] values = getResources().getStringArray(R.array.wifi_sleep_policy_values);
+            final int summaryArrayResId = Utils.isWifiOnly(getActivity()) ?
+                    R.array.wifi_sleep_policy_entries_wifi_only : R.array.wifi_sleep_policy_entries;
+            String[] summaries = getResources().getStringArray(summaryArrayResId);
+            for (int i = 0; i < values.length; i++) {
+                if (value.equals(values[i])) {
+                    if (i < summaries.length) {
+                        sleepPolicyPref.setSummary(summaries[i]);
+                        return;
+                    }
+                }
+            }
+        }
+
+        sleepPolicyPref.setSummary("");
+        Log.e(TAG, "Invalid sleep policy value: " + value);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        String key = preference.getKey();
+
+        if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) {
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
+                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
+        } else {
+            return super.onPreferenceTreeClick(preference);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final Context context = getActivity();
+        String key = preference.getKey();
+
+        if (KEY_FREQUENCY_BAND.equals(key)) {
+            try {
+                int value = Integer.parseInt((String) newValue);
+                mWifiManager.setFrequencyBand(value, true);
+                updateFrequencyBandSummary(preference, value);
+            } catch (NumberFormatException e) {
+                Toast.makeText(context, R.string.wifi_setting_frequency_band_error,
+                        Toast.LENGTH_SHORT).show();
+                return false;
+            }
+        } else if (KEY_WIFI_ASSISTANT.equals(key)) {
+            NetworkScorerAppManager.NetworkScorerAppData wifiAssistant =
+                    NetworkScorerAppManager.getScorer(context, (String) newValue);
+            if (wifiAssistant == null) {
+                mNetworkScoreManager.setActiveScorer(null);
+                return true;
+            }
+
+            Intent intent = new Intent();
+            if (wifiAssistant.mConfigurationActivityClassName != null) {
+                // App has a custom configuration activity; launch that.
+                // This custom activity will be responsible for launching the system
+                // dialog.
+                intent.setClassName(wifiAssistant.mPackageName,
+                        wifiAssistant.mConfigurationActivityClassName);
+            } else {
+                // Fall back on the system dialog.
+                intent.setAction(NetworkScoreManager.ACTION_CHANGE_ACTIVE);
+                intent.putExtra(NetworkScoreManager.EXTRA_PACKAGE_NAME,
+                        wifiAssistant.mPackageName);
+            }
+
+            startActivity(intent);
+            // Don't update the preference widget state until the child activity returns.
+            // It will be updated in onResume after the activity finishes.
+            return false;
+        }
+
+        if (KEY_SLEEP_POLICY.equals(key)) {
+            try {
+                String stringValue = (String) newValue;
+                Settings.Global.putInt(getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY,
+                        Integer.parseInt(stringValue));
+                updateSleepPolicySummary(preference, stringValue);
+            } catch (NumberFormatException e) {
+                Toast.makeText(context, R.string.wifi_setting_sleep_policy_error,
+                        Toast.LENGTH_SHORT).show();
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private void refreshWifiInfo() {
+        final Context context = getActivity();
+        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+
+        Preference wifiMacAddressPref = findPreference(KEY_MAC_ADDRESS);
+        String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
+        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
+                : context.getString(R.string.status_unavailable));
+        wifiMacAddressPref.setSelectable(false);
+
+        Preference wifiIpAddressPref = findPreference(KEY_CURRENT_IP_ADDRESS);
+        String ipAddress = Utils.getWifiIpAddresses(context);
+        wifiIpAddressPref.setSummary(ipAddress == null ?
+                context.getString(R.string.status_unavailable) : ipAddress);
+        wifiIpAddressPref.setSelectable(false);
+    }
+
+    private void updateFrequencyBandSummary(Preference frequencyBandPref, int index) {
+        String[] summaries = getResources().getStringArray(R.array.wifi_frequency_band_entries);
+        frequencyBandPref.setSummary(summaries[index]);
+    }
+
+    private void initWifiAssistantPreference(
+            Collection<NetworkScorerAppManager.NetworkScorerAppData> scorers) {
+        int count = scorers.size();
+        String[] packageNames = new String[count];
+        int i = 0;
+        for (NetworkScorerAppManager.NetworkScorerAppData scorer : scorers) {
+            packageNames[i] = scorer.mPackageName;
+            i++;
+        }
+        mWifiAssistantPreference.setPackageNames(packageNames,
+                mNetworkScoreManager.getActiveScorerPackage());
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return InstrumentedFragment.CONFIGURE_WIFI;
+    }
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION) ||
+                action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
+                refreshWifiInfo();
+            }
+        }
+    };
+}
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 9cadef9..b15a6e4 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -25,7 +25,9 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.android.settings.SetupWizardUtils;
 import com.android.settingslib.wifi.AccessPoint;
+import com.android.setupwizardlib.util.WizardManagerHelper;
 
 public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
         DialogInterface.OnDismissListener {
@@ -40,9 +42,13 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        final Intent intent = getIntent();
+        if (WizardManagerHelper.isSetupWizardIntent(intent)) {
+            setTheme(SetupWizardUtils.getTransparentTheme(intent));
+        }
+
         super.onCreate(savedInstanceState);
 
-        final Intent intent = getIntent();
         final Bundle accessPointState = intent.getBundleExtra(KEY_ACCESS_POINT_STATE);
         AccessPoint accessPoint = null;
         if (accessPointState != null) {
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c9a94b7..87f72f5 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -21,15 +21,18 @@
 import android.app.AppGlobals;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.State;
@@ -44,9 +47,11 @@
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.text.Spannable;
 import android.text.style.TextAppearanceSpan;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -58,12 +63,12 @@
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
-
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -71,6 +76,7 @@
 import com.android.settings.wifi.AccessPointPreference.UserBadgeCache;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
+import com.android.settingslib.wifi.WifiStatusTracker;
 import com.android.settingslib.wifi.WifiTracker;
 
 import java.util.ArrayList;
@@ -95,14 +101,13 @@
 
     /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
     private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
-    private static final int MENU_ID_SAVED_NETWORK = Menu.FIRST + 2;
-    /* package */ static final int MENU_ID_ADD_NETWORK = Menu.FIRST + 3;
     private static final int MENU_ID_ADVANCED = Menu.FIRST + 4;
     private static final int MENU_ID_SCAN = Menu.FIRST + 5;
     private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
     private static final int MENU_ID_FORGET = Menu.FIRST + 7;
     private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
     private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
+    private static final int MENU_ID_CONFIGURE = Menu.FIRST + 10;
 
     public static final int WIFI_DIALOG_ID = 1;
     /* package */ static final int WPS_PBC_DIALOG_ID = 2;
@@ -114,8 +119,6 @@
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
     private static final String SAVED_WIFI_NFC_DIALOG_STATE = "wifi_nfc_dlg_state";
 
-    private static boolean savedNetworksExist;
-
     protected WifiManager mWifiManager;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
@@ -153,6 +156,7 @@
     private HandlerThread mBgThread;
 
     private UserBadgeCache mUserBadgeCache;
+    private Preference mAddPreference;
 
     /* End of "used in Wifi Setup context" */
 
@@ -173,6 +177,14 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.wifi_settings);
+        mAddPreference = new Preference(getContext());
+        Drawable ic_add = getContext().getDrawable(R.drawable.ic_menu_add).mutate();
+        TypedValue tv = new TypedValue();
+        getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, tv, true);
+        ic_add.setTint(getContext().getColor(tv.resourceId));
+        mAddPreference.setIcon(ic_add);
+        mAddPreference.setTitle(R.string.wifi_add_network);
+
         mUserBadgeCache = new UserBadgeCache(getPackageManager());
 
         mBgThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
@@ -339,24 +351,14 @@
      */
     void addOptionsMenuItems(Menu menu) {
         final boolean wifiIsEnabled = mWifiTracker.isWifiEnabled();
-        TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
-                new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
-        menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
-                .setIcon(ta.getDrawable(0))
-                .setEnabled(wifiIsEnabled)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        if (savedNetworksExist) {
-            menu.add(Menu.NONE, MENU_ID_SAVED_NETWORK, 0, R.string.wifi_saved_access_points_label)
-                    .setIcon(ta.getDrawable(0))
-                    .setEnabled(wifiIsEnabled)
-                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        }
         menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.menu_stats_refresh)
                .setEnabled(wifiIsEnabled)
                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        ta.recycle();
+        menu.add(Menu.NONE, MENU_ID_CONFIGURE, 0, R.string.wifi_menu_configure)
+                .setIcon(R.drawable.ic_settings_24dp)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
     }
 
     @Override
@@ -415,22 +417,6 @@
                 MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN);
                 mWifiTracker.forceScan();
                 return true;
-            case MENU_ID_ADD_NETWORK:
-                if (mWifiTracker.isWifiEnabled()) {
-                    onAddNetworkPressed();
-                }
-                return true;
-            case MENU_ID_SAVED_NETWORK:
-                if (getActivity() instanceof SettingsActivity) {
-                    ((SettingsActivity) getActivity()).startPreferencePanel(
-                            SavedAccessPointsWifiSettings.class.getCanonicalName(), null,
-                            R.string.wifi_saved_access_points_titlebar, null, this, 0);
-                } else {
-                    startFragment(this, SavedAccessPointsWifiSettings.class.getCanonicalName(),
-                            R.string.wifi_saved_access_points_titlebar,
-                            -1 /* Do not request a result */, null);
-                }
-                return true;
             case MENU_ID_ADVANCED:
                 if (getActivity() instanceof SettingsActivity) {
                     ((SettingsActivity) getActivity()).startPreferencePanel(
@@ -442,6 +428,18 @@
                             null);
                 }
                 return true;
+            case MENU_ID_CONFIGURE:
+                if (getActivity() instanceof SettingsActivity) {
+                    ((SettingsActivity) getActivity()).startPreferencePanel(
+                            ConfigureWifiSettings.class.getCanonicalName(), null,
+                            R.string.wifi_configure_titlebar, null, this, 0);
+                } else {
+                    startFragment(this, ConfigureWifiSettings.class.getCanonicalName(),
+                            R.string.wifi_configure_titlebar, -1 /* Do not request a results */,
+                            null);
+                }
+                return true;
+
         }
         return super.onOptionsItemSelected(item);
     }
@@ -519,20 +517,21 @@
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference instanceof AccessPointPreference) {
             mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
+            if (mSelectedAccessPoint == null) {
+                return false;
+            }
             /** Bypass dialog for unsecured, unsaved, and inactive networks */
             if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&
                     !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
-                if (!savedNetworksExist) {
-                    savedNetworksExist = true;
-                    getActivity().invalidateOptionsMenu();
-                }
                 connect(mSelectedAccessPoint.getConfig());
-            } else if (mSelectedAccessPoint.isSaved()){
+            } else if (mSelectedAccessPoint.isSaved()) {
                 showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_VIEW);
             } else {
                 showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
             }
+        } else if (preference == mAddPreference) {
+            onAddNetworkPressed();
         } else {
             return super.onPreferenceTreeClick(preference);
         }
@@ -671,8 +670,23 @@
                 }
                 if (!hasAvailableAccessPoints) {
                     setProgressBarVisible(true);
-                    addMessagePreference(R.string.wifi_empty_list_wifi_on);
+                    Preference pref = new Preference(getContext()) {
+                        @Override
+                        public void onBindViewHolder(PreferenceViewHolder holder) {
+                            super.onBindViewHolder(holder);
+                            // Show a line on each side of add network.
+                            holder.setDividerAllowedBelow(true);
+                        }
+                    };
+                    pref.setSelectable(false);
+                    pref.setSummary(R.string.wifi_empty_list_wifi_on);
+                    pref.setOrder(0);
+                    getPreferenceScreen().addPreference(pref);
+                    mAddPreference.setOrder(1);
+                    getPreferenceScreen().addPreference(mAddPreference);
                 } else {
+                    mAddPreference.setOrder(index++);
+                    getPreferenceScreen().addPreference(mAddPreference);
                     setProgressBarVisible(false);
                 }
                 break;
@@ -692,11 +706,6 @@
                 setProgressBarVisible(false);
                 break;
         }
-        // Update "Saved Networks" menu option.
-        if (savedNetworksExist != mWifiTracker.doSavedNetworksExist()) {
-            savedNetworksExist = !savedNetworksExist;
-            getActivity().invalidateOptionsMenu();
-        }
     }
 
     protected TextView initEmptyView() {
@@ -761,11 +770,6 @@
 
     @Override
     public void onWifiStateChanged(int state) {
-        Activity activity = getActivity();
-        if (activity != null) {
-            activity.invalidateOptionsMenu();
-        }
-
         switch (state) {
             case WifiManager.WIFI_STATE_ENABLING:
                 addMessagePreference(R.string.wifi_starting);
@@ -982,11 +986,12 @@
 
         boolean isConfigEligibleForLockdown = false;
         if (dpm != null) {
-            final String deviceOwnerPackageName = dpm.getDeviceOwner();
-            if (deviceOwnerPackageName != null) {
+            final ComponentName deviceOwner = dpm.getDeviceOwnerComponentOnAnyUser();
+            if (deviceOwner != null) {
+                final int deviceOwnerUserId = dpm.getDeviceOwnerUserId();
                 try {
-                    final int deviceOwnerUid = pm.getPackageUid(deviceOwnerPackageName,
-                            UserHandle.USER_SYSTEM);
+                    final int deviceOwnerUid = pm.getPackageUid(deviceOwner.getPackageName(),
+                            deviceOwnerUserId);
                     isConfigEligibleForLockdown = deviceOwnerUid == config.creatorUid;
                 } catch (NameNotFoundException e) {
                     // don't care
@@ -1002,4 +1007,58 @@
                 Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0) != 0;
         return !isLockdownFeatureEnabled;
     }
+
+    private static class SummaryProvider extends BroadcastReceiver
+            implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final WifiManager mWifiManager;
+        private final WifiStatusTracker mWifiTracker;
+        private final SummaryLoader mSummaryLoader;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mWifiManager = context.getSystemService(WifiManager.class);
+            mWifiTracker = new WifiStatusTracker(mWifiManager);
+        }
+
+        private CharSequence getSummary() {
+            if (!mWifiTracker.enabled) {
+                return mContext.getString(R.string.disabled);
+            }
+            if (!mWifiTracker.connected) {
+                return mContext.getString(R.string.disconnected);
+            }
+            return mWifiTracker.ssid;
+        }
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                IntentFilter filter = new IntentFilter();
+                filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+                filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+                filter.addAction(WifiManager.RSSI_CHANGED_ACTION);
+                mContext.registerReceiver(this, filter);
+            } else {
+                mContext.unregisterReceiver(this);
+            }
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mWifiTracker.handleBroadcast(intent);
+            mSummaryLoader.setSummary(this, getSummary());
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                                                                   SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
 }
diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index 38b3a15..4577496 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -148,8 +148,7 @@
         mScanList = (TextView) findViewById(R.id.scan_list);
 
 
-        mPingIpAddr = (TextView) findViewById(R.id.pingIpAddr);
-        mPingHostname = (TextView) findViewById(R.id.pingHostname);
+        mPingHostname = (TextView) findViewById(R.id.pingHostnameV4);
         mHttpClientTest = (TextView) findViewById(R.id.httpClientTest);
 
         pingTestButton = (Button) findViewById(R.id.ping_test);
@@ -317,19 +316,10 @@
 
         final Runnable updatePingResults = new Runnable() {
             public void run() {
-                mPingIpAddr.setText(mPingIpAddrResult);
                 mPingHostname.setText(mPingHostnameResult);
                 mHttpClientTest.setText(mHttpClientTestResult);
             }
         };
-        Thread ipAddrThread = new Thread() {
-            @Override
-            public void run() {
-                pingIpAddr();
-                handler.post(updatePingResults);
-            }
-        };
-        ipAddrThread.start();
 
         Thread hostnameThread = new Thread() {
             @Override
@@ -350,28 +340,6 @@
         httpClientThread.start();
     }
 
-    /**
-     * The ping functions have been borrowed from Radio diagnostic app to
-     * enable quick access on the wifi status screen
-     */
-    private final void pingIpAddr() {
-        try {
-            // TODO: Hardcoded for now, make it UI configurable
-            String ipAddress = "74.125.47.104";
-            Process p = Runtime.getRuntime().exec("ping -c 1 -w 100 " + ipAddress);
-            int status = p.waitFor();
-            if (status == 0) {
-                mPingIpAddrResult = "Pass";
-            } else {
-                mPingIpAddrResult = "Fail: IP addr not reachable";
-            }
-        } catch (IOException e) {
-            mPingIpAddrResult = "Fail: IOException";
-        } catch (InterruptedException e) {
-            mPingIpAddrResult = "Fail: InterruptedException";
-        }
-    }
-
     private final void pingHostname() {
         try {
             // TODO: Hardcoded for now, make it UI configurable
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
index d4b50e6..a318e6f 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -23,7 +23,6 @@
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.widget.ImageView;
-
 import com.android.settings.R;
 
 public class WifiP2pPeer extends Preference {
@@ -41,15 +40,18 @@
         device = dev;
         setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
         mRssi = 60; //TODO: fix
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
         if (TextUtils.isEmpty(device.deviceName)) {
             setTitle(device.deviceAddress);
         } else {
             setTitle(device.deviceName);
         }
+        String[] statusArray = context.getResources().getStringArray(R.array.wifi_p2p_status);
+        setSummary(statusArray[device.status]);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
         mSignal = (ImageView) view.findViewById(R.id.signal);
         if (mRssi == Integer.MAX_VALUE) {
             mSignal.setImageDrawable(null);
@@ -57,8 +59,7 @@
             mSignal.setImageResource(R.drawable.wifi_signal_dark);
             mSignal.setImageState(STATE_SECURED,  true);
         }
-        refresh();
-        super.onBindViewHolder(view);
+        mSignal.setImageLevel(getLevel());
     }
 
     @Override
@@ -87,14 +88,4 @@
         }
         return WifiManager.calculateSignalLevel(mRssi, SIGNAL_LEVELS);
     }
-
-    private void refresh() {
-        if (mSignal == null) {
-            return;
-        }
-        Context context = getContext();
-        mSignal.setImageLevel(getLevel());
-        String[] statusArray = context.getResources().getStringArray(R.array.wifi_p2p_status);
-        setSummary(statusArray[device.status]);
-    }
 }
diff --git a/tests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/src/com/android/settings/DeviceInfoSettingsTest.java
index d2267c0..abd4d76 100644
--- a/tests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -18,37 +18,37 @@
 
 import android.test.AndroidTestCase;
 
-import com.android.settings.DeviceInfoSettings;
+import com.android.settingslib.DeviceInfoUtils;
 
 public class DeviceInfoSettingsTest extends AndroidTestCase {
 
     public void testGetFormattedKernelVersion() throws Exception {
-        if ("Unavailable".equals(DeviceInfoSettings.getFormattedKernelVersion())) {
+        if ("Unavailable".equals(DeviceInfoUtils.getFormattedKernelVersion())) {
             fail("formatKernelVersion can't cope with this device's /proc/version");
         }
     }
 
     public void testFormatKernelVersion() throws Exception {
-        assertEquals("Unavailable", DeviceInfoSettings.formatKernelVersion(""));
+        assertEquals("Unavailable", DeviceInfoUtils.formatKernelVersion(""));
         assertEquals("2.6.38.8-gg784\n" +
-                     "root@hpao4.eem.corp.google.com #2\n" +
-                     "Fri Feb 24 03:31:23 PST 2012",
-                     DeviceInfoSettings.formatKernelVersion("Linux version 2.6.38.8-gg784 " +
-                         "(root@hpao4.eem.corp.google.com) " +
-                         "(gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5) ) #2 SMP " +
-                         "Fri Feb 24 03:31:23 PST 2012"));
+                        "root@hpao4.eem.corp.google.com #2\n" +
+                        "Fri Feb 24 03:31:23 PST 2012",
+                DeviceInfoUtils.formatKernelVersion("Linux version 2.6.38.8-gg784 " +
+                        "(root@hpao4.eem.corp.google.com) " +
+                        "(gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5) ) #2 SMP " +
+                        "Fri Feb 24 03:31:23 PST 2012"));
         assertEquals("3.0.31-g6fb96c9\n" +
-                     "android-build@vpbs1.mtv.corp.google.com #1\n" +
-                     "Thu Jun 28 11:02:39 PDT 2012",
-                     DeviceInfoSettings.formatKernelVersion("Linux version 3.0.31-g6fb96c9 " +
-                         "(android-build@vpbs1.mtv.corp.google.com) " +
-                         "(gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 " +
-                         "SMP PREEMPT Thu Jun 28 11:02:39 PDT 2012"));
+                        "android-build@vpbs1.mtv.corp.google.com #1\n" +
+                        "Thu Jun 28 11:02:39 PDT 2012",
+                DeviceInfoUtils.formatKernelVersion("Linux version 3.0.31-g6fb96c9 " +
+                        "(android-build@vpbs1.mtv.corp.google.com) " +
+                        "(gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 " +
+                        "SMP PREEMPT Thu Jun 28 11:02:39 PDT 2012"));
         assertEquals("2.6.38.8-a-b-jellybean+\n" +
-                     "x@y #1\n" +
-                     "Tue Aug 28 22:10:46 CDT 2012",
-                     DeviceInfoSettings.formatKernelVersion("Linux version " +
-                         "2.6.38.8-a-b-jellybean+ (x@y) " +
-                         "(gcc version 4.4.3 (GCC) ) #1 PREEMPT Tue Aug 28 22:10:46 CDT 2012"));
+                        "x@y #1\n" +
+                        "Tue Aug 28 22:10:46 CDT 2012",
+                DeviceInfoUtils.formatKernelVersion("Linux version " +
+                        "2.6.38.8-a-b-jellybean+ (x@y) " +
+                        "(gcc version 4.4.3 (GCC) ) #1 PREEMPT Tue Aug 28 22:10:46 CDT 2012"));
     }
 }